GNOME.org
 

gimp r25965 - in trunk: . app/tools app/widgets plug-ins/common plug-ins/help-browser plug-ins/imagemap

Author: mitch
Date: Fri Jun 20 11:08:42 2008
New Revision: 25965
URL: http://svn.gnome.org/viewvc/gimp?rev=25965&view=rev

Log:
2008-06-20  Michael Natterer  <mitch gimp org>

	Latest GTK+ trunk deprecations showed some uglyness in gimp:

	* app/tools/gimpeditselectiontool.h: we were still using GTK_CHECK
	macros here, use proper G_TYPE type checking instead.

	* app/widgets/gimpuimanager.c
	* app/widgets/gimpdockable.c: s/GtkDestroyNotify/GDestroyNotify/.

	* plug-ins/help-browser/gimpthrobber.c: s/GtkType/GType/.

	* plug-ins/common/filter-pack.c
	* plug-ins/common/sample-colorize.c
	* plug-ins/imagemap/imap_main.c: s/GtkSignalFunc/GCallback/.



Modified:
   trunk/ChangeLog
   trunk/app/tools/gimpeditselectiontool.h
   trunk/app/widgets/gimpdockable.c
   trunk/app/widgets/gimpuimanager.c
   trunk/app/widgets/gimpuimanager.h
   trunk/plug-ins/common/filter-pack.c
   trunk/plug-ins/common/sample-colorize.c
   trunk/plug-ins/help-browser/gimpthrobber.c
   trunk/plug-ins/imagemap/imap_main.c

Modified: trunk/app/tools/gimpeditselectiontool.h
==============================================================================
--- trunk/app/tools/gimpeditselectiontool.h	(original)
+++ trunk/app/tools/gimpeditselectiontool.h	Fri Jun 20 11:08:42 2008
@@ -24,10 +24,10 @@
 
 
 #define GIMP_TYPE_EDIT_SELECTION_TOOL            (gimp_edit_selection_tool_get_type ())
-#define GIMP_EDIT_SELECTION_TOOL(obj)            (GTK_CHECK_CAST ((obj), GIMP_TYPE_EDIT_SELECTION_TOOL, GimpEditSelectionTool))
-#define GIMP_EDIT_SELECTION_TOOL_CLASS(klass)    (GTK_CHECK_CLASS_CAST ((klass), GIMP_TYPE_EDIT_SELECTION_TOOL, GimpEditSelectionToolClass))
-#define GIMP_IS_EDIT_SELECTION_TOOL(obj)         (GTK_CHECK_TYPE ((obj), GIMP_TYPE_EDIT_SELECTION_TOOL))
-#define GIMP_IS_EDIT_SELECTION_TOOL_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_EDIT_SELECTION_TOOL))
+#define GIMP_EDIT_SELECTION_TOOL(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_EDIT_SELECTION_TOOL, GimpEditSelectionTool))
+#define GIMP_EDIT_SELECTION_TOOL_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_EDIT_SELECTION_TOOL, GimpEditSelectionToolClass))
+#define GIMP_IS_EDIT_SELECTION_TOOL(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_EDIT_SELECTION_TOOL))
+#define GIMP_IS_EDIT_SELECTION_TOOL_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_EDIT_SELECTION_TOOL))
 
 
 typedef struct _GimpEditSelectionTool      GimpEditSelectionTool;

Modified: trunk/app/widgets/gimpdockable.c
==============================================================================
--- trunk/app/widgets/gimpdockable.c	(original)
+++ trunk/app/widgets/gimpdockable.c	Fri Jun 20 11:08:42 2008
@@ -1245,7 +1245,7 @@
   gimp_ui_manager_ui_popup (dockbook_ui_manager, "/dockable-popup",
                             GTK_WIDGET (dockable),
                             gimp_dockable_menu_position, dockable,
-                            (GtkDestroyNotify) gimp_dockable_menu_end, dockable);
+                            (GDestroyNotify) gimp_dockable_menu_end, dockable);
 
   return TRUE;
 }

Modified: trunk/app/widgets/gimpuimanager.c
==============================================================================
--- trunk/app/widgets/gimpuimanager.c	(original)
+++ trunk/app/widgets/gimpuimanager.c	Fri Jun 20 11:08:42 2008
@@ -569,7 +569,7 @@
                           GtkWidget            *parent,
                           GimpMenuPositionFunc  position_func,
                           gpointer              position_data,
-                          GtkDestroyNotify      popdown_func,
+                          GDestroyNotify        popdown_func,
                           gpointer              popdown_data)
 {
   GtkWidget *widget;

Modified: trunk/app/widgets/gimpuimanager.h
==============================================================================
--- trunk/app/widgets/gimpuimanager.h	(original)
+++ trunk/app/widgets/gimpuimanager.h	Fri Jun 20 11:08:42 2008
@@ -97,7 +97,7 @@
                                              GtkWidget              *parent,
                                              GimpMenuPositionFunc    position_func,
                                              gpointer                position_data,
-                                             GtkDestroyNotify        popdown_func,
+                                             GDestroyNotify          popdown_func,
                                              gpointer                popdown_data);
 
 

Modified: trunk/plug-ins/common/filter-pack.c
==============================================================================
--- trunk/plug-ins/common/filter-pack.c	(original)
+++ trunk/plug-ins/common/filter-pack.c	Fri Jun 20 11:08:42 2008
@@ -204,7 +204,7 @@
 
 static void         fp_frames_checkbutton_in_box (GtkWidget      *vbox,
                                                   const gchar    *label,
-                                                  GtkSignalFunc   func,
+                                                  GCallback       func,
                                                   GtkWidget      *frame,
                                                   gboolean        clicked);
 
@@ -698,19 +698,19 @@
   gtk_widget_show (box);
 
   fp_frames_checkbutton_in_box (box, _("_Hue"),
-                                GTK_SIGNAL_FUNC (fp_show_hide_frame),
+                                G_CALLBACK (fp_show_hide_frame),
                                 fp_frames.palette,
                                 fpvals.visible_frames & HUE);
   fp_frames_checkbutton_in_box (box, _("_Saturation"),
-                                GTK_SIGNAL_FUNC (fp_show_hide_frame),
+                                G_CALLBACK (fp_show_hide_frame),
                                 fp_frames.satur,
                                 fpvals.visible_frames & SATURATION);
   fp_frames_checkbutton_in_box (box, _("_Value"),
-                                GTK_SIGNAL_FUNC (fp_show_hide_frame),
+                                G_CALLBACK (fp_show_hide_frame),
                                 fp_frames.lnd,
                                 fpvals.visible_frames & VALUE);
   fp_frames_checkbutton_in_box (box, _("A_dvanced"),
-                                GTK_SIGNAL_FUNC (fp_show_hide_frame),
+                                G_CALLBACK (fp_show_hide_frame),
                                 AW.window,
                                 FALSE);
   gtk_widget_show (frame);
@@ -897,7 +897,7 @@
 static void
 fp_frames_checkbutton_in_box (GtkWidget     *vbox,
                               const gchar   *label,
-                              GtkSignalFunc  function,
+                              GCallback      function,
                               GtkWidget     *frame,
                               gboolean       clicked)
 {
@@ -909,7 +909,7 @@
   gtk_widget_show (button);
 
   g_signal_connect (button, "clicked",
-                    G_CALLBACK (function),
+                    function,
                     frame);
 
   gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (button), clicked);

Modified: trunk/plug-ins/common/sample-colorize.c
==============================================================================
--- trunk/plug-ins/common/sample-colorize.c	(original)
+++ trunk/plug-ins/common/sample-colorize.c	Fri Jun 20 11:08:42 2008
@@ -1428,7 +1428,7 @@
   gtk_widget_show (check_button);
 
   g_signal_connect (check_button, "toggled",
-                    (GtkSignalFunc)smp_toggle_callback ,
+                    G_CALLBACK (smp_toggle_callback),
                     &g_di.sample_show_selection);
   gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (check_button),
                                 g_di.sample_show_selection);
@@ -1439,7 +1439,7 @@
   gtk_widget_show (check_button);
 
   g_signal_connect (check_button, "toggled",
-                    (GtkSignalFunc)smp_toggle_callback ,
+                    G_CALLBACK (smp_toggle_callback),
                     &g_di.sample_show_color);
   gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (check_button),
                                 g_di.sample_show_color);

Modified: trunk/plug-ins/help-browser/gimpthrobber.c
==============================================================================
--- trunk/plug-ins/help-browser/gimpthrobber.c	(original)
+++ trunk/plug-ins/help-browser/gimpthrobber.c	Fri Jun 20 11:08:42 2008
@@ -80,7 +80,7 @@
 GType
 gimp_throbber_get_type (void)
 {
-  static GtkType type = 0;
+  static GType type = 0;
 
   if (!type)
     {
@@ -101,6 +101,7 @@
                                      "GimpThrobber",
                                      &type_info, 0);
     }
+
   return type;
 }
 

Modified: trunk/plug-ins/imagemap/imap_main.c
==============================================================================
--- trunk/plug-ins/imagemap/imap_main.c	(original)
+++ trunk/plug-ins/imagemap/imap_main.c	Fri Jun 20 11:08:42 2008
@@ -1309,10 +1309,10 @@
    gtk_box_pack_start(GTK_BOX(hbox), tools, FALSE, FALSE, 0);
 
    _preview = make_preview(drawable);
-   add_preview_motion_event(_preview, (GtkSignalFunc) preview_move);
-   add_enter_notify_event(_preview, (GtkSignalFunc) preview_enter);
-   add_leave_notify_event(_preview, (GtkSignalFunc) preview_leave);
-   add_preview_button_press_event(_preview, (GtkSignalFunc) button_press);
+   add_preview_motion_event(_preview, G_CALLBACK (preview_move));
+   add_enter_notify_event(_preview, G_CALLBACK (preview_enter));
+   add_leave_notify_event(_preview, G_CALLBACK (preview_leave));
+   add_preview_button_press_event(_preview, G_CALLBACK (button_press));
    gtk_container_add(GTK_CONTAINER(hbox), _preview->window);
 
    object_list_add_geometry_cb(_shapes, geometry_changed, NULL);
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]