Add gdk_threads_mutex.

1999-09-17  Tor Lillqvist  <tml@iki.fi>

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

38 files changed, 55 insertions, 55 deletions

diff --git a/gtk/gtkclist.c b/gtk/gtkclist.c
index 2d719aeb9..d6a724195 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 c773f624e..72660d3d5 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 7c85cb7d2..d511b0377 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 f1b49e4d0..aabc5da14 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 a91455006..468116517 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 05627c827..1bb7c2481 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 e05e546bc..2bc19bcba 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 b09c22aa7..d5e71bce0 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 c4771440e..94204aeb6 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 93ffbe2de..15bd74595 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 9bc2ef9a6..a36ccd7a8 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 c1ff90307..51513108d 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 ab8b4cf89..460022f59 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 332aa10a6..ab9cef0c6 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 51843e8bb..04b2f49f8 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 4b934b6b8..4109c8ba2 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 c718052c6..64249bc02 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 e07f50069..d1430c9c0 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 737671deb..1e387bcb9 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 85ea95610..28656572b 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 02a2d9d46..a2c4419c9 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 a68061611..d9b588232 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 3dac4d60f..725cd0f75 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 f1fd4f57d..868288361 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 2e830b5d6..6fe8bd7b5 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 6b6d391cb..df98fdc4d 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 3201d4829..f1d21fa30 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 e5f4c254d..713bc16da 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 6bad39f7b..e136bd70b 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 92ce69eb6..78b9bcf23 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 768cecc36..686f0e16e 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 76b8d718d..e8775c933 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 98e9b23d0..5b04c3cae 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 ddc97abb9..a88002e04 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 500d902a7..8c684e8e0 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 6ffcfbc3c..942682583 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 c95723541..7900e2ae6 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 349c0d7b4..d4688b00d 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