diff options
| author | Tor Lillqvist <tml@novell.com> | 2006-08-30 00:39:01 +0000 |
|---|---|---|
| committer | Tor Lillqvist <tml@src.gnome.org> | 2006-08-30 00:39:01 +0000 |
| commit | 4e3d7dd0884bf9545c30744a10494e1c2b9c09a2 (patch) | |
| tree | 21579f49b43e6559ca9cc1f2993034424fada276 /gdk/win32 | |
| parent | 1ff434a681f7d39c9129324fa11a5af55e5fa857 (diff) | |
| download | gtk+-4e3d7dd0884bf9545c30744a10494e1c2b9c09a2.tar.gz | |
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.
Diffstat (limited to 'gdk/win32')
| -rw-r--r-- | gdk/win32/gdkwindow-win32.c | 21 |
1 files changed, 9 insertions, 12 deletions
diff --git a/gdk/win32/gdkwindow-win32.c b/gdk/win32/gdkwindow-win32.c index 03d6371c8a..73486d9e77 100644 --- 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 |