Mention using GNU gettext. Enable NLS stuff. Use GNU gettext. Minor header

	* README.win32: Mention using GNU gettext.
	* config.h.win32: Enable NLS stuff.
	* gtk/makefile.msc: Use GNU gettext.
	* gdk/win32/gdkdnd.c: Minor header reorg.
	* gdk/win32/{gdkevents,gdkwindow}.c: No semantic changes, mainly
	cosmetics.
	* gtk/gtkrc.c (Win32): Make get_gtk_sysconf_directory() public.
	* gtk/gtkmain.c (Win32): Use it in bindtextdomain() call.

diff --git a/ChangeLog b/ChangeLog
index 908a9fc0891c8f2d43b663ea9a166b0cf40bc939..5d178188700d8ef821ccacc11a639e9793301ba0 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+1999-06-15  Tor Lillqvist  <tml@iki.fi>
+y
+       * README.win32: Mention using GNU gettext.
+       * config.h.win32: Enable NLS stuff.
+       * gtk/makefile.msc: Use GNU gettext.
+       * gdk/win32/gdkdnd.c: Minor header reorg.
+       * gdk/win32/{gdkevents,gdkwindow}.c: No semantic changes, mainly
+       cosmetics.
+       * gtk/gtkrc.c (Win32): Make get_gtk_sysconf_directory() public.
+       * gtk/gtkmain.c (Win32): Use it in bindtextdomain() call.
+
 Wed Jun  2 11:44:25 PDT 1999 Manish Singh <yosh@gimp.org>
 
        * acinclude.m4

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 908a9fc0891c8f2d43b663ea9a166b0cf40bc939..5d178188700d8ef821ccacc11a639e9793301ba0 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,14 @@
+1999-06-15  Tor Lillqvist  <tml@iki.fi>
+y
+       * README.win32: Mention using GNU gettext.
+       * config.h.win32: Enable NLS stuff.
+       * gtk/makefile.msc: Use GNU gettext.
+       * gdk/win32/gdkdnd.c: Minor header reorg.
+       * gdk/win32/{gdkevents,gdkwindow}.c: No semantic changes, mainly
+       cosmetics.
+       * gtk/gtkrc.c (Win32): Make get_gtk_sysconf_directory() public.
+       * gtk/gtkmain.c (Win32): Use it in bindtextdomain() call.
+
 Wed Jun  2 11:44:25 PDT 1999 Manish Singh <yosh@gimp.org>
 
        * acinclude.m4

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 908a9fc0891c8f2d43b663ea9a166b0cf40bc939..5d178188700d8ef821ccacc11a639e9793301ba0 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,14 @@
+1999-06-15  Tor Lillqvist  <tml@iki.fi>
+y
+       * README.win32: Mention using GNU gettext.
+       * config.h.win32: Enable NLS stuff.
+       * gtk/makefile.msc: Use GNU gettext.
+       * gdk/win32/gdkdnd.c: Minor header reorg.
+       * gdk/win32/{gdkevents,gdkwindow}.c: No semantic changes, mainly
+       cosmetics.
+       * gtk/gtkrc.c (Win32): Make get_gtk_sysconf_directory() public.
+       * gtk/gtkmain.c (Win32): Use it in bindtextdomain() call.
+
 Wed Jun  2 11:44:25 PDT 1999 Manish Singh <yosh@gimp.org>
 
        * acinclude.m4

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 908a9fc0891c8f2d43b663ea9a166b0cf40bc939..5d178188700d8ef821ccacc11a639e9793301ba0 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,14 @@
+1999-06-15  Tor Lillqvist  <tml@iki.fi>
+y
+       * README.win32: Mention using GNU gettext.
+       * config.h.win32: Enable NLS stuff.
+       * gtk/makefile.msc: Use GNU gettext.
+       * gdk/win32/gdkdnd.c: Minor header reorg.
+       * gdk/win32/{gdkevents,gdkwindow}.c: No semantic changes, mainly
+       cosmetics.
+       * gtk/gtkrc.c (Win32): Make get_gtk_sysconf_directory() public.
+       * gtk/gtkmain.c (Win32): Use it in bindtextdomain() call.
+
 Wed Jun  2 11:44:25 PDT 1999 Manish Singh <yosh@gimp.org>
 
        * acinclude.m4

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 908a9fc0891c8f2d43b663ea9a166b0cf40bc939..5d178188700d8ef821ccacc11a639e9793301ba0 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,14 @@
+1999-06-15  Tor Lillqvist  <tml@iki.fi>
+y
+       * README.win32: Mention using GNU gettext.
+       * config.h.win32: Enable NLS stuff.
+       * gtk/makefile.msc: Use GNU gettext.
+       * gdk/win32/gdkdnd.c: Minor header reorg.
+       * gdk/win32/{gdkevents,gdkwindow}.c: No semantic changes, mainly
+       cosmetics.
+       * gtk/gtkrc.c (Win32): Make get_gtk_sysconf_directory() public.
+       * gtk/gtkmain.c (Win32): Use it in bindtextdomain() call.
+
 Wed Jun  2 11:44:25 PDT 1999 Manish Singh <yosh@gimp.org>
 
        * acinclude.m4

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 908a9fc0891c8f2d43b663ea9a166b0cf40bc939..5d178188700d8ef821ccacc11a639e9793301ba0 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,14 @@
+1999-06-15  Tor Lillqvist  <tml@iki.fi>
+y
+       * README.win32: Mention using GNU gettext.
+       * config.h.win32: Enable NLS stuff.
+       * gtk/makefile.msc: Use GNU gettext.
+       * gdk/win32/gdkdnd.c: Minor header reorg.
+       * gdk/win32/{gdkevents,gdkwindow}.c: No semantic changes, mainly
+       cosmetics.
+       * gtk/gtkrc.c (Win32): Make get_gtk_sysconf_directory() public.
+       * gtk/gtkmain.c (Win32): Use it in bindtextdomain() call.
+
 Wed Jun  2 11:44:25 PDT 1999 Manish Singh <yosh@gimp.org>
 
        * acinclude.m4

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 908a9fc0891c8f2d43b663ea9a166b0cf40bc939..5d178188700d8ef821ccacc11a639e9793301ba0 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,14 @@
+1999-06-15  Tor Lillqvist  <tml@iki.fi>
+y
+       * README.win32: Mention using GNU gettext.
+       * config.h.win32: Enable NLS stuff.
+       * gtk/makefile.msc: Use GNU gettext.
+       * gdk/win32/gdkdnd.c: Minor header reorg.
+       * gdk/win32/{gdkevents,gdkwindow}.c: No semantic changes, mainly
+       cosmetics.
+       * gtk/gtkrc.c (Win32): Make get_gtk_sysconf_directory() public.
+       * gtk/gtkmain.c (Win32): Use it in bindtextdomain() call.
+
 Wed Jun  2 11:44:25 PDT 1999 Manish Singh <yosh@gimp.org>
 
        * acinclude.m4

diff --git a/README.win32 b/README.win32
index a0f433e0de67a26c97a782809ef976f949df38a3..0fa3a3f26c5f44aa817777e9f275da30dcb313fb 100644 (file)
--- a/README.win32
+++ b/README.win32
@@ -4,10 +4,10 @@ port, see http://www.gimp.org/tml/gimp/win32/ or
 http://www.iki.fi/tml/gimp/win32/ .
 
 To build GTk+ on Win32, you need either Microsoft compiler and tools,
-or egcs-1.1.2 running under cygwin-b20.1. Before compiling, check the
-BIN definition in gdk\win32\makefile.msc (or makefile.cygwin) and
-gtk\makefile.msc (or makefile.cygwin). Compile in gdk\win32 and gtk
-with `nmake -f makefile.msc` or `make -f makefile.cygwin`.
+or egcs-1.1.2 running under cygwin-b20.1. Compile in gdk\win32 and gtk
+with `nmake -f makefile.msc` or `make -f makefile.cygwin`. Before
+doing a install, check the BIN definition in gdk\win32\makefile.msc
+(or makefile.cygwin) and gtk\makefile.msc (or makefile.cygwin).
 
 See the README.win32 file in the GLib distribution for preparations to
 build with egcs on cygwin.
@@ -15,3 +15,9 @@ build with egcs on cygwin.
 The tablet support uses the Wintab API. The Wintab development kit can
 be downloaded from http://www.pointing.com.
 
+GTk+ wants to be built with the GNU gettext library for
+internationalisation (i18n). Get the version ported to Win32 (not a
+very big deal) from tml's web site mentioned above. If you don't want
+any i18n stuff, undefine ENABLE_NLS, HAVE_GETTEXT and HAVE_LIBINTL in
+the config.h.win32 file, and remove references to the gnu-intl library
+from the makefiles.

diff --git a/config.h.win32 b/config.h.win32
index 6bfa081383c8a6e057ee29a16d254ad932db4255..cfb2380bf5a4e53c048ae4dec36d34e8d18ac976 100755 (executable)
--- a/config.h.win32
+++ b/config.h.win32
@@ -56,12 +56,12 @@
 #define STDC_HEADERS 1
 
 /* Other stuff */
-/* #undef ENABLE_NLS */
+#define ENABLE_NLS 1
 #define GTK_COMPILED_WITH_DEBUGGING "minimum"
 
 /* #undef HAVE_CATGETS */
 /* #undef HAVE_DIRENT_H */
-/* #undef HAVE_GETTEXT */
+#define HAVE_GETTEXT 1
 /* #undef HAVE_IPC_H */
 /* #undef HAVE_LC_MESSAGES */
 /* #undef HAVE_PWD_H */
@@ -178,7 +178,7 @@
 /* #undef HAVE_LIBI */
 
 /* Define if you have the intl library (-lintl).  */
-/* #undef HAVE_LIBINTL */
+#define HAVE_LIBINTL 1
 
 /* define if compiled symbols have a leading underscore */
 /* #undef WITH_SYMBOL_UNDERSCORE */

diff --git a/gdk/win32/gdkdnd-win32.c b/gdk/win32/gdkdnd-win32.c
index 4ea435441ed3cef95b8e0d63d9968a2f47fee8af..dd51fff34518a91de1d3fda54721dff676f9019a 100644 (file)
--- a/gdk/win32/gdkdnd-win32.c
+++ b/gdk/win32/gdkdnd-win32.c
@@ -27,21 +27,21 @@
 
 #include "config.h"
 
-#define INITGUID
-
 #include <string.h>
 
+#define INITGUID
+
+#include "gdkx.h"
 #ifdef OLE2_DND
 #include <ole2.h>
 #endif
 
-#ifdef _MSC_VER
+#ifdef _MSC_VER                        /* These aren't in mingw32 */
 #include <shlobj.h>
 #include <shlguid.h>
 #endif
 
 #include <gdk/gdk.h>
-#include "gdkx.h"
 
 typedef struct _GdkDragContextPrivate GdkDragContextPrivate;
 

diff --git a/gdk/win32/gdkdnd.c b/gdk/win32/gdkdnd.c
index 4ea435441ed3cef95b8e0d63d9968a2f47fee8af..dd51fff34518a91de1d3fda54721dff676f9019a 100644 (file)
--- a/gdk/win32/gdkdnd.c
+++ b/gdk/win32/gdkdnd.c
@@ -27,21 +27,21 @@
 
 #include "config.h"
 
-#define INITGUID
-
 #include <string.h>
 
+#define INITGUID
+
+#include "gdkx.h"
 #ifdef OLE2_DND
 #include <ole2.h>
 #endif
 
-#ifdef _MSC_VER
+#ifdef _MSC_VER                        /* These aren't in mingw32 */
 #include <shlobj.h>
 #include <shlguid.h>
 #endif
 
 #include <gdk/gdk.h>
-#include "gdkx.h"
 
 typedef struct _GdkDragContextPrivate GdkDragContextPrivate;
 

diff --git a/gdk/win32/gdkevents-win32.c b/gdk/win32/gdkevents-win32.c
index fa839fe898b18c70d2b7fa5b62ffe0f4ff6e749d..e01740f132069ce7c6eea0fc808f018d86c22e8f 100644 (file)
--- a/gdk/win32/gdkevents-win32.c
+++ b/gdk/win32/gdkevents-win32.c
@@ -1347,7 +1347,7 @@ gdk_event_translate (GdkEvent *event,
        {
          /* Keyboard is grabbed with owner_events FALSE */
          GDK_NOTE (EVENTS,
-                   g_print ("grabbed, owner_events FALSE, "
+                   g_print ("...grabbed, owner_events FALSE, "
                             "sending to %#x\n", k_grab_window->xwindow));
          event->key.window = (GdkWindow *) k_grab_window;
        }
@@ -1365,7 +1365,7 @@ gdk_event_translate (GdkEvent *event,
            {
              /* Keyboard is grabbed with owner_events TRUE */
              GDK_NOTE (EVENTS,
-                       g_print ("grabbed, owner_events TRUE, doesn't want it, "
+                       g_print ("...grabbed, owner_events TRUE, doesn't want it, "
                                 "sending to %#x\n", k_grab_window->xwindow));
              event->key.window = (GdkWindow *) k_grab_window;
            }
@@ -1380,9 +1380,8 @@ gdk_event_translate (GdkEvent *event,
              window = window_private->parent;
              gdk_window_ref (window);
              window_private = (GdkWindowPrivate *) window;
-             GDK_NOTE (EVENTS,
-                       g_print ("not wanted, not grabbed, "
-                                "sending to %#x\n", window_private->xwindow));
+             GDK_NOTE (EVENTS, g_print ("...propagating to %#x\n",
+                                        window_private->xwindow));
              goto keyup_or_down;
            }
        }
@@ -1589,7 +1588,7 @@ gdk_event_translate (GdkEvent *event,
        {
          /* Keyboard is grabbed with owner_events FALSE */
          GDK_NOTE (EVENTS,
-                   g_print ("grabbed, owner_events FALSE, "
+                   g_print ("...grabbed, owner_events FALSE, "
                             "sending to %#x\n", k_grab_window->xwindow));
          event->key.window = (GdkWindow *) k_grab_window;
        }
@@ -1602,7 +1601,7 @@ gdk_event_translate (GdkEvent *event,
            {
              /* Keyboard is grabbed with owner_events TRUE */
              GDK_NOTE (EVENTS,
-                       g_print ("grabbed, owner_events TRUE, doesn't want it, "
+                       g_print ("...grabbed, owner_events TRUE, doesn't want it, "
                                 "sending to %#x\n", k_grab_window->xwindow));
              event->key.window = (GdkWindow *) k_grab_window;
            }
@@ -1618,9 +1617,8 @@ gdk_event_translate (GdkEvent *event,
              window = window_private->parent;
              gdk_window_ref (window);
              window_private = (GdkWindowPrivate *) window;
-             GDK_NOTE (EVENTS,
-                       g_print ("not wanted, not grabbed, sending to %#x\n",
-                                window_private->xwindow));
+             GDK_NOTE (EVENTS, g_print ("...propagating to %#x\n",
+                                        window_private->xwindow));
              goto wm_char;
            }
        }
@@ -1726,8 +1724,6 @@ gdk_event_translate (GdkEvent *event,
     case WM_RBUTTONDOWN:
       button = 3;
 
-      /* Print debugging info.
-       */
     buttondown0:
       GDK_NOTE (EVENTS, 
                g_print ("WM_%cBUTTONDOWN: %#x  x,y: %d %d  button: %d\n",
@@ -1740,12 +1736,12 @@ gdk_event_translate (GdkEvent *event,
          && (window_private->extension_events != 0)
          && gdk_input_ignore_core)
        {
-         GDK_NOTE (EVENTS, g_print ("... ignored\n"));
+         GDK_NOTE (EVENTS, g_print ("...ignored\n"));
          break;
        }
 
-    buttondown:
       event->button.type = GDK_BUTTON_PRESS;
+    buttondown:
       event->button.window = window;
       if (window_private)
        mask = window_private->event_mask;
@@ -1756,14 +1752,14 @@ gdk_event_translate (GdkEvent *event,
           && !p_grab_owner_events)
        {
          /* Pointer is grabbed with owner_events FALSE */
-         GDK_NOTE (EVENTS, g_print ("grabbed, owner_events FALSE\n"));
+         GDK_NOTE (EVENTS, g_print ("...grabbed, owner_events FALSE\n"));
          mask = p_grab_event_mask;
          if (!(mask & GDK_BUTTON_PRESS_MASK))
            /* Grabber doesn't want it */
            break;
          else
            event->button.window = (GdkWindow *) p_grab_window;
-         GDK_NOTE (EVENTS, g_print ("sending to %#x\n",
+         GDK_NOTE (EVENTS, g_print ("...sending to %#x\n",
                                     p_grab_window->xwindow));
        }
       else if (window_private
@@ -1774,14 +1770,14 @@ gdk_event_translate (GdkEvent *event,
              && p_grab_owner_events)
            {
              /* Pointer is grabbed wíth owner_events TRUE */ 
-             GDK_NOTE (EVENTS, g_print ("grabbed, owner_events TRUE, doesn't want it\n"));
+             GDK_NOTE (EVENTS, g_print ("...grabbed, owner_events TRUE, doesn't want it\n"));
              mask = p_grab_event_mask;
              if (!(mask & GDK_BUTTON_PRESS_MASK))
                /* Grabber doesn't want it either */
                break;
              else
                event->button.window = (GdkWindow *) p_grab_window;
-             GDK_NOTE (EVENTS, g_print ("sending to %#x\n",
+             GDK_NOTE (EVENTS, g_print ("...sending to %#x\n",
                                         p_grab_window->xwindow));
            }
          else
@@ -1801,6 +1797,8 @@ gdk_event_translate (GdkEvent *event,
              window_private = (GdkWindowPrivate *) window;
              ScreenToClient (window_private->xwindow, &pt);
              xevent->lParam = MAKELPARAM (pt.x, pt.y);
+             GDK_NOTE (EVENTS, g_print ("...propagating to %#x\n",
+                                        window_private->xwindow));
              goto buttondown; /* What did Dijkstra say? */
            }
        }
@@ -1809,7 +1807,7 @@ gdk_event_translate (GdkEvent *event,
       if (!p_grab_window)
        {
          /* No explicit active grab, let's start one automatically */
-         GDK_NOTE (EVENTS, g_print ("automatic grab started\n"));
+         GDK_NOTE (EVENTS, g_print ("...automatic grab started\n"));
          gdk_pointer_grab (window, TRUE, window_private->event_mask,
                            NULL, NULL, 0);
          p_grab_automatic = TRUE;
@@ -1893,7 +1891,7 @@ gdk_event_translate (GdkEvent *event,
          ScreenToClient (p_grab_window->xwindow, &pt);
          event->button.x = pt.x;
          event->button.y = pt.y;
-         GDK_NOTE (EVENTS, g_print ("New coords are +%d+%d\n", pt.x, pt.y));
+         GDK_NOTE (EVENTS, g_print ("...new coords are +%d+%d\n", pt.x, pt.y));
        }
       break;
 
@@ -1906,8 +1904,6 @@ gdk_event_translate (GdkEvent *event,
     case WM_RBUTTONUP:
       button = 3;
 
-      /* Print debugging info.
-       */
     buttonup0:
       GDK_NOTE (EVENTS, 
                g_print ("WM_%cBUTTONUP: %#x  x,y: %d %d  button: %d\n",
@@ -1920,12 +1916,12 @@ gdk_event_translate (GdkEvent *event,
          && (window_private->extension_events != 0)
          && gdk_input_ignore_core)
        {
-         GDK_NOTE (EVENTS, g_print ("... ignored\n"));
+         GDK_NOTE (EVENTS, g_print ("...ignored\n"));
          break;
        }
 
-    buttonup:
       event->button.type = GDK_BUTTON_RELEASE;
+    buttonup:
       event->button.window = window;
       if (window_private)
        mask = window_private->event_mask;
@@ -1936,14 +1932,14 @@ gdk_event_translate (GdkEvent *event,
           && !p_grab_owner_events)
        {
          /* Pointer is grabbed with owner_events FALSE */
-         GDK_NOTE (EVENTS, g_print ("grabbed, owner_events FALSE\n"));
+         GDK_NOTE (EVENTS, g_print ("...grabbed, owner_events FALSE\n"));
          mask = p_grab_event_mask;
          if (!(mask & GDK_BUTTON_RELEASE_MASK))
            /* Grabber doesn't want it */
            break;
          else
            event->button.window = (GdkWindow *) p_grab_window;
-         GDK_NOTE (EVENTS, g_print ("sending to %#x\n",
+         GDK_NOTE (EVENTS, g_print ("...sending to %#x\n",
                                     p_grab_window->xwindow));
        }
       else if (window_private
@@ -1954,14 +1950,14 @@ gdk_event_translate (GdkEvent *event,
              && p_grab_owner_events)
            {
              /* Pointer is grabbed wíth owner_events TRUE */
-             GDK_NOTE (EVENTS, g_print ("grabbed, owner_events TRUE, doesn't want it\n"));
+             GDK_NOTE (EVENTS, g_print ("...grabbed, owner_events TRUE, doesn't want it\n"));
              mask = p_grab_event_mask;
              if (!(mask & GDK_BUTTON_RELEASE_MASK))
                /* Grabber doesn't want it */
                break;
              else
                event->button.window = (GdkWindow *) p_grab_window;
-             GDK_NOTE (EVENTS, g_print ("sending to %#x\n",
+             GDK_NOTE (EVENTS, g_print ("...sending to %#x\n",
                                         p_grab_window->xwindow));
            }
          else
@@ -1980,6 +1976,8 @@ gdk_event_translate (GdkEvent *event,
              window_private = (GdkWindowPrivate *) window;
              ScreenToClient (window_private->xwindow, &pt);
              xevent->lParam = MAKELPARAM (pt.x, pt.y);
+             GDK_NOTE (EVENTS, g_print ("...propagating to %#x\n",
+                                        window_private->xwindow));
              goto buttonup;
            }
        }
@@ -2022,7 +2020,7 @@ gdk_event_translate (GdkEvent *event,
          ScreenToClient (p_grab_window->xwindow, &pt);
          event->button.x = pt.x;
          event->button.y = pt.y;
-         GDK_NOTE (EVENTS, g_print ("New coords are +%d+%d\n", pt.x, pt.y));
+         GDK_NOTE (EVENTS, g_print ("...new coords are +%d+%d\n", pt.x, pt.y));
        }
       if (p_grab_window != NULL
          && p_grab_automatic
@@ -2031,8 +2029,6 @@ gdk_event_translate (GdkEvent *event,
       break;
 
     case WM_MOUSEMOVE:
-      /* Print debugging info.
-       */
       GDK_NOTE (EVENTS,
                g_print ("WM_MOUSEMOVE: %#x  %#x +%d+%d\n",
                         xevent->hwnd, xevent->wParam,
@@ -2072,7 +2068,7 @@ gdk_event_translate (GdkEvent *event,
          && (window_private->extension_events != 0)
          && gdk_input_ignore_core)
        {
-         GDK_NOTE (EVENTS, g_print ("... ignored\n"));
+         GDK_NOTE (EVENTS, g_print ("...ignored\n"));
          break;
        }
 
@@ -2089,7 +2085,7 @@ gdk_event_translate (GdkEvent *event,
        {
          /* Pointer is grabbed with owner_events FALSE */
          GDK_NOTE (EVENTS,
-                   g_print ("grabbed, owner_events FALSE\n"));
+                   g_print ("...grabbed, owner_events FALSE\n"));
          mask = p_grab_event_mask;
          if (!((mask & GDK_POINTER_MOTION_MASK)
                || ((xevent->wParam & (MK_LBUTTON|MK_MBUTTON|MK_RBUTTON))
@@ -2103,7 +2099,7 @@ gdk_event_translate (GdkEvent *event,
            break;
          else
            event->motion.window = (GdkWindow *) p_grab_window;
-         GDK_NOTE (EVENTS, g_print ("sending to %#x\n",
+         GDK_NOTE (EVENTS, g_print ("...sending to %#x\n",
                                     p_grab_window->xwindow));
        }
       else if (window_private
@@ -2122,7 +2118,7 @@ gdk_event_translate (GdkEvent *event,
              && p_grab_owner_events)
            {
              /* Pointer is grabbed wíth owner_events TRUE */
-             GDK_NOTE (EVENTS, g_print ("grabbed, owner_events TRUE, doesn't want it\n"));
+             GDK_NOTE (EVENTS, g_print ("...grabbed, owner_events TRUE, doesn't want it\n"));
              mask = p_grab_event_mask;
              if (!((p_grab_event_mask & GDK_POINTER_MOTION_MASK)
                    || ((xevent->wParam & (MK_LBUTTON|MK_MBUTTON|MK_RBUTTON))
@@ -2137,7 +2133,7 @@ gdk_event_translate (GdkEvent *event,
                break;
              else
                event->motion.window = (GdkWindow *) p_grab_window;
-             GDK_NOTE (EVENTS, g_print ("sending to %#x\n",
+             GDK_NOTE (EVENTS, g_print ("...sending to %#x\n",
                                         p_grab_window->xwindow));
            }
          else
@@ -2156,7 +2152,7 @@ gdk_event_translate (GdkEvent *event,
              window_private = (GdkWindowPrivate *) window;
              ScreenToClient (window_private->xwindow, &pt);
              xevent->lParam = MAKELPARAM (pt.x, pt.y);
-             GDK_NOTE (EVENTS, g_print ("propagating to %#x\n",
+             GDK_NOTE (EVENTS, g_print ("...propagating to %#x\n",
                                         window_private->xwindow));
              goto mousemotion;
            }
@@ -2203,12 +2199,11 @@ gdk_event_translate (GdkEvent *event,
          ScreenToClient (p_grab_window->xwindow, &pt);
          event->motion.x = pt.x;
          event->motion.y = pt.y;
-         GDK_NOTE (EVENTS, g_print ("New coords are +%d+%d\n", pt.x, pt.y));
+         GDK_NOTE (EVENTS, g_print ("...new coords are +%d+%d\n", pt.x, pt.y));
        }
       break;
 
     case WM_NCMOUSEMOVE:
-      /* Print debugging info.  */
       GDK_NOTE (EVENTS,
                g_print ("WM_NCMOUSEMOVE: %#x  x,y: %d %d\n",
                         xevent->hwnd,
@@ -2221,7 +2216,7 @@ gdk_event_translate (GdkEvent *event,
       if (curWnd != NULL
          && (curWnd_private->event_mask & GDK_LEAVE_NOTIFY_MASK))
        {
-         GDK_NOTE (EVENTS, g_print ("synthesizing LEAVE_NOTIFY event\n"));
+         GDK_NOTE (EVENTS, g_print ("...synthesizing LEAVE_NOTIFY event\n"));
 
          event->crossing.type = GDK_LEAVE_NOTIFY;
          event->crossing.window = curWnd;
@@ -2311,7 +2306,7 @@ gdk_event_translate (GdkEvent *event,
       if (window_private->bg_type == GDK_WIN32_BG_PIXEL)
        {
          COLORREF bg;
-         GDK_NOTE (EVENTS, g_print ("... BG_PIXEL %s\n",
+         GDK_NOTE (EVENTS, g_print ("...BG_PIXEL %s\n",
                                     gdk_color_to_string (&window_private->bg_pixel)));
          GetClipBox (hdc, &rect);
 #ifdef MULTIPLE_WINDOW_CLASSES
@@ -2323,7 +2318,7 @@ gdk_event_translate (GdkEvent *event,
 #endif
          hbr = CreateSolidBrush (bg);
 #if 0
-         g_print ("... CreateSolidBrush (%.08x) = %.08x\n", bg, hbr);
+         g_print ("...CreateSolidBrush (%.08x) = %.08x\n", bg, hbr);
 #endif
          if (!FillRect (hdc, &rect, hbr))
            g_warning ("WM_ERASEBKGND: FillRect failed");
@@ -2397,7 +2392,7 @@ gdk_event_translate (GdkEvent *event,
        }
       else
        {
-         GDK_NOTE (EVENTS, g_print ("... BLACK_BRUSH (?)\n"));
+         GDK_NOTE (EVENTS, g_print ("...BLACK_BRUSH (?)\n"));
 #ifdef MULTIPLE_WINDOW_CLASSES
          hbr = (HBRUSH) GetClassLong (window_private->xwindow,
                                       GCL_HBRBACKGROUND);
@@ -2411,13 +2406,10 @@ gdk_event_translate (GdkEvent *event,
       break;
 
     case WM_PAINT:
-      GDK_NOTE (EVENTS, g_print ("WM_PAINT: %#x\n", xevent->hwnd));
       hdc = BeginPaint (xevent->hwnd, &paintstruct);
 
-      /* Print debugging info.
-       */
       GDK_NOTE (EVENTS,
-               g_print ("...WM_PAINT: %#x  %dx%d@+%d+%d %s dc %#x\n",
+               g_print ("WM_PAINT: %#x  %dx%d@+%d+%d %s dc %#x\n",
                         xevent->hwnd,
                         paintstruct.rcPaint.right - paintstruct.rcPaint.left,
                         paintstruct.rcPaint.bottom - paintstruct.rcPaint.top,
@@ -2482,8 +2474,6 @@ gdk_event_translate (GdkEvent *event,
 
 #if 1
     case WM_SHOWWINDOW:
-      /* Print debugging info.
-       */
       GDK_NOTE (EVENTS, g_print ("WM_SHOWWINDOW: %#x  %d\n",
                                 xevent->hwnd,
                                 xevent->wParam));
@@ -2507,8 +2497,6 @@ gdk_event_translate (GdkEvent *event,
       break;
 #endif
     case WM_SIZE:
-      /* Print debugging info.
-       */
       GDK_NOTE (EVENTS,
                g_print ("WM_SIZE: %#x  %s %dx%d\n",
                         xevent->hwnd,

diff --git a/gdk/win32/gdkevents.c b/gdk/win32/gdkevents.c
index fa839fe898b18c70d2b7fa5b62ffe0f4ff6e749d..e01740f132069ce7c6eea0fc808f018d86c22e8f 100644 (file)
--- a/gdk/win32/gdkevents.c
+++ b/gdk/win32/gdkevents.c
@@ -1347,7 +1347,7 @@ gdk_event_translate (GdkEvent *event,
        {
          /* Keyboard is grabbed with owner_events FALSE */
          GDK_NOTE (EVENTS,
-                   g_print ("grabbed, owner_events FALSE, "
+                   g_print ("...grabbed, owner_events FALSE, "
                             "sending to %#x\n", k_grab_window->xwindow));
          event->key.window = (GdkWindow *) k_grab_window;
        }
@@ -1365,7 +1365,7 @@ gdk_event_translate (GdkEvent *event,
            {
              /* Keyboard is grabbed with owner_events TRUE */
              GDK_NOTE (EVENTS,
-                       g_print ("grabbed, owner_events TRUE, doesn't want it, "
+                       g_print ("...grabbed, owner_events TRUE, doesn't want it, "
                                 "sending to %#x\n", k_grab_window->xwindow));
              event->key.window = (GdkWindow *) k_grab_window;
            }
@@ -1380,9 +1380,8 @@ gdk_event_translate (GdkEvent *event,
              window = window_private->parent;
              gdk_window_ref (window);
              window_private = (GdkWindowPrivate *) window;
-             GDK_NOTE (EVENTS,
-                       g_print ("not wanted, not grabbed, "
-                                "sending to %#x\n", window_private->xwindow));
+             GDK_NOTE (EVENTS, g_print ("...propagating to %#x\n",
+                                        window_private->xwindow));
              goto keyup_or_down;
            }
        }
@@ -1589,7 +1588,7 @@ gdk_event_translate (GdkEvent *event,
        {
          /* Keyboard is grabbed with owner_events FALSE */
          GDK_NOTE (EVENTS,
-                   g_print ("grabbed, owner_events FALSE, "
+                   g_print ("...grabbed, owner_events FALSE, "
                             "sending to %#x\n", k_grab_window->xwindow));
          event->key.window = (GdkWindow *) k_grab_window;
        }
@@ -1602,7 +1601,7 @@ gdk_event_translate (GdkEvent *event,
            {
              /* Keyboard is grabbed with owner_events TRUE */
              GDK_NOTE (EVENTS,
-                       g_print ("grabbed, owner_events TRUE, doesn't want it, "
+                       g_print ("...grabbed, owner_events TRUE, doesn't want it, "
                                 "sending to %#x\n", k_grab_window->xwindow));
              event->key.window = (GdkWindow *) k_grab_window;
            }
@@ -1618,9 +1617,8 @@ gdk_event_translate (GdkEvent *event,
              window = window_private->parent;
              gdk_window_ref (window);
              window_private = (GdkWindowPrivate *) window;
-             GDK_NOTE (EVENTS,
-                       g_print ("not wanted, not grabbed, sending to %#x\n",
-                                window_private->xwindow));
+             GDK_NOTE (EVENTS, g_print ("...propagating to %#x\n",
+                                        window_private->xwindow));
              goto wm_char;
            }
        }
@@ -1726,8 +1724,6 @@ gdk_event_translate (GdkEvent *event,
     case WM_RBUTTONDOWN:
       button = 3;
 
-      /* Print debugging info.
-       */
     buttondown0:
       GDK_NOTE (EVENTS, 
                g_print ("WM_%cBUTTONDOWN: %#x  x,y: %d %d  button: %d\n",
@@ -1740,12 +1736,12 @@ gdk_event_translate (GdkEvent *event,
          && (window_private->extension_events != 0)
          && gdk_input_ignore_core)
        {
-         GDK_NOTE (EVENTS, g_print ("... ignored\n"));
+         GDK_NOTE (EVENTS, g_print ("...ignored\n"));
          break;
        }
 
-    buttondown:
       event->button.type = GDK_BUTTON_PRESS;
+    buttondown:
       event->button.window = window;
       if (window_private)
        mask = window_private->event_mask;
@@ -1756,14 +1752,14 @@ gdk_event_translate (GdkEvent *event,
           && !p_grab_owner_events)
        {
          /* Pointer is grabbed with owner_events FALSE */
-         GDK_NOTE (EVENTS, g_print ("grabbed, owner_events FALSE\n"));
+         GDK_NOTE (EVENTS, g_print ("...grabbed, owner_events FALSE\n"));
          mask = p_grab_event_mask;
          if (!(mask & GDK_BUTTON_PRESS_MASK))
            /* Grabber doesn't want it */
            break;
          else
            event->button.window = (GdkWindow *) p_grab_window;
-         GDK_NOTE (EVENTS, g_print ("sending to %#x\n",
+         GDK_NOTE (EVENTS, g_print ("...sending to %#x\n",
                                     p_grab_window->xwindow));
        }
       else if (window_private
@@ -1774,14 +1770,14 @@ gdk_event_translate (GdkEvent *event,
              && p_grab_owner_events)
            {
              /* Pointer is grabbed wíth owner_events TRUE */ 
-             GDK_NOTE (EVENTS, g_print ("grabbed, owner_events TRUE, doesn't want it\n"));
+             GDK_NOTE (EVENTS, g_print ("...grabbed, owner_events TRUE, doesn't want it\n"));
              mask = p_grab_event_mask;
              if (!(mask & GDK_BUTTON_PRESS_MASK))
                /* Grabber doesn't want it either */
                break;
              else
                event->button.window = (GdkWindow *) p_grab_window;
-             GDK_NOTE (EVENTS, g_print ("sending to %#x\n",
+             GDK_NOTE (EVENTS, g_print ("...sending to %#x\n",
                                         p_grab_window->xwindow));
            }
          else
@@ -1801,6 +1797,8 @@ gdk_event_translate (GdkEvent *event,
              window_private = (GdkWindowPrivate *) window;
              ScreenToClient (window_private->xwindow, &pt);
              xevent->lParam = MAKELPARAM (pt.x, pt.y);
+             GDK_NOTE (EVENTS, g_print ("...propagating to %#x\n",
+                                        window_private->xwindow));
              goto buttondown; /* What did Dijkstra say? */
            }
        }
@@ -1809,7 +1807,7 @@ gdk_event_translate (GdkEvent *event,
       if (!p_grab_window)
        {
          /* No explicit active grab, let's start one automatically */
-         GDK_NOTE (EVENTS, g_print ("automatic grab started\n"));
+         GDK_NOTE (EVENTS, g_print ("...automatic grab started\n"));
          gdk_pointer_grab (window, TRUE, window_private->event_mask,
                            NULL, NULL, 0);
          p_grab_automatic = TRUE;
@@ -1893,7 +1891,7 @@ gdk_event_translate (GdkEvent *event,
          ScreenToClient (p_grab_window->xwindow, &pt);
          event->button.x = pt.x;
          event->button.y = pt.y;
-         GDK_NOTE (EVENTS, g_print ("New coords are +%d+%d\n", pt.x, pt.y));
+         GDK_NOTE (EVENTS, g_print ("...new coords are +%d+%d\n", pt.x, pt.y));
        }
       break;
 
@@ -1906,8 +1904,6 @@ gdk_event_translate (GdkEvent *event,
     case WM_RBUTTONUP:
       button = 3;
 
-      /* Print debugging info.
-       */
     buttonup0:
       GDK_NOTE (EVENTS, 
                g_print ("WM_%cBUTTONUP: %#x  x,y: %d %d  button: %d\n",
@@ -1920,12 +1916,12 @@ gdk_event_translate (GdkEvent *event,
          && (window_private->extension_events != 0)
          && gdk_input_ignore_core)
        {
-         GDK_NOTE (EVENTS, g_print ("... ignored\n"));
+         GDK_NOTE (EVENTS, g_print ("...ignored\n"));
          break;
        }
 
-    buttonup:
       event->button.type = GDK_BUTTON_RELEASE;
+    buttonup:
       event->button.window = window;
       if (window_private)
        mask = window_private->event_mask;
@@ -1936,14 +1932,14 @@ gdk_event_translate (GdkEvent *event,
           && !p_grab_owner_events)
        {
          /* Pointer is grabbed with owner_events FALSE */
-         GDK_NOTE (EVENTS, g_print ("grabbed, owner_events FALSE\n"));
+         GDK_NOTE (EVENTS, g_print ("...grabbed, owner_events FALSE\n"));
          mask = p_grab_event_mask;
          if (!(mask & GDK_BUTTON_RELEASE_MASK))
            /* Grabber doesn't want it */
            break;
          else
            event->button.window = (GdkWindow *) p_grab_window;
-         GDK_NOTE (EVENTS, g_print ("sending to %#x\n",
+         GDK_NOTE (EVENTS, g_print ("...sending to %#x\n",
                                     p_grab_window->xwindow));
        }
       else if (window_private
@@ -1954,14 +1950,14 @@ gdk_event_translate (GdkEvent *event,
              && p_grab_owner_events)
            {
              /* Pointer is grabbed wíth owner_events TRUE */
-             GDK_NOTE (EVENTS, g_print ("grabbed, owner_events TRUE, doesn't want it\n"));
+             GDK_NOTE (EVENTS, g_print ("...grabbed, owner_events TRUE, doesn't want it\n"));
              mask = p_grab_event_mask;
              if (!(mask & GDK_BUTTON_RELEASE_MASK))
                /* Grabber doesn't want it */
                break;
              else
                event->button.window = (GdkWindow *) p_grab_window;
-             GDK_NOTE (EVENTS, g_print ("sending to %#x\n",
+             GDK_NOTE (EVENTS, g_print ("...sending to %#x\n",
                                         p_grab_window->xwindow));
            }
          else
@@ -1980,6 +1976,8 @@ gdk_event_translate (GdkEvent *event,
              window_private = (GdkWindowPrivate *) window;
              ScreenToClient (window_private->xwindow, &pt);
              xevent->lParam = MAKELPARAM (pt.x, pt.y);
+             GDK_NOTE (EVENTS, g_print ("...propagating to %#x\n",
+                                        window_private->xwindow));
              goto buttonup;
            }
        }
@@ -2022,7 +2020,7 @@ gdk_event_translate (GdkEvent *event,
          ScreenToClient (p_grab_window->xwindow, &pt);
          event->button.x = pt.x;
          event->button.y = pt.y;
-         GDK_NOTE (EVENTS, g_print ("New coords are +%d+%d\n", pt.x, pt.y));
+         GDK_NOTE (EVENTS, g_print ("...new coords are +%d+%d\n", pt.x, pt.y));
        }
       if (p_grab_window != NULL
          && p_grab_automatic
@@ -2031,8 +2029,6 @@ gdk_event_translate (GdkEvent *event,
       break;
 
     case WM_MOUSEMOVE:
-      /* Print debugging info.
-       */
       GDK_NOTE (EVENTS,
                g_print ("WM_MOUSEMOVE: %#x  %#x +%d+%d\n",
                         xevent->hwnd, xevent->wParam,
@@ -2072,7 +2068,7 @@ gdk_event_translate (GdkEvent *event,
          && (window_private->extension_events != 0)
          && gdk_input_ignore_core)
        {
-         GDK_NOTE (EVENTS, g_print ("... ignored\n"));
+         GDK_NOTE (EVENTS, g_print ("...ignored\n"));
          break;
        }
 
@@ -2089,7 +2085,7 @@ gdk_event_translate (GdkEvent *event,
        {
          /* Pointer is grabbed with owner_events FALSE */
          GDK_NOTE (EVENTS,
-                   g_print ("grabbed, owner_events FALSE\n"));
+                   g_print ("...grabbed, owner_events FALSE\n"));
          mask = p_grab_event_mask;
          if (!((mask & GDK_POINTER_MOTION_MASK)
                || ((xevent->wParam & (MK_LBUTTON|MK_MBUTTON|MK_RBUTTON))
@@ -2103,7 +2099,7 @@ gdk_event_translate (GdkEvent *event,
            break;
          else
            event->motion.window = (GdkWindow *) p_grab_window;
-         GDK_NOTE (EVENTS, g_print ("sending to %#x\n",
+         GDK_NOTE (EVENTS, g_print ("...sending to %#x\n",
                                     p_grab_window->xwindow));
        }
       else if (window_private
@@ -2122,7 +2118,7 @@ gdk_event_translate (GdkEvent *event,
              && p_grab_owner_events)
            {
              /* Pointer is grabbed wíth owner_events TRUE */
-             GDK_NOTE (EVENTS, g_print ("grabbed, owner_events TRUE, doesn't want it\n"));
+             GDK_NOTE (EVENTS, g_print ("...grabbed, owner_events TRUE, doesn't want it\n"));
              mask = p_grab_event_mask;
              if (!((p_grab_event_mask & GDK_POINTER_MOTION_MASK)
                    || ((xevent->wParam & (MK_LBUTTON|MK_MBUTTON|MK_RBUTTON))
@@ -2137,7 +2133,7 @@ gdk_event_translate (GdkEvent *event,
                break;
              else
                event->motion.window = (GdkWindow *) p_grab_window;
-             GDK_NOTE (EVENTS, g_print ("sending to %#x\n",
+             GDK_NOTE (EVENTS, g_print ("...sending to %#x\n",
                                         p_grab_window->xwindow));
            }
          else
@@ -2156,7 +2152,7 @@ gdk_event_translate (GdkEvent *event,
              window_private = (GdkWindowPrivate *) window;
              ScreenToClient (window_private->xwindow, &pt);
              xevent->lParam = MAKELPARAM (pt.x, pt.y);
-             GDK_NOTE (EVENTS, g_print ("propagating to %#x\n",
+             GDK_NOTE (EVENTS, g_print ("...propagating to %#x\n",
                                         window_private->xwindow));
              goto mousemotion;
            }
@@ -2203,12 +2199,11 @@ gdk_event_translate (GdkEvent *event,
          ScreenToClient (p_grab_window->xwindow, &pt);
          event->motion.x = pt.x;
          event->motion.y = pt.y;
-         GDK_NOTE (EVENTS, g_print ("New coords are +%d+%d\n", pt.x, pt.y));
+         GDK_NOTE (EVENTS, g_print ("...new coords are +%d+%d\n", pt.x, pt.y));
        }
       break;
 
     case WM_NCMOUSEMOVE:
-      /* Print debugging info.  */
       GDK_NOTE (EVENTS,
                g_print ("WM_NCMOUSEMOVE: %#x  x,y: %d %d\n",
                         xevent->hwnd,
@@ -2221,7 +2216,7 @@ gdk_event_translate (GdkEvent *event,
       if (curWnd != NULL
          && (curWnd_private->event_mask & GDK_LEAVE_NOTIFY_MASK))
        {
-         GDK_NOTE (EVENTS, g_print ("synthesizing LEAVE_NOTIFY event\n"));
+         GDK_NOTE (EVENTS, g_print ("...synthesizing LEAVE_NOTIFY event\n"));
 
          event->crossing.type = GDK_LEAVE_NOTIFY;
          event->crossing.window = curWnd;
@@ -2311,7 +2306,7 @@ gdk_event_translate (GdkEvent *event,
       if (window_private->bg_type == GDK_WIN32_BG_PIXEL)
        {
          COLORREF bg;
-         GDK_NOTE (EVENTS, g_print ("... BG_PIXEL %s\n",
+         GDK_NOTE (EVENTS, g_print ("...BG_PIXEL %s\n",
                                     gdk_color_to_string (&window_private->bg_pixel)));
          GetClipBox (hdc, &rect);
 #ifdef MULTIPLE_WINDOW_CLASSES
@@ -2323,7 +2318,7 @@ gdk_event_translate (GdkEvent *event,
 #endif
          hbr = CreateSolidBrush (bg);
 #if 0
-         g_print ("... CreateSolidBrush (%.08x) = %.08x\n", bg, hbr);
+         g_print ("...CreateSolidBrush (%.08x) = %.08x\n", bg, hbr);
 #endif
          if (!FillRect (hdc, &rect, hbr))
            g_warning ("WM_ERASEBKGND: FillRect failed");
@@ -2397,7 +2392,7 @@ gdk_event_translate (GdkEvent *event,
        }
       else
        {
-         GDK_NOTE (EVENTS, g_print ("... BLACK_BRUSH (?)\n"));
+         GDK_NOTE (EVENTS, g_print ("...BLACK_BRUSH (?)\n"));
 #ifdef MULTIPLE_WINDOW_CLASSES
          hbr = (HBRUSH) GetClassLong (window_private->xwindow,
                                       GCL_HBRBACKGROUND);
@@ -2411,13 +2406,10 @@ gdk_event_translate (GdkEvent *event,
       break;
 
     case WM_PAINT:
-      GDK_NOTE (EVENTS, g_print ("WM_PAINT: %#x\n", xevent->hwnd));
       hdc = BeginPaint (xevent->hwnd, &paintstruct);
 
-      /* Print debugging info.
-       */
       GDK_NOTE (EVENTS,
-               g_print ("...WM_PAINT: %#x  %dx%d@+%d+%d %s dc %#x\n",
+               g_print ("WM_PAINT: %#x  %dx%d@+%d+%d %s dc %#x\n",
                         xevent->hwnd,
                         paintstruct.rcPaint.right - paintstruct.rcPaint.left,
                         paintstruct.rcPaint.bottom - paintstruct.rcPaint.top,
@@ -2482,8 +2474,6 @@ gdk_event_translate (GdkEvent *event,
 
 #if 1
     case WM_SHOWWINDOW:
-      /* Print debugging info.
-       */
       GDK_NOTE (EVENTS, g_print ("WM_SHOWWINDOW: %#x  %d\n",
                                 xevent->hwnd,
                                 xevent->wParam));
@@ -2507,8 +2497,6 @@ gdk_event_translate (GdkEvent *event,
       break;
 #endif
     case WM_SIZE:
-      /* Print debugging info.
-       */
       GDK_NOTE (EVENTS,
                g_print ("WM_SIZE: %#x  %s %dx%d\n",
                         xevent->hwnd,

diff --git a/gdk/win32/gdkwindow-win32.c b/gdk/win32/gdkwindow-win32.c
index d003fff506ba57138db212e97dbdaebad75e12b5..12926f6d2aa40d7f940613a49867141abcb6b3fa 100644 (file)
--- a/gdk/win32/gdkwindow-win32.c
+++ b/gdk/win32/gdkwindow-win32.c
@@ -381,7 +381,7 @@ gdk_window_new (GdkWindow     *parent,
                    gdk_ProgInstance,
                    NULL);
   GDK_NOTE (MISC,
-           g_print ("gdk_window_create: %s %s %#x %dx%d@+%d+%d %#x = %#x\n",
+           g_print ("gdk_window_create: %s %s %#x %#x %dx%d@+%d+%d %#x = %#x\n",
                     (private->window_type == GDK_WINDOW_TOPLEVEL ? "TOPLEVEL" :
                      (private->window_type == GDK_WINDOW_CHILD ? "CHILD" :
                       (private->window_type == GDK_WINDOW_DIALOG ? "DIALOG" :
@@ -389,6 +389,7 @@ gdk_window_new (GdkWindow     *parent,
                         "???")))),
                     title,
                     dwStyle,
+                    private->event_mask,
                     width, height, (x == CW_USEDEFAULT ? -9999 : x), y, 
                     xparent,
                     private->xwindow));
@@ -2006,7 +2007,6 @@ GdkEventMask
 gdk_window_get_events (GdkWindow *window)
 {
   GdkWindowPrivate *private;
-  GdkEventMask event_mask;
 
   g_return_val_if_fail (window != NULL, 0);
 
@@ -2014,11 +2014,7 @@ gdk_window_get_events (GdkWindow *window)
   if (private->destroyed)
     return 0;
 
-  event_mask = 0;
-
-  event_mask = private->event_mask;
-
-  return event_mask;
+  return private->event_mask;
 }
 
 void          

diff --git a/gdk/win32/gdkwindow.c b/gdk/win32/gdkwindow.c
index d003fff506ba57138db212e97dbdaebad75e12b5..12926f6d2aa40d7f940613a49867141abcb6b3fa 100644 (file)
--- a/gdk/win32/gdkwindow.c
+++ b/gdk/win32/gdkwindow.c
@@ -381,7 +381,7 @@ gdk_window_new (GdkWindow     *parent,
                    gdk_ProgInstance,
                    NULL);
   GDK_NOTE (MISC,
-           g_print ("gdk_window_create: %s %s %#x %dx%d@+%d+%d %#x = %#x\n",
+           g_print ("gdk_window_create: %s %s %#x %#x %dx%d@+%d+%d %#x = %#x\n",
                     (private->window_type == GDK_WINDOW_TOPLEVEL ? "TOPLEVEL" :
                      (private->window_type == GDK_WINDOW_CHILD ? "CHILD" :
                       (private->window_type == GDK_WINDOW_DIALOG ? "DIALOG" :
@@ -389,6 +389,7 @@ gdk_window_new (GdkWindow     *parent,
                         "???")))),
                     title,
                     dwStyle,
+                    private->event_mask,
                     width, height, (x == CW_USEDEFAULT ? -9999 : x), y, 
                     xparent,
                     private->xwindow));
@@ -2006,7 +2007,6 @@ GdkEventMask
 gdk_window_get_events (GdkWindow *window)
 {
   GdkWindowPrivate *private;
-  GdkEventMask event_mask;
 
   g_return_val_if_fail (window != NULL, 0);
 
@@ -2014,11 +2014,7 @@ gdk_window_get_events (GdkWindow *window)
   if (private->destroyed)
     return 0;
 
-  event_mask = 0;
-
-  event_mask = private->event_mask;
-
-  return event_mask;
+  return private->event_mask;
 }
 
 void          

diff --git a/gtk/gtkmain.c b/gtk/gtkmain.c
index fa558da93a7656d68e4c5ea5cf18209d86fcabad..4b934b6b84e138c31b0bc1bad2521a4f3cc90152 100644 (file)
--- a/gtk/gtkmain.c
+++ b/gtk/gtkmain.c
@@ -401,7 +401,18 @@ gtk_init_check (int         *argc,
     }
 
 #ifdef ENABLE_NLS
+#ifndef NATIVE_WIN32
   bindtextdomain("gtk+", GTK_LOCALEDIR);
+#else
+  {
+    /* GTk+ locale dir is %WinDir%\gtk\locale */
+    extern char *get_gtk_sysconf_directory ();
+    bindtextdomain ("gtk+", g_strconcat (get_gtk_sysconf_directory (),
+                                        G_DIR_SEPARATOR_S,
+                                        "locale",
+                                        NULL));
+  }
+#endif
 #endif  
 
   /* Initialize the default visual and colormap to be

diff --git a/gtk/gtkrc.c b/gtk/gtkrc.c
index 09d22a49b8a2f316e5f7d26bc0f74daf3b1d6e46..e030d270ac2349b7944e3be1ba4fc5c1c4b0c29f 100644 (file)
--- a/gtk/gtkrc.c
+++ b/gtk/gtkrc.c
@@ -232,7 +232,7 @@ static GtkImageLoader image_loader = NULL;
 
 #ifdef NATIVE_WIN32
 
-static gchar *
+gchar *
 get_gtk_sysconf_directory ()
 {
   static gchar gtk_sysconf_dir[200];

diff --git a/gtk/makefile.msc b/gtk/makefile.msc
index d1066dd280472c4530c6d9bb5a465e7dc9943eef..d5e1d839f43e1b66b042f1c767f2f7845710e633 100755 (executable)
--- a/gtk/makefile.msc
+++ b/gtk/makefile.msc
@@ -39,8 +39,9 @@ GTK_VER=1.3
 
 GDKSYSDEP = ..\gdk\win32
 GLIB = ..\..\glib
+GETTEXT = ..\..\gettext-0.10.35
 
-CFLAGS = -I. -I.. -I$(GDKSYSDEP) -I$(GLIB) -I$(GLIB)\gmodule -DGTK_DISABLE_COMPAT_H
+CFLAGS = -I. -I.. -I$(GDKSYSDEP) -I$(GLIB) -I$(GLIB)\gmodule -I$(GETTEXT)\intl -DGTK_DISABLE_COMPAT_H
 
 all : \
        ..\config.h     \
@@ -328,7 +329,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) $(GDKSYSDEP)\gdk-$(GTK_VER).lib $(GLIB)\glib-$(GLIB_VER).lib $(GLIB)\gmodule-$(GLIB_VER).lib gdi32.lib user32.lib $(LDFLAGS) /def:gtk.def
+       $(CC) $(CFLAGS) -LD -Fegtk-$(GTK_VER).dll $(gtk_OBJECTS) $(GDKSYSDEP)\gdk-$(GTK_VER).lib $(GETTEXT)\intl\gnu-intl.lib $(GLIB)\glib-$(GLIB_VER).lib $(GLIB)\gmodule-$(GLIB_VER).lib gdi32.lib user32.lib $(LDFLAGS) /def:gtk.def
 
 # General rule for compiling the objects into the DLL
 .c.obj :