dnrops
/
gimp
mirror of https://github.com/GNOME/gimp.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

libgimpwidgets: remove gimp3migration.[ch]

This commit is contained in:
Michael Natterer 2018-04-29 00:13:19 +02:00
parent ad23eeb86f
commit 37e24d0059
14 changed files with 3 additions and 369 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libgimpwidgets/Makefile.am
View File

@ -191,9 +191,7 @@ libgimpwidgets_sources = \
gimpwidgetsutils.c \
gimpwidgetsutils.h \
gimpzoommodel.c \
gimpzoommodel.h \
gimp3migration.c \
gimp3migration.h
gimpzoommodel.h
libgimpwidgets_built_sources = \
gimpwidgetsenums.c \
@ -263,8 +261,7 @@ libgimpwidgetsinclude_HEADERS = \
gimpwidgetsenums.h \
gimpwidgetstypes.h \
gimpwidgetsutils.h \
gimpzoommodel.h \
gimp3migration.h
gimpzoommodel.h
libgimpwidgets_@GIMP_API_VERSION@_la_LDFLAGS = \
-version-info $(LT_VERSION_INFO) \

271
libgimpwidgets/gimp3migration.c
View File

@ -1,271 +0,0 @@
/* LIBGIMP - The GIMP Library
* Copyright (C) 1995-1997 Peter Mattis and Spencer Kimball
*
* gimp3migration.c
* Copyright (C) 2011 Michael Natterer <mitch@gimp.org>
*
* This library is free software: you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 3 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library. If not, see
* <http://www.gnu.org/licenses/>.
*/
#include "config.h"
#include <math.h>
#include <gtk/gtk.h>
#include "gimpwidgetstypes.h"
#include "gimp3migration.h"
#if 0
GtkWidget *
gtk_box_new (GtkOrientation orientation,
gint spacing)
{
if (orientation == GTK_ORIENTATION_HORIZONTAL)
return gtk_hbox_new (FALSE, spacing);
else
return gtk_vbox_new (FALSE, spacing);
}
GtkWidget *
gtk_button_box_new (GtkOrientation orientation)
{
if (orientation == GTK_ORIENTATION_HORIZONTAL)
return gtk_hbutton_box_new ();
else
return gtk_vbutton_box_new ();
}
GtkWidget *
gtk_paned_new (GtkOrientation orientation)
{
if (orientation == GTK_ORIENTATION_HORIZONTAL)
return gtk_hpaned_new ();
else
return gtk_vpaned_new ();
}
GtkWidget *
gtk_scale_new (GtkOrientation orientation,
GtkAdjustment *adjustment)
{
if (orientation == GTK_ORIENTATION_HORIZONTAL)
return gtk_hscale_new (adjustment);
else
return gtk_vscale_new (adjustment);
}
GtkWidget *
gtk_scrollbar_new (GtkOrientation orientation,
GtkAdjustment *adjustment)
{
if (orientation == GTK_ORIENTATION_HORIZONTAL)
return gtk_hscrollbar_new (adjustment);
else
return gtk_vscrollbar_new (adjustment);
}
GtkWidget *
gtk_separator_new (GtkOrientation orientation)
{
if (orientation == GTK_ORIENTATION_HORIZONTAL)
return gtk_hseparator_new ();
else
return gtk_vseparator_new ();
}
#endif /* if 0 */
#if ! GTK_CHECK_VERSION (3, 3, 0)
gboolean
gdk_event_triggers_context_menu (const GdkEvent *event)
{
g_return_val_if_fail (event != NULL, FALSE);
if (event->type == GDK_BUTTON_PRESS)
{
GdkEventButton *bevent = (GdkEventButton *) event;
if (bevent->button == 3 &&
! (bevent->state & (GDK_BUTTON1_MASK | GDK_BUTTON2_MASK)))
return TRUE;
#ifdef GDK_WINDOWING_QUARTZ
if (bevent->button == 1 &&
! (bevent->state & (GDK_BUTTON2_MASK | GDK_BUTTON3_MASK)) &&
(bevent->state & GDK_CONTROL_MASK))
return TRUE;
#endif
}
return FALSE;
}
GdkModifierType
gdk_keymap_get_modifier_mask (GdkKeymap *keymap,
GdkModifierIntent intent)
{
g_return_val_if_fail (GDK_IS_KEYMAP (keymap), 0);
#ifdef GDK_WINDOWING_QUARTZ
switch (intent)
{
case GDK_MODIFIER_INTENT_PRIMARY_ACCELERATOR:
return GDK_MOD2_MASK;
case GDK_MODIFIER_INTENT_CONTEXT_MENU:
return GDK_CONTROL_MASK;
case GDK_MODIFIER_INTENT_EXTEND_SELECTION:
return GDK_SHIFT_MASK;
case GDK_MODIFIER_INTENT_MODIFY_SELECTION:
return GDK_MOD2_MASK;
case GDK_MODIFIER_INTENT_NO_TEXT_INPUT:
return GDK_MOD2_MASK | GDK_CONTROL_MASK;
default:
g_return_val_if_reached (0);
}
#else
switch (intent)
{
case GDK_MODIFIER_INTENT_PRIMARY_ACCELERATOR:
return GDK_CONTROL_MASK;
case GDK_MODIFIER_INTENT_CONTEXT_MENU:
return 0;
case GDK_MODIFIER_INTENT_EXTEND_SELECTION:
return GDK_SHIFT_MASK;
case GDK_MODIFIER_INTENT_MODIFY_SELECTION:
return GDK_CONTROL_MASK;
case GDK_MODIFIER_INTENT_NO_TEXT_INPUT:
return GDK_MOD1_MASK | GDK_CONTROL_MASK;
default:
g_return_val_if_reached (0);
}
#endif
}
GdkModifierType
gtk_widget_get_modifier_mask (GtkWidget *widget,
GdkModifierIntent intent)
{
GdkDisplay *display;
g_return_val_if_fail (GTK_IS_WIDGET (widget), 0);
display = gtk_widget_get_display (widget);
return gdk_keymap_get_modifier_mask (gdk_keymap_get_for_display (display),
intent);
}
#endif /* GTK+ 3.3 */
#if 0
gboolean
gdk_cairo_get_clip_rectangle (cairo_t *cr,
GdkRectangle *rect)
{
double x1, y1, x2, y2;
gboolean clip_exists;
cairo_clip_extents (cr, &x1, &y1, &x2, &y2);
clip_exists = x1 < x2 && y1 < y2;
if (rect)
{
x1 = floor (x1);
y1 = floor (y1);
x2 = ceil (x2);
y2 = ceil (y2);
rect->x = CLAMP (x1, G_MININT, G_MAXINT);
rect->y = CLAMP (y1, G_MININT, G_MAXINT);
rect->width = CLAMP (x2 - x1, G_MININT, G_MAXINT);
rect->height = CLAMP (y2 - y1, G_MININT, G_MAXINT);
}
return clip_exists;
}
void
gdk_screen_get_monitor_workarea (GdkScreen *screen,
gint monitor_num,
GdkRectangle *dest)
{
gdk_screen_get_monitor_geometry (screen, monitor_num, dest);
}
void
gtk_label_set_xalign (GtkLabel *label,
gfloat xalign)
{
g_return_if_fail (GTK_IS_LABEL (label));
xalign = CLAMP (xalign, 0.0, 1.0);
g_object_set (label, "xalign", xalign, NULL);
}
gfloat
gtk_label_get_xalign (GtkLabel *label)
{
gfloat xalign;
g_return_val_if_fail (GTK_IS_LABEL (label), 0.5);
g_object_get (label, "xalign", &xalign, NULL);
return xalign;
}
void
gtk_label_set_yalign (GtkLabel *label,
gfloat yalign)
{
g_return_if_fail (GTK_IS_LABEL (label));
yalign = CLAMP (yalign, 0.0, 1.0);
g_object_set (label, "yalign", yalign, NULL);
}
gfloat
gtk_label_get_yalign (GtkLabel *label)
{
gfloat yalign;
g_return_val_if_fail (GTK_IS_LABEL (label), 0.5);
g_object_get (label, "yalign", &yalign, NULL);
return yalign;
}
#endif

81
libgimpwidgets/gimp3migration.h
View File

@ -1,81 +0,0 @@
/* LIBGIMP - The GIMP Library
* Copyright (C) 1995-1997 Peter Mattis and Spencer Kimball
*
* gimp3migration.h
* Copyright (C) 2011 Michael Natterer <mitch@gimp.org>
*
* This library is free software: you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 3 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library. If not, see
* <http://www.gnu.org/licenses/>.
*/
#if !defined (__GIMP_WIDGETS_H_INSIDE__) && !defined (GIMP_WIDGETS_COMPILATION)
#error "Only <libgimpwidgets/gimpwidgets.h> can be included directly."
#endif
#ifndef __GIMP_3_MIGRATION_H__
#define __GIMP_3_MIGRATION_H__
/* This file is evil. Its purpose is to keep GIMP's gtk3-port branch
* manageable, and contains functions that are only in GTK+ 3.x but
* are *not* in GTK+ 2.x. Please just ignore the uglyness and move
* along. This file will be removed in GIMP 3.
*/
#if 0
GtkWidget * gtk_box_new (GtkOrientation orientation,
gint spacing);
GtkWidget * gtk_button_box_new (GtkOrientation orientation);
GtkWidget * gtk_paned_new (GtkOrientation orientation);
GtkWidget * gtk_scale_new (GtkOrientation orientation,
GtkAdjustment *adjustment);
GtkWidget * gtk_scrollbar_new (GtkOrientation orientation,
GtkAdjustment *adjustment);
GtkWidget * gtk_separator_new (GtkOrientation orientation);
typedef enum
{
GDK_MODIFIER_INTENT_PRIMARY_ACCELERATOR,
GDK_MODIFIER_INTENT_CONTEXT_MENU,
GDK_MODIFIER_INTENT_EXTEND_SELECTION,
GDK_MODIFIER_INTENT_MODIFY_SELECTION,
GDK_MODIFIER_INTENT_NO_TEXT_INPUT
} GdkModifierIntent;
gboolean gdk_event_triggers_context_menu (const GdkEvent *event);
GdkModifierType gdk_keymap_get_modifier_mask (GdkKeymap *keymap,
GdkModifierIntent intent);
GdkModifierType gtk_widget_get_modifier_mask (GtkWidget *widget,
GdkModifierIntent intent);
gboolean gdk_cairo_get_clip_rectangle (cairo_t *cr,
GdkRectangle *rect);
void gdk_screen_get_monitor_workarea (GdkScreen *screen,
gint monitor_num,
GdkRectangle *dest);
void gtk_label_set_xalign (GtkLabel *label,
gfloat xalign);
gfloat gtk_label_get_xalign (GtkLabel *label);
void gtk_label_set_yalign (GtkLabel *label,
gfloat yalign);
gfloat gtk_label_get_yalign (GtkLabel *label);
#endif
#endif /* __GIMP_3_MIGRATION_H__ */

1
libgimpwidgets/gimpbutton.c
View File

@ -26,7 +26,6 @@
#include "gimpwidgetstypes.h"
#include "gimpbutton.h"
#include "gimp3migration.h"
/**

1
libgimpwidgets/gimpcolorbutton.c
View File

@ -39,7 +39,6 @@
#include "gimphelpui.h"
#include "gimpicons.h"
#include "gimpwidgets-private.h"
#include "gimp3migration.h"
#include "libgimp/libgimp-intl.h"

1
libgimpwidgets/gimpcolornotebook.c
View File

@ -34,7 +34,6 @@
#include "gimpcolornotebook.h"
#include "gimpcolorscales.h"
#include "gimpwidgetsmarshal.h"
#include "gimp3migration.h"
#include "libgimp/libgimp-intl.h"

1
libgimpwidgets/gimpcolorselect.c
View File

@ -39,7 +39,6 @@
#include "gimphelpui.h"
#include "gimpicons.h"
#include "gimpwidgetsutils.h"
#include "gimp3migration.h"
#include "libgimp/libgimp-intl.h"

1
libgimpwidgets/gimpenumwidgets.c
View File

@ -30,7 +30,6 @@
#include "gimpenumwidgets.h"
#include "gimpframe.h"
#include "gimphelpui.h"
#include "gimp3migration.h"
/**

1
libgimpwidgets/gimpframe.c
View File

@ -27,7 +27,6 @@
#include "gimpwidgetstypes.h"
#include "gimp3migration.h"
#include "gimpframe.h"

3
libgimpwidgets/gimppageselector.c
View File

@ -1,4 +1,4 @@
/* LIBGIMP - The GIMP Library
#/* LIBGIMP - The GIMP Library
* Copyright (C) 1995-1997 Peter Mattis and Spencer Kimball
*
* gimppageselector.c
@ -33,7 +33,6 @@
#include "gimppageselector.h"
#include "gimppropwidgets.h"
#include "gimpwidgets.h"
#include "gimp3migration.h"
#include "libgimp/libgimp-intl.h"

1
libgimpwidgets/gimppatheditor.c
View File

@ -35,7 +35,6 @@
#include "gimphelpui.h"
#include "gimpicons.h"
#include "gimppatheditor.h"
#include "gimp3migration.h"
#include "libgimp/libgimp-intl.h"

1
libgimpwidgets/gimpscrolledpreview.c
View File

@ -29,7 +29,6 @@
#include "gimpicons.h"
#include "gimppreviewarea.h"
#include "gimpscrolledpreview.h"
#include "gimp3migration.h"
#include "libgimp/libgimp-intl.h"

1
libgimpwidgets/gimpwidgets.h
View File

@ -79,7 +79,6 @@
#include <libgimpwidgets/gimpwidgets-error.h>
#include <libgimpwidgets/gimpwidgetsutils.h>
#include <libgimpwidgets/gimpzoommodel.h>
#include <libgimpwidgets/gimp3migration.h>
#undef __GIMP_WIDGETS_H_INSIDE__

1
libgimpwidgets/gimpwidgetsutils.c
View File

@ -41,7 +41,6 @@
#include "gimpwidgetstypes.h"
#include "gimp3migration.h"
#include "gimpsizeentry.h"
#include "gimpwidgetsutils.h"