gdk/makefile.{mingw,msc} gdk/win32/makefile.{mingw,msc} Update for current

2001-09-28 Tor Lillqvist <tml@iki.fi> * gdk/makefile.{mingw,msc} * gdk/win32/makefile.{mingw,msc} * gtk/makefile.mingw: Update for current GLib and build/win32. Remove pthreads reference (and don't try to build testthreads.exe). * gdk/win32/gdkcolor-win32.c * gdk/win32/gdkfont-win32.c * gdk/win32/gdkgc-win32.c * gdk/win32/gdkevents-win32.c * gdk/win32/gdkinput-win32.c * gdk/win32/gdkmain-win32.c * gdk/win32/gdkpixmap-win32.c: Remove some unused variables to silence compilers. * gdk/win32/gdkevents-win32.c (print_event_mask): New debug print function. * gtk/gtkitemfactory.c (gtk_item_factory_parse_rc): Remove call to deprecated g_scanner_stat_mode().
2001-09-27 23:01:54 +00:00
parent 702588a970
commit 65ee13db63
21 changed files with 242 additions and 80 deletions
--- a/25
+++ b/25
@@ -1,6 +1,29 @@
+2001-09-28  Tor Lillqvist  <tml@iki.fi>
+
+	* gdk/makefile.{mingw,msc}
+	* gdk/win32/makefile.{mingw,msc}
+	* gtk/makefile.mingw: Update for current GLib and
+	build/win32. Remove pthreads reference (and don't try to build
+	testthreads.exe).
+
+	* gdk/win32/gdkcolor-win32.c
+	* gdk/win32/gdkfont-win32.c
+	* gdk/win32/gdkgc-win32.c
+	* gdk/win32/gdkevents-win32.c
+	* gdk/win32/gdkinput-win32.c
+	* gdk/win32/gdkmain-win32.c
+	* gdk/win32/gdkpixmap-win32.c: Remove some unused variables to
+	silence compilers.
+
+	* gdk/win32/gdkevents-win32.c (print_event_mask): New debug print
+	function.
+
+	* gtk/gtkitemfactory.c (gtk_item_factory_parse_rc): Remove call to
+	deprecated g_scanner_stat_mode().
+
 2001-03-08  Tor Lillqvist  <tml@iki.fi>

-	* gdk\win32\Makefile.am (EXTRA_DIST): Remove the rc/*.cur files
+	* gdk/win32/Makefile.am (EXTRA_DIST): Remove the rc/*.cur files
 	that have been removed; add the new xcursors.h and bdfcursor.c
 	files.

--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,6 +1,29 @@
+2001-09-28  Tor Lillqvist  <tml@iki.fi>
+
+	* gdk/makefile.{mingw,msc}
+	* gdk/win32/makefile.{mingw,msc}
+	* gtk/makefile.mingw: Update for current GLib and
+	build/win32. Remove pthreads reference (and don't try to build
+	testthreads.exe).
+
+	* gdk/win32/gdkcolor-win32.c
+	* gdk/win32/gdkfont-win32.c
+	* gdk/win32/gdkgc-win32.c
+	* gdk/win32/gdkevents-win32.c
+	* gdk/win32/gdkinput-win32.c
+	* gdk/win32/gdkmain-win32.c
+	* gdk/win32/gdkpixmap-win32.c: Remove some unused variables to
+	silence compilers.
+
+	* gdk/win32/gdkevents-win32.c (print_event_mask): New debug print
+	function.
+
+	* gtk/gtkitemfactory.c (gtk_item_factory_parse_rc): Remove call to
+	deprecated g_scanner_stat_mode().
+
 2001-03-08  Tor Lillqvist  <tml@iki.fi>

-	* gdk\win32\Makefile.am (EXTRA_DIST): Remove the rc/*.cur files
+	* gdk/win32/Makefile.am (EXTRA_DIST): Remove the rc/*.cur files
 	that have been removed; add the new xcursors.h and bdfcursor.c
 	files.

--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,6 +1,29 @@
+2001-09-28  Tor Lillqvist  <tml@iki.fi>
+
+	* gdk/makefile.{mingw,msc}
+	* gdk/win32/makefile.{mingw,msc}
+	* gtk/makefile.mingw: Update for current GLib and
+	build/win32. Remove pthreads reference (and don't try to build
+	testthreads.exe).
+
+	* gdk/win32/gdkcolor-win32.c
+	* gdk/win32/gdkfont-win32.c
+	* gdk/win32/gdkgc-win32.c
+	* gdk/win32/gdkevents-win32.c
+	* gdk/win32/gdkinput-win32.c
+	* gdk/win32/gdkmain-win32.c
+	* gdk/win32/gdkpixmap-win32.c: Remove some unused variables to
+	silence compilers.
+
+	* gdk/win32/gdkevents-win32.c (print_event_mask): New debug print
+	function.
+
+	* gtk/gtkitemfactory.c (gtk_item_factory_parse_rc): Remove call to
+	deprecated g_scanner_stat_mode().
+
 2001-03-08  Tor Lillqvist  <tml@iki.fi>

-	* gdk\win32\Makefile.am (EXTRA_DIST): Remove the rc/*.cur files
+	* gdk/win32/Makefile.am (EXTRA_DIST): Remove the rc/*.cur files
 	that have been removed; add the new xcursors.h and bdfcursor.c
 	files.

--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,6 +1,29 @@
+2001-09-28  Tor Lillqvist  <tml@iki.fi>
+
+	* gdk/makefile.{mingw,msc}
+	* gdk/win32/makefile.{mingw,msc}
+	* gtk/makefile.mingw: Update for current GLib and
+	build/win32. Remove pthreads reference (and don't try to build
+	testthreads.exe).
+
+	* gdk/win32/gdkcolor-win32.c
+	* gdk/win32/gdkfont-win32.c
+	* gdk/win32/gdkgc-win32.c
+	* gdk/win32/gdkevents-win32.c
+	* gdk/win32/gdkinput-win32.c
+	* gdk/win32/gdkmain-win32.c
+	* gdk/win32/gdkpixmap-win32.c: Remove some unused variables to
+	silence compilers.
+
+	* gdk/win32/gdkevents-win32.c (print_event_mask): New debug print
+	function.
+
+	* gtk/gtkitemfactory.c (gtk_item_factory_parse_rc): Remove call to
+	deprecated g_scanner_stat_mode().
+
 2001-03-08  Tor Lillqvist  <tml@iki.fi>

-	* gdk\win32\Makefile.am (EXTRA_DIST): Remove the rc/*.cur files
+	* gdk/win32/Makefile.am (EXTRA_DIST): Remove the rc/*.cur files
 	that have been removed; add the new xcursors.h and bdfcursor.c
 	files.

--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,6 +1,29 @@
+2001-09-28  Tor Lillqvist  <tml@iki.fi>
+
+	* gdk/makefile.{mingw,msc}
+	* gdk/win32/makefile.{mingw,msc}
+	* gtk/makefile.mingw: Update for current GLib and
+	build/win32. Remove pthreads reference (and don't try to build
+	testthreads.exe).
+
+	* gdk/win32/gdkcolor-win32.c
+	* gdk/win32/gdkfont-win32.c
+	* gdk/win32/gdkgc-win32.c
+	* gdk/win32/gdkevents-win32.c
+	* gdk/win32/gdkinput-win32.c
+	* gdk/win32/gdkmain-win32.c
+	* gdk/win32/gdkpixmap-win32.c: Remove some unused variables to
+	silence compilers.
+
+	* gdk/win32/gdkevents-win32.c (print_event_mask): New debug print
+	function.
+
+	* gtk/gtkitemfactory.c (gtk_item_factory_parse_rc): Remove call to
+	deprecated g_scanner_stat_mode().
+
 2001-03-08  Tor Lillqvist  <tml@iki.fi>

-	* gdk\win32\Makefile.am (EXTRA_DIST): Remove the rc/*.cur files
+	* gdk/win32/Makefile.am (EXTRA_DIST): Remove the rc/*.cur files
 	that have been removed; add the new xcursors.h and bdfcursor.c
 	files.

--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,6 +1,29 @@
+2001-09-28  Tor Lillqvist  <tml@iki.fi>
+
+	* gdk/makefile.{mingw,msc}
+	* gdk/win32/makefile.{mingw,msc}
+	* gtk/makefile.mingw: Update for current GLib and
+	build/win32. Remove pthreads reference (and don't try to build
+	testthreads.exe).
+
+	* gdk/win32/gdkcolor-win32.c
+	* gdk/win32/gdkfont-win32.c
+	* gdk/win32/gdkgc-win32.c
+	* gdk/win32/gdkevents-win32.c
+	* gdk/win32/gdkinput-win32.c
+	* gdk/win32/gdkmain-win32.c
+	* gdk/win32/gdkpixmap-win32.c: Remove some unused variables to
+	silence compilers.
+
+	* gdk/win32/gdkevents-win32.c (print_event_mask): New debug print
+	function.
+
+	* gtk/gtkitemfactory.c (gtk_item_factory_parse_rc): Remove call to
+	deprecated g_scanner_stat_mode().
+
 2001-03-08  Tor Lillqvist  <tml@iki.fi>

-	* gdk\win32\Makefile.am (EXTRA_DIST): Remove the rc/*.cur files
+	* gdk/win32/Makefile.am (EXTRA_DIST): Remove the rc/*.cur files
 	that have been removed; add the new xcursors.h and bdfcursor.c
 	files.

--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,6 +1,29 @@
+2001-09-28  Tor Lillqvist  <tml@iki.fi>
+
+	* gdk/makefile.{mingw,msc}
+	* gdk/win32/makefile.{mingw,msc}
+	* gtk/makefile.mingw: Update for current GLib and
+	build/win32. Remove pthreads reference (and don't try to build
+	testthreads.exe).
+
+	* gdk/win32/gdkcolor-win32.c
+	* gdk/win32/gdkfont-win32.c
+	* gdk/win32/gdkgc-win32.c
+	* gdk/win32/gdkevents-win32.c
+	* gdk/win32/gdkinput-win32.c
+	* gdk/win32/gdkmain-win32.c
+	* gdk/win32/gdkpixmap-win32.c: Remove some unused variables to
+	silence compilers.
+
+	* gdk/win32/gdkevents-win32.c (print_event_mask): New debug print
+	function.
+
+	* gtk/gtkitemfactory.c (gtk_item_factory_parse_rc): Remove call to
+	deprecated g_scanner_stat_mode().
+
 2001-03-08  Tor Lillqvist  <tml@iki.fi>

-	* gdk\win32\Makefile.am (EXTRA_DIST): Remove the rc/*.cur files
+	* gdk/win32/Makefile.am (EXTRA_DIST): Remove the rc/*.cur files
 	that have been removed; add the new xcursors.h and bdfcursor.c
 	files.

--- a/gdk/makefile.mingw
+++ b/gdk/makefile.mingw
@@ -47,7 +47,11 @@ gdkconfig.h : gdkconfig.h.win32
 	cp gdkconfig.h.win32 gdkconfig.h

 gdk-$(GTK_VER).dll : $(gdk_OBJECTS) gdk.def win32/libgdk-win32.a win32/gdk-win32res.o
-	$(GLIB)/build-dll gdk $(GTK_VER) gdk.def $(gdk_OBJECTS) -L win32 -lgdk-win32 -lwntab32x $(GLIB_LIBS) -lgdi32 -luser32 -limm32 -lshell32 -lole32 -luuid $(LDFLAGS) win32/gdk-win32res.o 
+	$(BUILD_DLL) gdk-1.3 - gdk.def $(gdk_OBJECTS) -L win32 -lgdk-win32 -lwntab32x $(GLIB_LIBS) -lgdi32 -luser32 -limm32 -lshell32 -lole32 -luuid $(LDFLAGS) win32/gdk-win32res.o 

 testgdk.exe : testgdk.o gdk-$(GTK_VER).dll
 	$(CC) -o $@ testgdk.o -L . -lgdk-$(GTK_VER) $(GLIB_LIBS)
+
+koe1.exe : koe1.o gdk-$(GTK_VER).dll
+	$(CC) -o $@ koe1.o -L . -lgdk-$(GTK_VER) $(GLIB_LIBS)
+
--- a/gdk/makefile.msc
+++ b/gdk/makefile.msc
@@ -32,7 +32,7 @@ GLIB_VER=1.3
 GTK_VER=1.3

 GLIB = ..\..\glib
-CFLAGS = -I . -I .. -I $(GLIB) -DG_ENABLE_DEBUG -DHAVE_CONFIG_H -DGDK_VERSION=\"$(GTK_VER)\"
+CFLAGS = -I . -I .. -I $(GLIB) -I$(GLIB)\glib -DG_ENABLE_DEBUG -DHAVE_CONFIG_H -DGDK_VERSION=\"$(GTK_VER)\"

 all: \
 	..\config.h \
@@ -60,7 +60,7 @@ gdkconfig.h : gdkconfig.h.win32
 	copy gdkconfig.h.win32 gdkconfig.h

 gdk-$(GTK_VER).dll : $(gdk_OBJECTS) gdk.def win32\gdk-win32.lib
-	$(CC) $(CFLAGS) -LD -Fegdk-$(GTK_VER).dll $(gdk_OBJECTS) win32\gdk-win32.lib $(WTKIT)\lib\i386\wntab32x.lib $(GLIB)\glib-$(GLIB_VER).lib gdi32.lib user32.lib imm32.lib shell32.lib ole32.lib uuid.lib win32\gdk.res $(LDFLAGS) /def:gdk.def
+	$(CC) $(CFLAGS) -LD -Fegdk-$(GTK_VER).dll $(gdk_OBJECTS) win32\gdk-win32.lib $(WTKIT)\lib\i386\wntab32x.lib $(GLIB)\glib\glib-$(GLIB_VER).lib gdi32.lib user32.lib imm32.lib shell32.lib ole32.lib uuid.lib win32\gdk.res $(LDFLAGS) /def:gdk.def

 .c.obj :
 	$(CC) $(CFLAGS) -GD -c -DGDK_COMPILATION -DG_LOG_DOMAIN=\"Gdk\" $<
--- a/gdk/win32/gdkcolor-win32.c
+++ b/gdk/win32/gdkcolor-win32.c
@@ -175,7 +175,6 @@ alloc_color(Colormap  colormap,
 	    gulong   *pixelp)
 {
  PALETTEENTRY entry, closeEntry;
-  HDC hdc;
  unsigned int i;
    
  entry = *color;
@@ -360,7 +359,6 @@ create_colormap (HWND     w,
 {
  char logPalBuf[sizeof(LOGPALETTE) + 256 * sizeof(PALETTEENTRY)];
  LOGPALETTE *logPalettePtr;
-  PALETTEENTRY *entryPtr;
  Colormap colormap;
  guint i;
  HPALETTE sysPal;
@@ -1305,7 +1303,6 @@ static Colormap
 default_colormap ()
 {
  static Colormap colormap;
-  gint i;

  if (colormap)
    return colormap;
@@ -1321,7 +1318,6 @@ gdk_colormap_new (GdkVisual *visual,
  GdkColormap *colormap;
  GdkColormapPrivateWin32 *private;
  Visual *xvisual;
-  int size;
  int i;

  g_return_val_if_fail (visual != NULL, NULL);
@@ -1463,7 +1459,6 @@ gdk_colormap_get_system (void)
 {
  static GdkColormap *colormap = NULL;
  GdkColormapPrivateWin32 *private;
-  gint i;

  if (!colormap)
    {
@@ -1525,11 +1520,7 @@ gdk_colormap_change (GdkColormap *colormap,
 		     gint         ncolors)
 {
  GdkColormapPrivateWin32 *private;
-  GdkVisual *visual;
  XColor *palette;
-  gint shift;
-  int max_colors;
-  int size;
  int i;

  g_return_if_fail (colormap != NULL);
@@ -1598,7 +1589,6 @@ gdk_color_parse (const gchar *spec,
 		 GdkColor *color)
 {
  Colormap xcolormap;
-  XColor xcolor;

  g_return_val_if_fail (spec != NULL, FALSE);
  g_return_val_if_fail (color != NULL, FALSE);
--- a/gdk/win32/gdkevents-win32.c
+++ b/gdk/win32/gdkevents-win32.c
@@ -301,8 +301,10 @@ gdk_events_init (void)
 {
  GSource *source;
  HRESULT hres;
-  HMODULE user32, imm32;
+#ifdef USE_TRACKMOUSEEVENT
+  HMODULE user32;
  HINSTANCE commctrl32;
+#endif

  gdk_ping_msg = RegisterWindowMessage ("gdk-ping");
  GDK_NOTE (EVENTS, g_print ("gdk-ping = %#x\n",
@@ -2657,6 +2659,53 @@ build_keyrelease_event (GdkWindowWin32Data *windata,
  event->key.length = 0;
 }

+static void
+print_event_mask (gint mask)
+{
+  if (mask & GDK_EXPOSURE_MASK)
+    g_print ("EXPOSURE ");
+  if (mask & GDK_POINTER_MOTION_MASK)
+    g_print ("POINTER_MOTION ");
+  if (mask & GDK_POINTER_MOTION_HINT_MASK)
+    g_print ("POINTER_MOTION_HINT ");
+  if (mask & GDK_BUTTON_MOTION_MASK)
+    g_print ("BUTTON_MOTION ");
+  if (mask & GDK_BUTTON1_MOTION_MASK)
+    g_print ("BUTTON1_MOTION ");
+  if (mask & GDK_BUTTON2_MOTION_MASK)
+    g_print ("BUTTON2_MOTION ");
+  if (mask & GDK_BUTTON3_MOTION_MASK)
+    g_print ("BUTTON3_MOTION ");
+  if (mask & GDK_BUTTON_PRESS_MASK)
+    g_print ("BUTTON_PRESS ");
+  if (mask & GDK_BUTTON_RELEASE_MASK)
+    g_print ("BUTTON_RELEASE ");
+  if (mask & GDK_KEY_PRESS_MASK)
+    g_print ("KEY_PRESS ");
+  if (mask & GDK_KEY_RELEASE_MASK)
+    g_print ("KEY_RELEASE ");
+  if (mask & GDK_ENTER_NOTIFY_MASK)
+    g_print ("ENTER_NOTIFY ");
+  if (mask & GDK_LEAVE_NOTIFY_MASK)
+    g_print ("LEAVE_NOTIFY ");
+  if (mask & GDK_FOCUS_CHANGE_MASK)
+    g_print ("FOCUS_CHANGE ");
+  if (mask & GDK_STRUCTURE_MASK)
+    g_print ("STRUCTURE ");
+  if (mask & GDK_PROPERTY_CHANGE_MASK)
+    g_print ("PROPERTY_CHANGE ");
+  if (mask & GDK_VISIBILITY_NOTIFY_MASK)
+    g_print ("VISIBILITY_NOTIFY ");
+  if (mask & GDK_PROXIMITY_IN_MASK)
+    g_print ("PROXIMITY_IN ");
+  if (mask & GDK_PROXIMITY_OUT_MASK)
+    g_print ("PROXIMITY_OUT ");
+  if (mask & GDK_SUBSTRUCTURE_MASK)
+    g_print ("SUBSTRUCTURE ");
+  if (mask & GDK_SCROLL_MASK)
+    g_print ("SCROLL ");
+}
+
 static void
 print_event_state (gint state)
 {
@@ -3322,11 +3371,8 @@ gdk_event_translate (GdkEvent *event,
 {
  DWORD pidActWin;
  DWORD pidThis;
-  DWORD dwStyle;
  PAINTSTRUCT paintstruct;
  HDC hdc;
-  HBRUSH hbr;
-  COLORREF bg;
  RECT rect;
  POINT pt;
  MINMAXINFO *lpmmi;
@@ -3334,12 +3380,8 @@ gdk_event_translate (GdkEvent *event,
  HCURSOR xcursor;
  GdkWindow *window, *orig_window, *newwindow;
  GdkEventMask mask;
-  GdkPixmap *pixmap;
-  GdkDrawablePrivate *pixmap_private;
  int button;
-  int i, j, n, k;
  gchar buf[256];
-  gchar *msgname;
  gboolean return_val;
  gboolean flag;
  
@@ -3900,6 +3942,7 @@ gdk_event_translate (GdkEvent *event,

      event->key.window = window;
      return_val = !GDK_DRAWABLE_DESTROYED (window);
+      GDK_NOTE (EVENTS, (g_print (G_STRLOC ":event_mask: "), print_event_mask (GDK_WINDOW_WIN32DATA (window)->event_mask), g_print ("\n")));
      if (return_val && (event->key.window == k_grab_window
 			 || (GDK_WINDOW_WIN32DATA (window)->event_mask & GDK_KEY_RELEASE_MASK)))
 	{
--- a/gdk/win32/gdkfont-win32.c
+++ b/gdk/win32/gdkfont-win32.c
@@ -1503,7 +1503,6 @@ gdk_font_load (const gchar *font_name)
  GdkFontPrivateWin32 *private;
  GdkWin32SingleFont *singlefont;
  HGDIOBJ oldfont;
-  HANDLE *f;
  TEXTMETRIC textmetric;

  g_return_val_if_fail (font_name != NULL, NULL);
@@ -1547,7 +1546,6 @@ gdk_fontset_load (const gchar *fontset_name)
  GdkFontPrivateWin32 *private;
  GdkWin32SingleFont *singlefont;
  HGDIOBJ oldfont;
-  HANDLE *f;
  TEXTMETRIC textmetric;
  GSList *base_font_list = NULL;
  gchar *fs;
@@ -1768,7 +1766,7 @@ gdk_wchar_text_handle (GdkFont       *font,
 {
  GdkFontPrivateWin32 *private;
  GdkWin32SingleFont *singlefont;
-  int i, block;
+  int block;
  const wchar_t *start, *end, *wcp;

  wcp = wcstr;
@@ -1809,7 +1807,6 @@ gdk_text_size_handler (GdkWin32SingleFont *singlefont,
 		       void		  *argp)
 {
  SIZE this_size;
-  HGDIOBJ oldfont;
  gdk_text_size_arg *arg = (gdk_text_size_arg *) argp;

  if (!singlefont)
--- a/gdk/win32/gdkgc-win32.c
+++ b/gdk/win32/gdkgc-win32.c
@@ -1131,7 +1131,6 @@ set_hdc_pen (HDC          hdc,
 	     GdkLineStyle style,
 	     gint         width)
 {
-  LOGBRUSH logbrush;
  HPEN hpen, old_hpen;
  GdkHDCCacheEntry* entry;

@@ -1454,7 +1453,6 @@ BitmapToRegion (HBITMAP hBmp)
  HDC hDC;

  BITMAP bm8;
-  HBITMAP holdBmp2;
  DWORD maxRects;
  RGNDATA *pData;
  BYTE *p8;
--- a/gdk/win32/gdkinput-win32.c
+++ b/gdk/win32/gdkinput-win32.c
@@ -991,7 +991,6 @@ gdk_input_win32_other_event (GdkEvent  *event,
  GdkEventMask masktest;
  POINT pt;
  PACKET packet;
-  gint return_val;
  gint k;
  gint x, y;

@@ -1278,7 +1277,6 @@ gdk_input_win32_grab_pointer (GdkWindow    *window,
  gboolean need_ungrab;
  GdkDevicePrivate *gdkdev;
  GList *tmp_list;
-  gint result;

  tmp_list = gdk_input_windows;
  new_window = NULL;
--- a/gdk/win32/gdkmain-win32.c
+++ b/gdk/win32/gdkmain-win32.c
@@ -68,8 +68,6 @@ gboolean
 _gdk_windowing_init_check (int    argc,
 			   char **argv)
 {
-  gint i, j, k;
-  
  if (getenv ("GDK_IGNORE_WINTAB") != NULL)
    gdk_input_ignore_wintab = TRUE;

--- a/gdk/win32/gdkpixmap-win32.c
+++ b/gdk/win32/gdkpixmap-win32.c
@@ -949,7 +949,7 @@ gdk_pixmap_foreign_new (guint32 anid)
  GdkDrawablePrivate *private;
  HBITMAP xpixmap;
  SIZE size;
-  unsigned int x_ret, y_ret, w_ret, h_ret, bw_ret, depth_ret;
+  unsigned int w_ret, h_ret;

  /* check to make sure we were passed something at
     least a little sane */
--- a/gdk/win32/makefile.mingw
+++ b/gdk/win32/makefile.mingw
@@ -15,7 +15,8 @@ include $(TOP)/build/win32/make.mingw

 # Nothing much configurable below

-INCLUDES = -I . -I .. -I ../.. -I $(WTKIT)/include -I $(GLIB)
+INCLUDES = -I . -I .. -I ../.. -I $(WTKIT)/include
+DEPCFLAGS = $(GLIB_CFLAGS)
 DEFINES = -DG_ENABLE_DEBUG -DHAVE_CONFIG_H -DGDK_VERSION=\"$(GTK_VER)\" -DGDK_COMPILATION -DG_LOG_DOMAIN=\"Gdk\"

 all: \
--- a/gdk/win32/makefile.msc
+++ b/gdk/win32/makefile.msc
@@ -25,7 +25,7 @@ GLIB_VER=1.3
 GTK_VER=1.3

 GLIB = ..\..\..\glib
-CFLAGS = -I. -I.. -I..\.. -I$(WTKIT)\include -I$(GLIB) -DG_ENABLE_DEBUG -DHAVE_CONFIG_H -DGDK_VERSION=\"$(GTK_VER)\"
+CFLAGS = -I. -I.. -I..\.. -I$(WTKIT)\include -I$(GLIB) -I$(GLIB)\glib -DG_ENABLE_DEBUG -DHAVE_CONFIG_H -DGDK_VERSION=\"$(GTK_VER)\"

 all: \
 	..\..\config.h	\
--- a/gtk/gtkitemfactory.c
+++ b/gtk/gtkitemfactory.c
@@ -1646,9 +1646,6 @@ gtk_item_factory_parse_rc (const gchar	  *file_name)

  g_return_if_fail (file_name != NULL);

-  if (!S_ISREG (g_scanner_stat_mode (file_name)))
-    return;
-
  fd = open (file_name, O_RDONLY);
  if (fd < 0)
    return;
--- a/gtk/makefile.mingw
+++ b/gtk/makefile.mingw
@@ -4,12 +4,6 @@
 ## There is no install target, you have to decide where and 
 ## how to install for yourself.

-# This is the location of pthreads for Win32, 
-# see http://sourceware.cygnus.com/pthreads-win32/
-PTHREADS = ../../pthreads-snap-1999-05-30
-PTHREAD_LIB = -L $(PTHREADS) -lpthread
-PTHREAD_INC = -I $(PTHREADS)
-
 OPTIMIZE = -O

 TOP = ../..
@@ -18,15 +12,14 @@ include $(TOP)/build/win32/make.mingw

 ################################################################

-# Nothing much configurable below
-
 # Perl and awk are needed to generate some source files.
 # These generated source files are distributed with the Win32 GTk+ source
 # distributions, so don't worry if you don't have perl and awk.
 PERL = perl
 AWK = awk

-INCLUDES = -I . -I .. -I ../gdk -I $(GLIB) -I $(GLIB)/gmodule -I $(INTL)
+INCLUDES = -I . -I .. -I ../gdk
+DEPCFLAGS = $(GLIB_CFLAGS) $(INTL_CFLAGS)
 DEFINES = -DGTK_DISABLE_COMPAT_H -DGTK_COMPILATION -DG_LOG_DOMAIN=\"Gtk\"

 all : \
@@ -327,7 +320,7 @@ gtkmarshal.h gtkmarshal.c : gtkmarshal.list genmarshal.pl
 # Linking:
 #
 gtk-$(GTK_VER).dll : generated $(gtk_OBJECTS) gtk.def
-	$(GLIB)/build-dll gtk $(GTK_VER) gtk.def $(gtk_OBJECTS) -L ../gdk -lgdk-$(GTK_VER) $(INTL_LIBS) $(GLIB_LIBS) -lgdi32 -luser32
+	$(BUILD_DLL) gtk-1.3 - gtk.def $(gtk_OBJECTS) -L ../gdk -lgdk-$(GTK_VER) $(INTL_LIBS) $(GLIB_LIBS) -lgdi32 -luser32

 #
 # Test programs:
@@ -363,12 +356,6 @@ testselection.exe : testselection.o
 testselection.o : testselection.c
 	$(CC) $(CFLAGS) -c -DG_LOG_DOMAIN=\"testselection\" testselection.c

-testthreads.exe : testthreads.o
-	$(CC) $(CFLAGS) -o $@  testthreads.o -L . -lgtk-$(GTK_VER) -L ../gdk -lgdk-$(GTK_VER) $(GLIB_LIBS) $(PTHREAD_LIB) $(LDFLAGS)
-
-testthreads.o : testthreads.c
-	$(CC) $(CFLAGS) -I$(PTHREAD_INC) -c -DG_LOG_DOMAIN=\"testthreads\" -DUSE_PTHREADS=1 testthreads.c
-
 simple.exe : simple.o
 	$(CC) $(CFLAGS) -o $@  simple.o -L . -lgtk-$(GTK_VER) -L ../gdk -lgdk-$(GTK_VER) $(GLIB_LIBS) $(LDFLAGS)

--- a/gtk/makefile.msc
+++ b/gtk/makefile.msc
@@ -5,12 +5,6 @@
 # should be in your PATH.
 BIN = C:\bin

-# This is the location of pthreads for Win32, 
-# see http://sourceware.cygnus.com/pthreads-win32/
-PTHREADS = ..\..\pthreads-snap-1999-05-30
-PTHREAD_LIB = $(PTHREADS)\pthread.lib
-PTHREAD_INC = -I $(PTHREADS)
-
 ################################################################

 # Nothing much configurable below
@@ -45,7 +39,7 @@ GTK_VER=1.3
 GLIB = ..\..\glib
 INTL = ..\..\intl

-CFLAGS = -I. -I.. -I..\gdk -I$(GLIB) -I$(GLIB)\gmodule -I$(INTL) -DGTK_DISABLE_COMPAT_H
+CFLAGS = -I. -I.. -I..\gdk -I$(GLIB) -I$(GLIB)\glib -I$(GLIB)\gmodule -I$(INTL) -DGTK_DISABLE_COMPAT_H

 all : \
 	..\config.h	\
@@ -343,7 +337,7 @@ gtkmarshal.h gtkmarshal.c : gtkmarshal.list genmarshal.pl
 # Linking:
 #
 gtk-$(GTK_VER).dll : $(gtk_OBJECTS) gtk.def
-	$(CC) $(CFLAGS) -LD -Fegtk-$(GTK_VER).dll $(gtk_OBJECTS) ..\gdk\gdk-$(GTK_VER).lib $(INTL)\gnu-intl.lib $(GLIB)\glib-$(GLIB_VER).lib $(GLIB)\gmodule\gmodule-$(GLIB_VER).lib gdi32.lib user32.lib advapi32.lib $(LDFLAGS) /def:gtk.def
+	$(CC) $(CFLAGS) -LD -Fegtk-$(GTK_VER).dll $(gtk_OBJECTS) ..\gdk\gdk-$(GTK_VER).lib $(INTL)\gnu-intl.lib $(GLIB)\glib\glib-$(GLIB_VER).lib $(GLIB)\gmodule\gmodule-$(GLIB_VER).lib gdi32.lib user32.lib advapi32.lib $(LDFLAGS) /def:gtk.def

 # General rule for compiling the objects into the DLL
 .c.obj :
@@ -353,44 +347,38 @@ gtk-$(GTK_VER).dll : $(gtk_OBJECTS) gtk.def
 # Test programs:
 #
 testdnd.exe : gtk-$(GTK_VER).dll testdnd.obj
-	$(CC) $(CFLAGS) testdnd.obj gtk-$(GTK_VER).lib ..\gdk\gdk-$(GTK_VER).lib $(GLIB)\glib-$(GLIB_VER).lib $(LDFLAGS)
+	$(CC) $(CFLAGS) testdnd.obj gtk-$(GTK_VER).lib ..\gdk\gdk-$(GTK_VER).lib $(GLIB)\glib\glib-$(GLIB_VER).lib $(LDFLAGS)

 # Must have separate rules for these objects that don't go in the DLL
 testdnd.obj : testdnd.c
 	$(CC) $(CFLAGS) -c -DG_LOG_DOMAIN=\"testdnd\" testdnd.c

 testgtk.exe : gtk-$(GTK_VER).dll testgtk.obj
-	$(CC) $(CFLAGS) testgtk.obj gtk-$(GTK_VER).lib ..\gdk\gdk-$(GTK_VER).lib $(GLIB)\glib-$(GLIB_VER).lib $(LDFLAGS)
+	$(CC) $(CFLAGS) testgtk.obj gtk-$(GTK_VER).lib ..\gdk\gdk-$(GTK_VER).lib $(GLIB)\glib\glib-$(GLIB_VER).lib $(LDFLAGS)

 testgtk.obj : testgtk.c
 	$(CC) $(CFLAGS) -c -DG_LOG_DOMAIN=\"testgtk\" testgtk.c

 testinput.exe : gtk-$(GTK_VER).dll testinput.obj
-	$(CC) $(CFLAGS) testinput.obj gtk-$(GTK_VER).lib ..\gdk\gdk-$(GTK_VER).lib $(GLIB)\glib-$(GLIB_VER).lib $(LDFLAGS)
+	$(CC) $(CFLAGS) testinput.obj gtk-$(GTK_VER).lib ..\gdk\gdk-$(GTK_VER).lib $(GLIB)\glib\glib-$(GLIB_VER).lib $(LDFLAGS)

 testinput.obj : testinput.c
 	$(CC) $(CFLAGS) -c -DG_LOG_DOMAIN=\"testinput\" testinput.c

 testrgb.exe : gtk-$(GTK_VER).dll testrgb.obj
-	$(CC) $(CFLAGS) testrgb.obj gtk-$(GTK_VER).lib ..\gdk\gdk-$(GTK_VER).lib $(GLIB)\glib-$(GLIB_VER).lib $(LDFLAGS)
+	$(CC) $(CFLAGS) testrgb.obj gtk-$(GTK_VER).lib ..\gdk\gdk-$(GTK_VER).lib $(GLIB)\glib\glib-$(GLIB_VER).lib $(LDFLAGS)

 testrgb.obj : testrgb.c
 	$(CC) $(CFLAGS) -c -DG_LOG_DOMAIN=\"testrgb\" testrgb.c

 testselection.exe : gtk-$(GTK_VER).dll testselection.obj
-	$(CC) $(CFLAGS) testselection.obj gtk-$(GTK_VER).lib ..\gdk\gdk-$(GTK_VER).lib $(GLIB)\glib-$(GLIB_VER).lib $(LDFLAGS)
+	$(CC) $(CFLAGS) testselection.obj gtk-$(GTK_VER).lib ..\gdk\gdk-$(GTK_VER).lib $(GLIB)\glib\glib-$(GLIB_VER).lib $(LDFLAGS)

 testselection.obj : testselection.c
 	$(CC) $(CFLAGS) -c -DG_LOG_DOMAIN=\"testselection\" testselection.c

-testthreads.exe : gtk-$(GTK_VER).dll testthreads.obj
-	$(CC) $(CFLAGS) testthreads.obj gtk-$(GTK_VER).lib ..\gdk\gdk-$(GTK_VER).lib $(GLIB)\glib-$(GLIB_VER).lib $(GLIB)\gthread-$(GLIB_VER).lib $(PTHREAD_LIB) $(LDFLAGS)
-
-testthreads.obj : testthreads.c
-	$(CC) $(CFLAGS) $(PTHREAD_INC) -c -DG_LOG_DOMAIN=\"testthreads\" -DUSE_PTHREADS=1 testthreads.c
-
 simple.exe : gtk-$(GTK_VER).dll simple.obj
-	$(CC) $(CFLAGS) simple.obj gtk-$(GTK_VER).lib ..\gdk\gdk-$(GTK_VER).lib $(GLIB)\glib-$(GLIB_VER).lib $(LDFLAGS)
+	$(CC) $(CFLAGS) simple.obj gtk-$(GTK_VER).lib ..\gdk\gdk-$(GTK_VER).lib $(GLIB)\glib\glib-$(GLIB_VER).lib $(LDFLAGS)

 simple.obj : simple.c
 	$(CC) $(CFLAGS) -c -DG_LOG_DOMAIN=\"simple\" simple.c