Remove support for Windows 9x/ME. GTK+ hasn't worked on Win9x since 2.6 or

2006-08-29  Tor Lillqvist  <tml@novell.com>

	Remove support for Windows 9x/ME. GTK+ hasn't worked on Win9x
	since 2.6 or 2.8. It's pointless to keep the Win9x code in here as
	it isn't being maintained anyway. If somebody is interested, it
	can always be found in older GTK+ versions, and in CVS.

	* gdk/win32/gdkwindow-win32.c: Remove the G_WIN32_IS_NT_BASED()
	and G_WIN32_HAVE_WIDECHAR_API() tests and their false (Win9x)
	branches, and any variables or static functions used only by the
	Win9x branches.

diff --git a/ChangeLog b/ChangeLog
index 8abefbf02d5b5a5e4fe6c8c17003ce5562f4051d..5bbbee890807cdfe42c3bddc1c0940d99d3408a9 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -24,7 +24,8 @@
        * gdk/win32/gdkkeys-win32.c
        * gdk/win32/gdkmain-win32.c
        * gdk/win32/gdkproperty-win32.c
-       * gdk/win32/gdkselection-win32.c: Remove the G_WIN32_IS_NT_BASED()
+       * gdk/win32/gdkselection-win32.c
+       * gdk/win32/gdkwindow-win32.c: Remove the G_WIN32_IS_NT_BASED()
        and G_WIN32_HAVE_WIDECHAR_API() tests and their false (Win9x)
        branches, and any variables or static functions used only by the
        Win9x branches.

diff --git a/gdk/win32/gdkwindow-win32.c b/gdk/win32/gdkwindow-win32.c
index 03d6371c8a41edecc6acda375c80b716881a7d6d..73486d9e77d251038b330c3529bbdd880ed1ab71 100644 (file)
--- a/gdk/win32/gdkwindow-win32.c
+++ b/gdk/win32/gdkwindow-win32.c
@@ -588,6 +588,10 @@ gdk_window_new_internal (GdkWindow     *parent,
     }
   else
     {
+      /* I very much doubt using WS_EX_TRANSPARENT actually
+       * corresponds to how X11 InputOnly windows work, but it appears
+       * to work well enough for the actual use cases in gtk.
+       */
       dwExStyle = WS_EX_TRANSPARENT;
       private->depth = 0;
       private->input_only = TRUE;
@@ -1737,6 +1741,8 @@ void
 gdk_window_set_title (GdkWindow   *window,
                      const gchar *title)
 {
+  wchar_t *wtitle;
+
   g_return_if_fail (GDK_IS_WINDOW (window));
   g_return_if_fail (title != NULL);
 
@@ -1750,18 +1756,9 @@ gdk_window_set_title (GdkWindow   *window,
   GDK_NOTE (MISC, g_print ("gdk_window_set_title: %p: %s\n",
                           GDK_WINDOW_HWND (window), title));
   
-  if (G_WIN32_HAVE_WIDECHAR_API ())
-    {
-      wchar_t *wtitle = g_utf8_to_utf16 (title, -1, NULL, NULL, NULL);
-      API_CALL (SetWindowTextW, (GDK_WINDOW_HWND (window), wtitle));
-      g_free (wtitle);
-    }
-  else
-    {
-      char *cptitle = g_locale_from_utf8 (title, -1, NULL, NULL, NULL);
-      API_CALL (SetWindowTextA, (GDK_WINDOW_HWND (window), cptitle));
-      g_free (cptitle);
-    }
+  wtitle = g_utf8_to_utf16 (title, -1, NULL, NULL, NULL);
+  API_CALL (SetWindowTextW, (GDK_WINDOW_HWND (window), wtitle));
+  g_free (wtitle);
 }
 
 void