From 4850edb29b6a7b887c41623badc49387b73762d7 Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Fri, 17 Sep 1999 18:17:20 +0000 Subject: [PATCH] Add gdk_threads_mutex. 1999-09-17 Tor Lillqvist * gdk/win32/gdk.def: Add gdk_threads_mutex. * gtk/makefile.msc: Correct path to libintl. Thanks to Tomi Ollila and Bernd Herd: Fix some inconsistencies in use of gint vs. int, and gint vs. gboolean in headers and definitions. Use GtkType for the *_get_type functions. Note that these changes preserve binary compatibility. * gdk/gdk.c * gdk/win32/gdk.c * gdk/gdk.h: Fix inconsistencies: gint vs int. * gtk/gtkmain.c * gtk/gtkclist.c * gtk/gtkmenufactory.c * gtk/gtknotebook.c * gtk/gtkwidget.c: Fix inconsistencies, also gint vs. gboolean. * gtk/gtkcolorsel.[ch] * gtk/gtkcombo.[ch] * gtk/gtkdrawingarea.[ch] * gtk/gtkgamma.[ch] * gtk/gtkhandlebox.[ch] * gtk/gtkhpaned.[ch] * gtk/gtkhruler.[ch] * gtk/gtkplug.[ch] * gtk/gtkpreview.[ch] * gtk/gtkruler.[ch] * gtk/gtksocket.[ch] * gtk/gtkstatusbar.[ch] * gtk/gtktoolbar.[ch] * gtk/gtkvbbox.[ch] * gtk/gtkvpaned.[ch] * gtk/gtkvruler.[ch]: Always use type GtkType for the *_get_type functions. * gtk/gtkgamma.h: Fix bug, missing () in call of gtk_gamma_curve_get_type() in GTK_GAMMA_CURVE_CLASS. --- ChangeLog | 43 +++++++++++++++++++++++++++++++++++++++ ChangeLog.pre-2-0 | 43 +++++++++++++++++++++++++++++++++++++++ ChangeLog.pre-2-10 | 43 +++++++++++++++++++++++++++++++++++++++ ChangeLog.pre-2-2 | 43 +++++++++++++++++++++++++++++++++++++++ ChangeLog.pre-2-4 | 43 +++++++++++++++++++++++++++++++++++++++ ChangeLog.pre-2-6 | 43 +++++++++++++++++++++++++++++++++++++++ ChangeLog.pre-2-8 | 43 +++++++++++++++++++++++++++++++++++++++ gdk/gdk.c | 2 +- gdk/gdk.h | 4 ++-- gdk/win32/gdk-win32.def | 1 + gdk/win32/gdk.c | 2 +- gdk/win32/gdk.def | 1 + gdk/win32/gdkmain-win32.c | 2 +- gdk/x11/gdkmain-x11.c | 2 +- gtk/gtkclist.c | 2 +- gtk/gtkcolorsel.c | 4 ++-- gtk/gtkcolorsel.h | 2 +- gtk/gtkcombo.c | 4 ++-- gtk/gtkcombo.h | 2 +- gtk/gtkdrawingarea.c | 4 ++-- gtk/gtkdrawingarea.h | 2 +- gtk/gtkgamma.c | 4 ++-- gtk/gtkgamma.h | 4 ++-- gtk/gtkhandlebox.c | 4 ++-- gtk/gtkhandlebox.h | 2 +- gtk/gtkhpaned.c | 4 ++-- gtk/gtkhpaned.h | 2 +- gtk/gtkhruler.c | 4 ++-- gtk/gtkhruler.h | 2 +- gtk/gtkmain.c | 2 +- gtk/gtkmenufactory.c | 2 +- gtk/gtknotebook.c | 2 +- gtk/gtkplug.c | 4 ++-- gtk/gtkplug.h | 2 +- gtk/gtkpreview.c | 4 ++-- gtk/gtkpreview.h | 2 +- gtk/gtkruler.c | 4 ++-- gtk/gtkruler.h | 2 +- gtk/gtksocket.c | 4 ++-- gtk/gtksocket.h | 2 +- gtk/gtkstatusbar.c | 4 ++-- gtk/gtkstatusbar.h | 2 +- gtk/gtktoolbar.c | 4 ++-- gtk/gtktoolbar.h | 2 +- gtk/gtkvbbox.c | 4 ++-- gtk/gtkvbbox.h | 2 +- gtk/gtkvpaned.c | 4 ++-- gtk/gtkvpaned.h | 2 +- gtk/gtkvruler.c | 4 ++-- gtk/gtkvruler.h | 2 +- gtk/gtkwidget.c | 2 +- gtk/makefile.msc | 2 +- 52 files changed, 364 insertions(+), 61 deletions(-) diff --git a/ChangeLog b/ChangeLog index 035debccd0..dc1d79c638 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,46 @@ +1999-09-17 Tor Lillqvist + + * gdk/win32/gdk.def: Add gdk_threads_mutex. + + * gtk/makefile.msc: Correct path to libintl. + + Thanks to Tomi Ollila and Bernd Herd: Fix some inconsistencies in + use of gint vs. int, and gint vs. gboolean in headers and + definitions. Use GtkType for the *_get_type functions. Note that + these changes preserve binary compatibility. + + * gdk/gdk.c + * gdk/win32/gdk.c + * gdk/gdk.h: Fix inconsistencies: gint vs int. + + * gtk/gtkmain.c + * gtk/gtkclist.c + * gtk/gtkmenufactory.c + * gtk/gtknotebook.c + * gtk/gtkwidget.c: Fix inconsistencies, also gint + vs. gboolean. + + * gtk/gtkcolorsel.[ch] + * gtk/gtkcombo.[ch] + * gtk/gtkdrawingarea.[ch] + * gtk/gtkgamma.[ch] + * gtk/gtkhandlebox.[ch] + * gtk/gtkhpaned.[ch] + * gtk/gtkhruler.[ch] + * gtk/gtkplug.[ch] + * gtk/gtkpreview.[ch] + * gtk/gtkruler.[ch] + * gtk/gtksocket.[ch] + * gtk/gtkstatusbar.[ch] + * gtk/gtktoolbar.[ch] + * gtk/gtkvbbox.[ch] + * gtk/gtkvpaned.[ch] + * gtk/gtkvruler.[ch]: Always use type GtkType for the *_get_type + functions. + + * gtk/gtkgamma.h: Fix bug, missing () in call of + gtk_gamma_curve_get_type() in GTK_GAMMA_CURVE_CLASS. + 1999-09-14 Tor Lillqvist * gdk/gdkcolor.c (gdk_colormap_new) diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index 035debccd0..dc1d79c638 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,46 @@ +1999-09-17 Tor Lillqvist + + * gdk/win32/gdk.def: Add gdk_threads_mutex. + + * gtk/makefile.msc: Correct path to libintl. + + Thanks to Tomi Ollila and Bernd Herd: Fix some inconsistencies in + use of gint vs. int, and gint vs. gboolean in headers and + definitions. Use GtkType for the *_get_type functions. Note that + these changes preserve binary compatibility. + + * gdk/gdk.c + * gdk/win32/gdk.c + * gdk/gdk.h: Fix inconsistencies: gint vs int. + + * gtk/gtkmain.c + * gtk/gtkclist.c + * gtk/gtkmenufactory.c + * gtk/gtknotebook.c + * gtk/gtkwidget.c: Fix inconsistencies, also gint + vs. gboolean. + + * gtk/gtkcolorsel.[ch] + * gtk/gtkcombo.[ch] + * gtk/gtkdrawingarea.[ch] + * gtk/gtkgamma.[ch] + * gtk/gtkhandlebox.[ch] + * gtk/gtkhpaned.[ch] + * gtk/gtkhruler.[ch] + * gtk/gtkplug.[ch] + * gtk/gtkpreview.[ch] + * gtk/gtkruler.[ch] + * gtk/gtksocket.[ch] + * gtk/gtkstatusbar.[ch] + * gtk/gtktoolbar.[ch] + * gtk/gtkvbbox.[ch] + * gtk/gtkvpaned.[ch] + * gtk/gtkvruler.[ch]: Always use type GtkType for the *_get_type + functions. + + * gtk/gtkgamma.h: Fix bug, missing () in call of + gtk_gamma_curve_get_type() in GTK_GAMMA_CURVE_CLASS. + 1999-09-14 Tor Lillqvist * gdk/gdkcolor.c (gdk_colormap_new) diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 035debccd0..dc1d79c638 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,46 @@ +1999-09-17 Tor Lillqvist + + * gdk/win32/gdk.def: Add gdk_threads_mutex. + + * gtk/makefile.msc: Correct path to libintl. + + Thanks to Tomi Ollila and Bernd Herd: Fix some inconsistencies in + use of gint vs. int, and gint vs. gboolean in headers and + definitions. Use GtkType for the *_get_type functions. Note that + these changes preserve binary compatibility. + + * gdk/gdk.c + * gdk/win32/gdk.c + * gdk/gdk.h: Fix inconsistencies: gint vs int. + + * gtk/gtkmain.c + * gtk/gtkclist.c + * gtk/gtkmenufactory.c + * gtk/gtknotebook.c + * gtk/gtkwidget.c: Fix inconsistencies, also gint + vs. gboolean. + + * gtk/gtkcolorsel.[ch] + * gtk/gtkcombo.[ch] + * gtk/gtkdrawingarea.[ch] + * gtk/gtkgamma.[ch] + * gtk/gtkhandlebox.[ch] + * gtk/gtkhpaned.[ch] + * gtk/gtkhruler.[ch] + * gtk/gtkplug.[ch] + * gtk/gtkpreview.[ch] + * gtk/gtkruler.[ch] + * gtk/gtksocket.[ch] + * gtk/gtkstatusbar.[ch] + * gtk/gtktoolbar.[ch] + * gtk/gtkvbbox.[ch] + * gtk/gtkvpaned.[ch] + * gtk/gtkvruler.[ch]: Always use type GtkType for the *_get_type + functions. + + * gtk/gtkgamma.h: Fix bug, missing () in call of + gtk_gamma_curve_get_type() in GTK_GAMMA_CURVE_CLASS. + 1999-09-14 Tor Lillqvist * gdk/gdkcolor.c (gdk_colormap_new) diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 035debccd0..dc1d79c638 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,46 @@ +1999-09-17 Tor Lillqvist + + * gdk/win32/gdk.def: Add gdk_threads_mutex. + + * gtk/makefile.msc: Correct path to libintl. + + Thanks to Tomi Ollila and Bernd Herd: Fix some inconsistencies in + use of gint vs. int, and gint vs. gboolean in headers and + definitions. Use GtkType for the *_get_type functions. Note that + these changes preserve binary compatibility. + + * gdk/gdk.c + * gdk/win32/gdk.c + * gdk/gdk.h: Fix inconsistencies: gint vs int. + + * gtk/gtkmain.c + * gtk/gtkclist.c + * gtk/gtkmenufactory.c + * gtk/gtknotebook.c + * gtk/gtkwidget.c: Fix inconsistencies, also gint + vs. gboolean. + + * gtk/gtkcolorsel.[ch] + * gtk/gtkcombo.[ch] + * gtk/gtkdrawingarea.[ch] + * gtk/gtkgamma.[ch] + * gtk/gtkhandlebox.[ch] + * gtk/gtkhpaned.[ch] + * gtk/gtkhruler.[ch] + * gtk/gtkplug.[ch] + * gtk/gtkpreview.[ch] + * gtk/gtkruler.[ch] + * gtk/gtksocket.[ch] + * gtk/gtkstatusbar.[ch] + * gtk/gtktoolbar.[ch] + * gtk/gtkvbbox.[ch] + * gtk/gtkvpaned.[ch] + * gtk/gtkvruler.[ch]: Always use type GtkType for the *_get_type + functions. + + * gtk/gtkgamma.h: Fix bug, missing () in call of + gtk_gamma_curve_get_type() in GTK_GAMMA_CURVE_CLASS. + 1999-09-14 Tor Lillqvist * gdk/gdkcolor.c (gdk_colormap_new) diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 035debccd0..dc1d79c638 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,46 @@ +1999-09-17 Tor Lillqvist + + * gdk/win32/gdk.def: Add gdk_threads_mutex. + + * gtk/makefile.msc: Correct path to libintl. + + Thanks to Tomi Ollila and Bernd Herd: Fix some inconsistencies in + use of gint vs. int, and gint vs. gboolean in headers and + definitions. Use GtkType for the *_get_type functions. Note that + these changes preserve binary compatibility. + + * gdk/gdk.c + * gdk/win32/gdk.c + * gdk/gdk.h: Fix inconsistencies: gint vs int. + + * gtk/gtkmain.c + * gtk/gtkclist.c + * gtk/gtkmenufactory.c + * gtk/gtknotebook.c + * gtk/gtkwidget.c: Fix inconsistencies, also gint + vs. gboolean. + + * gtk/gtkcolorsel.[ch] + * gtk/gtkcombo.[ch] + * gtk/gtkdrawingarea.[ch] + * gtk/gtkgamma.[ch] + * gtk/gtkhandlebox.[ch] + * gtk/gtkhpaned.[ch] + * gtk/gtkhruler.[ch] + * gtk/gtkplug.[ch] + * gtk/gtkpreview.[ch] + * gtk/gtkruler.[ch] + * gtk/gtksocket.[ch] + * gtk/gtkstatusbar.[ch] + * gtk/gtktoolbar.[ch] + * gtk/gtkvbbox.[ch] + * gtk/gtkvpaned.[ch] + * gtk/gtkvruler.[ch]: Always use type GtkType for the *_get_type + functions. + + * gtk/gtkgamma.h: Fix bug, missing () in call of + gtk_gamma_curve_get_type() in GTK_GAMMA_CURVE_CLASS. + 1999-09-14 Tor Lillqvist * gdk/gdkcolor.c (gdk_colormap_new) diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 035debccd0..dc1d79c638 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,46 @@ +1999-09-17 Tor Lillqvist + + * gdk/win32/gdk.def: Add gdk_threads_mutex. + + * gtk/makefile.msc: Correct path to libintl. + + Thanks to Tomi Ollila and Bernd Herd: Fix some inconsistencies in + use of gint vs. int, and gint vs. gboolean in headers and + definitions. Use GtkType for the *_get_type functions. Note that + these changes preserve binary compatibility. + + * gdk/gdk.c + * gdk/win32/gdk.c + * gdk/gdk.h: Fix inconsistencies: gint vs int. + + * gtk/gtkmain.c + * gtk/gtkclist.c + * gtk/gtkmenufactory.c + * gtk/gtknotebook.c + * gtk/gtkwidget.c: Fix inconsistencies, also gint + vs. gboolean. + + * gtk/gtkcolorsel.[ch] + * gtk/gtkcombo.[ch] + * gtk/gtkdrawingarea.[ch] + * gtk/gtkgamma.[ch] + * gtk/gtkhandlebox.[ch] + * gtk/gtkhpaned.[ch] + * gtk/gtkhruler.[ch] + * gtk/gtkplug.[ch] + * gtk/gtkpreview.[ch] + * gtk/gtkruler.[ch] + * gtk/gtksocket.[ch] + * gtk/gtkstatusbar.[ch] + * gtk/gtktoolbar.[ch] + * gtk/gtkvbbox.[ch] + * gtk/gtkvpaned.[ch] + * gtk/gtkvruler.[ch]: Always use type GtkType for the *_get_type + functions. + + * gtk/gtkgamma.h: Fix bug, missing () in call of + gtk_gamma_curve_get_type() in GTK_GAMMA_CURVE_CLASS. + 1999-09-14 Tor Lillqvist * gdk/gdkcolor.c (gdk_colormap_new) diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 035debccd0..dc1d79c638 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,46 @@ +1999-09-17 Tor Lillqvist + + * gdk/win32/gdk.def: Add gdk_threads_mutex. + + * gtk/makefile.msc: Correct path to libintl. + + Thanks to Tomi Ollila and Bernd Herd: Fix some inconsistencies in + use of gint vs. int, and gint vs. gboolean in headers and + definitions. Use GtkType for the *_get_type functions. Note that + these changes preserve binary compatibility. + + * gdk/gdk.c + * gdk/win32/gdk.c + * gdk/gdk.h: Fix inconsistencies: gint vs int. + + * gtk/gtkmain.c + * gtk/gtkclist.c + * gtk/gtkmenufactory.c + * gtk/gtknotebook.c + * gtk/gtkwidget.c: Fix inconsistencies, also gint + vs. gboolean. + + * gtk/gtkcolorsel.[ch] + * gtk/gtkcombo.[ch] + * gtk/gtkdrawingarea.[ch] + * gtk/gtkgamma.[ch] + * gtk/gtkhandlebox.[ch] + * gtk/gtkhpaned.[ch] + * gtk/gtkhruler.[ch] + * gtk/gtkplug.[ch] + * gtk/gtkpreview.[ch] + * gtk/gtkruler.[ch] + * gtk/gtksocket.[ch] + * gtk/gtkstatusbar.[ch] + * gtk/gtktoolbar.[ch] + * gtk/gtkvbbox.[ch] + * gtk/gtkvpaned.[ch] + * gtk/gtkvruler.[ch]: Always use type GtkType for the *_get_type + functions. + + * gtk/gtkgamma.h: Fix bug, missing () in call of + gtk_gamma_curve_get_type() in GTK_GAMMA_CURVE_CLASS. + 1999-09-14 Tor Lillqvist * gdk/gdkcolor.c (gdk_colormap_new) diff --git a/gdk/gdk.c b/gdk/gdk.c index afcc3dd257..e907f04adb 100644 --- a/gdk/gdk.c +++ b/gdk/gdk.c @@ -468,7 +468,7 @@ gdk_init (int *argc, char ***argv) */ void -gdk_exit (int errorcode) +gdk_exit (gint errorcode) { /* de-initialisation is done by the gdk_exit_funct(), no need to do this here (Alex J.) */ diff --git a/gdk/gdk.h b/gdk/gdk.h index 2c3d4d2878..9b7e20d72b 100644 --- a/gdk/gdk.h +++ b/gdk/gdk.h @@ -964,8 +964,8 @@ gboolean gdk_region_empty (GdkRegion *region); gboolean gdk_region_equal (GdkRegion *region1, GdkRegion *region2); gboolean gdk_region_point_in (GdkRegion *region, - int x, - int y); + gint x, + gint y); GdkOverlapType gdk_region_rect_in (GdkRegion *region, GdkRectangle *rect); diff --git a/gdk/win32/gdk-win32.def b/gdk/win32/gdk-win32.def index 2b08a07214..e4b02bb0ba 100644 --- a/gdk/win32/gdk-win32.def +++ b/gdk/win32/gdk-win32.def @@ -256,6 +256,7 @@ EXPORTS gdk_text_width_wc gdk_threads_enter gdk_threads_leave + gdk_threads_mutex gdk_time_get gdk_timer_disable gdk_timer_enable diff --git a/gdk/win32/gdk.c b/gdk/win32/gdk.c index 96d6a1c125..8566e2913b 100644 --- a/gdk/win32/gdk.c +++ b/gdk/win32/gdk.c @@ -306,7 +306,7 @@ gdk_init (int *argc, char ***argv) */ void -gdk_exit (int errorcode) +gdk_exit (gint errorcode) { /* de-initialisation is done by the gdk_exit_func(), no need to do this here (Alex J.) */ diff --git a/gdk/win32/gdk.def b/gdk/win32/gdk.def index 2b08a07214..e4b02bb0ba 100644 --- a/gdk/win32/gdk.def +++ b/gdk/win32/gdk.def @@ -256,6 +256,7 @@ EXPORTS gdk_text_width_wc gdk_threads_enter gdk_threads_leave + gdk_threads_mutex gdk_time_get gdk_timer_disable gdk_timer_enable diff --git a/gdk/win32/gdkmain-win32.c b/gdk/win32/gdkmain-win32.c index 96d6a1c125..8566e2913b 100644 --- a/gdk/win32/gdkmain-win32.c +++ b/gdk/win32/gdkmain-win32.c @@ -306,7 +306,7 @@ gdk_init (int *argc, char ***argv) */ void -gdk_exit (int errorcode) +gdk_exit (gint errorcode) { /* de-initialisation is done by the gdk_exit_func(), no need to do this here (Alex J.) */ diff --git a/gdk/x11/gdkmain-x11.c b/gdk/x11/gdkmain-x11.c index afcc3dd257..e907f04adb 100644 --- a/gdk/x11/gdkmain-x11.c +++ b/gdk/x11/gdkmain-x11.c @@ -468,7 +468,7 @@ gdk_init (int *argc, char ***argv) */ void -gdk_exit (int errorcode) +gdk_exit (gint errorcode) { /* de-initialisation is done by the gdk_exit_funct(), no need to do this here (Alex J.) */ diff --git a/gtk/gtkclist.c b/gtk/gtkclist.c index 2d719aeb94..d6a7241954 100644 --- a/gtk/gtkclist.c +++ b/gtk/gtkclist.c @@ -1607,7 +1607,7 @@ gtk_clist_set_column_visibility (GtkCList *clist, void gtk_clist_set_column_resizeable (GtkCList *clist, gint column, - gint resizeable) + gboolean resizeable) { g_return_if_fail (clist != NULL); g_return_if_fail (GTK_IS_CLIST (clist)); diff --git a/gtk/gtkcolorsel.c b/gtk/gtkcolorsel.c index c773f624ec..72660d3d5e 100644 --- a/gtk/gtkcolorsel.c +++ b/gtk/gtkcolorsel.c @@ -219,10 +219,10 @@ static const scale_val_type scale_vals[NUM_CHANNELS] = {N_("Opacity:"), 0.0, 1.0, 0.01, 0.01, (SF) gtk_color_selection_opacity_updater} }; -guint +GtkType gtk_color_selection_get_type (void) { - static guint color_selection_type = 0; + static GtkType color_selection_type = 0; if (!color_selection_type) { diff --git a/gtk/gtkcolorsel.h b/gtk/gtkcolorsel.h index 7c85cb7d2a..d511b03775 100644 --- a/gtk/gtkcolorsel.h +++ b/gtk/gtkcolorsel.h @@ -122,7 +122,7 @@ struct _GtkColorSelectionDialogClass /* ColorSelection */ -guint gtk_color_selection_get_type (void); +GtkType gtk_color_selection_get_type (void); GtkWidget* gtk_color_selection_new (void); diff --git a/gtk/gtkcombo.c b/gtk/gtkcombo.c index f1b49e4d00..aabc5da141 100644 --- a/gtk/gtkcombo.c +++ b/gtk/gtkcombo.c @@ -739,10 +739,10 @@ gtk_combo_init (GtkCombo * combo) GTK_SIGNAL_FUNC (gtk_combo_list_enter), combo); } -guint +GtkType gtk_combo_get_type (void) { - static guint combo_type = 0; + static GtkType combo_type = 0; if (!combo_type) { diff --git a/gtk/gtkcombo.h b/gtk/gtkcombo.h index a914550067..468116517c 100644 --- a/gtk/gtkcombo.h +++ b/gtk/gtkcombo.h @@ -67,7 +67,7 @@ struct _GtkComboClass { GtkHBoxClass parent_class; }; -guint gtk_combo_get_type (void); +GtkType gtk_combo_get_type (void); GtkWidget *gtk_combo_new (void); /* the text in the entry must be or not be in the list */ diff --git a/gtk/gtkdrawingarea.c b/gtk/gtkdrawingarea.c index 05627c8278..1bb7c24813 100644 --- a/gtk/gtkdrawingarea.c +++ b/gtk/gtkdrawingarea.c @@ -35,10 +35,10 @@ static void gtk_drawing_area_size_allocate (GtkWidget *widget, static void gtk_drawing_area_send_configure (GtkDrawingArea *darea); -guint +GtkType gtk_drawing_area_get_type (void) { - static guint drawing_area_type = 0; + static GtkType drawing_area_type = 0; if (!drawing_area_type) { diff --git a/gtk/gtkdrawingarea.h b/gtk/gtkdrawingarea.h index e05e546bc4..2bc19bcbaf 100644 --- a/gtk/gtkdrawingarea.h +++ b/gtk/gtkdrawingarea.h @@ -58,7 +58,7 @@ struct _GtkDrawingAreaClass }; -guint gtk_drawing_area_get_type (void); +GtkType gtk_drawing_area_get_type (void); GtkWidget* gtk_drawing_area_new (void); void gtk_drawing_area_size (GtkDrawingArea *darea, gint width, diff --git a/gtk/gtkgamma.c b/gtk/gtkgamma.c index b09c22aa7e..d5e71bce0e 100644 --- a/gtk/gtkgamma.c +++ b/gtk/gtkgamma.c @@ -211,10 +211,10 @@ static const char *xpm[][27] = } }; -guint +GtkType gtk_gamma_curve_get_type (void) { - static guint gamma_curve_type = 0; + static GtkType gamma_curve_type = 0; if (!gamma_curve_type) { diff --git a/gtk/gtkgamma.h b/gtk/gtkgamma.h index c4771440eb..94204aeb69 100644 --- a/gtk/gtkgamma.h +++ b/gtk/gtkgamma.h @@ -40,7 +40,7 @@ extern "C" { #define GTK_GAMMA_CURVE(obj) \ GTK_CHECK_CAST (obj, gtk_gamma_curve_get_type (), GtkGammaCurve) #define GTK_GAMMA_CURVE_CLASS(klass) \ - GTK_CHECK_CLASS_CAST (klass, gtk_gamma_curve_get_type, GtkGammaCurveClass) + GTK_CHECK_CLASS_CAST (klass, gtk_gamma_curve_get_type (), GtkGammaCurveClass) #define GTK_IS_GAMMA_CURVE(obj) \ GTK_CHECK_TYPE (obj, gtk_gamma_curve_get_type ()) @@ -68,7 +68,7 @@ struct _GtkGammaCurveClass }; -guint gtk_gamma_curve_get_type (void); +GtkType gtk_gamma_curve_get_type (void); GtkWidget* gtk_gamma_curve_new (void); diff --git a/gtk/gtkhandlebox.c b/gtk/gtkhandlebox.c index 93ffbe2de6..15bd74595f 100644 --- a/gtk/gtkhandlebox.c +++ b/gtk/gtkhandlebox.c @@ -133,10 +133,10 @@ static GtkBinClass *parent_class; static guint handle_box_signals[SIGNAL_LAST] = { 0 }; -guint +GtkType gtk_handle_box_get_type (void) { - static guint handle_box_type = 0; + static GtkType handle_box_type = 0; if (!handle_box_type) { diff --git a/gtk/gtkhandlebox.h b/gtk/gtkhandlebox.h index 9bc2ef9a60..a36ccd7a88 100644 --- a/gtk/gtkhandlebox.h +++ b/gtk/gtkhandlebox.h @@ -85,7 +85,7 @@ struct _GtkHandleBoxClass }; -guint gtk_handle_box_get_type (void); +GtkType gtk_handle_box_get_type (void); GtkWidget* gtk_handle_box_new (void); void gtk_handle_box_set_shadow_type (GtkHandleBox *handle_box, GtkShadowType type); diff --git a/gtk/gtkhpaned.c b/gtk/gtkhpaned.c index c1ff903072..51513108d4 100644 --- a/gtk/gtkhpaned.c +++ b/gtk/gtkhpaned.c @@ -44,10 +44,10 @@ static gint gtk_hpaned_button_release (GtkWidget *widget, static gint gtk_hpaned_motion (GtkWidget *widget, GdkEventMotion *event); -guint +GtkType gtk_hpaned_get_type (void) { - static guint hpaned_type = 0; + static GtkType hpaned_type = 0; if (!hpaned_type) { diff --git a/gtk/gtkhpaned.h b/gtk/gtkhpaned.h index ab8b4cf89b..460022f59f 100644 --- a/gtk/gtkhpaned.h +++ b/gtk/gtkhpaned.h @@ -56,7 +56,7 @@ struct _GtkHPanedClass }; -guint gtk_hpaned_get_type (void); +GtkType gtk_hpaned_get_type (void); GtkWidget* gtk_hpaned_new (void); diff --git a/gtk/gtkhruler.c b/gtk/gtkhruler.c index 332aa10a6f..ab9cef0c6d 100644 --- a/gtk/gtkhruler.c +++ b/gtk/gtkhruler.c @@ -46,10 +46,10 @@ static void gtk_hruler_draw_ticks (GtkRuler *ruler); static void gtk_hruler_draw_pos (GtkRuler *ruler); -guint +GtkType gtk_hruler_get_type (void) { - static guint hruler_type = 0; + static GtkType hruler_type = 0; if (!hruler_type) { diff --git a/gtk/gtkhruler.h b/gtk/gtkhruler.h index 51843e8bbd..04b2f49f84 100644 --- a/gtk/gtkhruler.h +++ b/gtk/gtkhruler.h @@ -56,7 +56,7 @@ struct _GtkHRulerClass }; -guint gtk_hruler_get_type (void); +GtkType gtk_hruler_get_type (void); GtkWidget* gtk_hruler_new (void); diff --git a/gtk/gtkmain.c b/gtk/gtkmain.c index 4b934b6b84..4109c8ba2c 100644 --- a/gtk/gtkmain.c +++ b/gtk/gtkmain.c @@ -473,7 +473,7 @@ gtk_init (int *argc, char ***argv) } void -gtk_exit (int errorcode) +gtk_exit (gint errorcode) { /* Only if "gtk" has been initialized should we de-initialize. */ diff --git a/gtk/gtkmenufactory.c b/gtk/gtkmenufactory.c index c718052c64..64249bc029 100644 --- a/gtk/gtkmenufactory.c +++ b/gtk/gtkmenufactory.c @@ -420,7 +420,7 @@ gtk_menu_factory_make_widget (GtkMenuFactory *factory) static GtkMenuPath* gtk_menu_factory_get (GtkWidget *parent, const char *path, - int flags) + gint flags) { GtkMenuPath *menu_path; GList *tmp_list; diff --git a/gtk/gtknotebook.c b/gtk/gtknotebook.c index e07f500690..d1430c9c0d 100644 --- a/gtk/gtknotebook.c +++ b/gtk/gtknotebook.c @@ -3811,7 +3811,7 @@ gtk_notebook_prev_page (GtkNotebook *notebook) */ void gtk_notebook_set_show_border (GtkNotebook *notebook, - gint show_border) + gboolean show_border) { g_return_if_fail (notebook != NULL); g_return_if_fail (GTK_IS_NOTEBOOK (notebook)); diff --git a/gtk/gtkplug.c b/gtk/gtkplug.c index 737671deb1..1e387bcb91 100644 --- a/gtk/gtkplug.c +++ b/gtk/gtkplug.c @@ -44,10 +44,10 @@ static void gtk_plug_set_focus (GtkWindow *window, /* From Tk */ #define EMBEDDED_APP_WANTS_FOCUS NotifyNormal+20 -guint +GtkType gtk_plug_get_type () { - static guint plug_type = 0; + static GtkType plug_type = 0; if (!plug_type) { diff --git a/gtk/gtkplug.h b/gtk/gtkplug.h index 85ea956109..28656572b3 100644 --- a/gtk/gtkplug.h +++ b/gtk/gtkplug.h @@ -60,7 +60,7 @@ struct _GtkPlugClass }; -guint gtk_plug_get_type (void); +GtkType gtk_plug_get_type (void); void gtk_plug_construct (GtkPlug *plug, guint32 socket_id); GtkWidget* gtk_plug_new (guint32 socket_id); diff --git a/gtk/gtkpreview.c b/gtk/gtkpreview.c index 02a2d9d46b..a2c4419c92 100644 --- a/gtk/gtkpreview.c +++ b/gtk/gtkpreview.c @@ -57,10 +57,10 @@ static GtkPreviewClass *preview_class = NULL; static gint install_cmap = FALSE; -guint +GtkType gtk_preview_get_type (void) { - static guint preview_type = 0; + static GtkType preview_type = 0; if (!preview_type) { diff --git a/gtk/gtkpreview.h b/gtk/gtkpreview.h index a680616118..d9b5882327 100644 --- a/gtk/gtkpreview.h +++ b/gtk/gtkpreview.h @@ -88,7 +88,7 @@ struct _GtkPreviewClass }; -guint gtk_preview_get_type (void); +GtkType gtk_preview_get_type (void); void gtk_preview_uninit (void); GtkWidget* gtk_preview_new (GtkPreviewType type); void gtk_preview_size (GtkPreview *preview, diff --git a/gtk/gtkruler.c b/gtk/gtkruler.c index 3dac4d60f2..725cd0f757 100644 --- a/gtk/gtkruler.c +++ b/gtk/gtkruler.c @@ -48,10 +48,10 @@ static const GtkRulerMetric ruler_metrics[] = }; -guint +GtkType gtk_ruler_get_type (void) { - static guint ruler_type = 0; + static GtkType ruler_type = 0; if (!ruler_type) { diff --git a/gtk/gtkruler.h b/gtk/gtkruler.h index f1fd4f57d9..8682883618 100644 --- a/gtk/gtkruler.h +++ b/gtk/gtkruler.h @@ -89,7 +89,7 @@ struct _GtkRulerMetric }; -guint gtk_ruler_get_type (void); +GtkType gtk_ruler_get_type (void); void gtk_ruler_set_metric (GtkRuler *ruler, GtkMetricType metric); void gtk_ruler_set_range (GtkRuler *ruler, diff --git a/gtk/gtksocket.c b/gtk/gtksocket.c index 2e830b5d6b..6fe8bd7b59 100644 --- a/gtk/gtksocket.c +++ b/gtk/gtksocket.c @@ -63,10 +63,10 @@ static GdkFilterReturn gtk_socket_filter_func (GdkXEvent *gdk_xevent, static GtkWidgetClass *parent_class = NULL; -guint +GtkType gtk_socket_get_type () { - static guint socket_type = 0; + static GtkType socket_type = 0; if (!socket_type) { diff --git a/gtk/gtksocket.h b/gtk/gtksocket.h index 6b6d391cb1..df98fdc4d9 100644 --- a/gtk/gtksocket.h +++ b/gtk/gtksocket.h @@ -64,7 +64,7 @@ struct _GtkSocketClass GtkWidget* gtk_socket_new (void); -guint gtk_socket_get_type (void ); +GtkType gtk_socket_get_type (void ); void gtk_socket_steal (GtkSocket *socket, guint32 wid); diff --git a/gtk/gtkstatusbar.c b/gtk/gtkstatusbar.c index 3201d48298..f1d21fa306 100644 --- a/gtk/gtkstatusbar.c +++ b/gtk/gtkstatusbar.c @@ -49,10 +49,10 @@ static void gtk_statusbar_update (GtkStatusbar *statusbar, static GtkContainerClass *parent_class; static guint statusbar_signals[SIGNAL_LAST] = { 0 }; -guint +GtkType gtk_statusbar_get_type (void) { - static guint statusbar_type = 0; + static GtkType statusbar_type = 0; if (!statusbar_type) { diff --git a/gtk/gtkstatusbar.h b/gtk/gtkstatusbar.h index e5f4c254d8..713bc16daa 100644 --- a/gtk/gtkstatusbar.h +++ b/gtk/gtkstatusbar.h @@ -77,7 +77,7 @@ struct _GtkStatusbarMsg guint message_id; }; -guint gtk_statusbar_get_type (void); +GtkType gtk_statusbar_get_type (void); GtkWidget* gtk_statusbar_new (void); guint gtk_statusbar_get_context_id (GtkStatusbar *statusbar, const gchar *context_description); diff --git a/gtk/gtktoolbar.c b/gtk/gtktoolbar.c index 6bad39f7b5..e136bd70b7 100644 --- a/gtk/gtktoolbar.c +++ b/gtk/gtktoolbar.c @@ -86,10 +86,10 @@ static GtkContainerClass *parent_class; static guint toolbar_signals[LAST_SIGNAL] = { 0 }; -guint +GtkType gtk_toolbar_get_type (void) { - static guint toolbar_type = 0; + static GtkType toolbar_type = 0; if (!toolbar_type) { diff --git a/gtk/gtktoolbar.h b/gtk/gtktoolbar.h index 92ce69eb60..78b9bcf235 100644 --- a/gtk/gtktoolbar.h +++ b/gtk/gtktoolbar.h @@ -102,7 +102,7 @@ struct _GtkToolbarClass }; -guint gtk_toolbar_get_type (void); +GtkType gtk_toolbar_get_type (void); GtkWidget *gtk_toolbar_new (GtkOrientation orientation, GtkToolbarStyle style); diff --git a/gtk/gtkvbbox.c b/gtk/gtkvbbox.c index 768cecc36c..686f0e16e2 100644 --- a/gtk/gtkvbbox.c +++ b/gtk/gtkvbbox.c @@ -37,10 +37,10 @@ static void gtk_vbutton_box_size_allocate (GtkWidget *widget, static gint default_spacing = 10; static GtkButtonBoxStyle default_layout_style = GTK_BUTTONBOX_EDGE; -guint +GtkType gtk_vbutton_box_get_type (void) { - static guint vbutton_box_type = 0; + static GtkType vbutton_box_type = 0; if (!vbutton_box_type) { diff --git a/gtk/gtkvbbox.h b/gtk/gtkvbbox.h index 76b8d718dd..e8775c933d 100644 --- a/gtk/gtkvbbox.h +++ b/gtk/gtkvbbox.h @@ -55,7 +55,7 @@ struct _GtkVButtonBoxClass }; -guint gtk_vbutton_box_get_type (void); +GtkType gtk_vbutton_box_get_type (void); GtkWidget *gtk_vbutton_box_new (void); /* buttons can be added by gtk_container_add() */ diff --git a/gtk/gtkvpaned.c b/gtk/gtkvpaned.c index 98e9b23d00..5b04c3cae4 100644 --- a/gtk/gtkvpaned.c +++ b/gtk/gtkvpaned.c @@ -44,10 +44,10 @@ static gint gtk_vpaned_button_release (GtkWidget *widget, static gint gtk_vpaned_motion (GtkWidget *widget, GdkEventMotion *event); -guint +GtkType gtk_vpaned_get_type (void) { - static guint vpaned_type = 0; + static GtkType vpaned_type = 0; if (!vpaned_type) { diff --git a/gtk/gtkvpaned.h b/gtk/gtkvpaned.h index ddc97abb95..a88002e043 100644 --- a/gtk/gtkvpaned.h +++ b/gtk/gtkvpaned.h @@ -56,7 +56,7 @@ struct _GtkVPanedClass }; -guint gtk_vpaned_get_type (void); +GtkType gtk_vpaned_get_type (void); GtkWidget* gtk_vpaned_new (void); diff --git a/gtk/gtkvruler.c b/gtk/gtkvruler.c index 500d902a79..8c684e8e08 100644 --- a/gtk/gtkvruler.c +++ b/gtk/gtkvruler.c @@ -46,10 +46,10 @@ static void gtk_vruler_draw_ticks (GtkRuler *ruler); static void gtk_vruler_draw_pos (GtkRuler *ruler); -guint +GtkType gtk_vruler_get_type (void) { - static guint vruler_type = 0; + static GtkType vruler_type = 0; if (!vruler_type) { diff --git a/gtk/gtkvruler.h b/gtk/gtkvruler.h index 6ffcfbc3cb..9426825830 100644 --- a/gtk/gtkvruler.h +++ b/gtk/gtkvruler.h @@ -56,7 +56,7 @@ struct _GtkVRulerClass }; -guint gtk_vruler_get_type (void); +GtkType gtk_vruler_get_type (void); GtkWidget* gtk_vruler_new (void); diff --git a/gtk/gtkwidget.c b/gtk/gtkwidget.c index c95723541c..7900e2ae6e 100644 --- a/gtk/gtkwidget.c +++ b/gtk/gtkwidget.c @@ -3253,7 +3253,7 @@ gtk_widget_set_app_paintable (GtkWidget *widget, void gtk_widget_set_sensitive (GtkWidget *widget, - gint sensitive) + gboolean sensitive) { GtkStateData data; diff --git a/gtk/makefile.msc b/gtk/makefile.msc index 349c0d7b4c..d4688b00d9 100755 --- a/gtk/makefile.msc +++ b/gtk/makefile.msc @@ -44,7 +44,7 @@ GTK_VER=1.3 GDKSYSDEP = ..\gdk\win32 GLIB = ..\..\glib -INTL = ..\..\gettext-0.10.35 +INTL = ..\..\intl CFLAGS = -I. -I.. -I$(GDKSYSDEP) -I$(GLIB) -I$(GLIB)\gmodule -I$(INTL) -DGTK_DISABLE_COMPAT_H