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

Latest GTK+ trunk deprecations showed some uglyness in gimp: 

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/.


svn path=/trunk/; revision=25965
This commit is contained in:
Michael Natterer 2008-06-20 11:08:42 +00:00 committed by Michael Natterer
parent 2c7845f7ed
commit f53e9a45db
9 changed files with 38 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
ChangeLog
View File

@ -1,3 +1,19 @@
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/.
2008-06-15 Michael Natterer <mitch@gimp.org>
* configure.in: in the check for xfixes, add "true" as

8
app/tools/gimpeditselectiontool.h
View File

@ -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;

2
app/widgets/gimpdockable.c
View File

@ -1245,7 +1245,7 @@ gimp_dockable_show_menu (GimpDockable *dockable)
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;
}

2
app/widgets/gimpuimanager.c
View File

@ -569,7 +569,7 @@ gimp_ui_manager_ui_popup (GimpUIManager *manager,
GtkWidget *parent,
GimpMenuPositionFunc position_func,
gpointer position_data,
GtkDestroyNotify popdown_func,
GDestroyNotify popdown_func,
gpointer popdown_data)
{
GtkWidget *widget;

2
app/widgets/gimpuimanager.h
View File

@ -97,7 +97,7 @@ void gimp_ui_manager_ui_popup (GimpUIManager *manager,
GtkWidget *parent,
GimpMenuPositionFunc position_func,
gpointer position_data,
GtkDestroyNotify popdown_func,
GDestroyNotify popdown_func,
gpointer popdown_data);

14
plug-ins/common/filter-pack.c
View File

@ -204,7 +204,7 @@ static void fp_create_table_entry (GtkWidget **box,
static void fp_frames_checkbutton_in_box (GtkWidget *vbox,
const gchar *label,
GtkSignalFunc func,
GCallback func,
GtkWidget *frame,
gboolean clicked);
@ -698,19 +698,19 @@ fp_create_control (void)
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 @@ fp_create_preview (GtkWidget **preview,
static void
fp_frames_checkbutton_in_box (GtkWidget *vbox,
const gchar *label,
GtkSignalFunc function,
GCallback function,
GtkWidget *frame,
gboolean clicked)
{
@ -909,7 +909,7 @@ fp_frames_checkbutton_in_box (GtkWidget *vbox,
gtk_widget_show (button);
g_signal_connect (button, "clicked",
G_CALLBACK (function),
function,
frame);
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (button), clicked);

4
plug-ins/common/sample-colorize.c
View File

@ -1428,7 +1428,7 @@ smp_dialog (void)
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 @@ smp_dialog (void)
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);

3
plug-ins/help-browser/gimpthrobber.c
View File

@ -80,7 +80,7 @@ struct _GimpThrobberPrivate
GType
gimp_throbber_get_type (void)
{
static GtkType type = 0;
static GType type = 0;
if (!type)
{
@ -101,6 +101,7 @@ gimp_throbber_get_type (void)
"GimpThrobber",
&type_info, 0);
}
return type;
}

8
plug-ins/imagemap/imap_main.c
View File

@ -1309,10 +1309,10 @@ dialog(GimpDrawable *drawable)
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);