summaryrefslogtreecommitdiff
path: root/gdk/win32/gdkmain-win32.c
diff options
context:
space:
mode:
authorTor Lillqvist <tml@iki.fi>2004-10-31 14:47:15 +0000
committerTor Lillqvist <tml@src.gnome.org>2004-10-31 14:47:15 +0000
commita841d12888638e86d1ed43562ed4c55a3fed2af9 (patch)
treef09bcbf3f069255c2ec378a343bd4d1a5788ac59 /gdk/win32/gdkmain-win32.c
parent1c8e6a0e4fe16dcb9dafc5f1c90bc34bd7b3a9c4 (diff)
downloadgtk+-a841d12888638e86d1ed43562ed4c55a3fed2af9.tar.gz
gdk/win32/gdkprivate-win32.h gdk/win32/gdkglobals-win32.c Remove
2004-10-31 Tor Lillqvist <tml@iki.fi> * gdk/win32/gdkprivate-win32.h * gdk/win32/gdkglobals-win32.c * gdk/win32/gdkmain-win32.c: Remove _windows_version and the IS_WIN_NT() macro. * gdk/win32/*.c: Use G_WIN32_IS_NT_BASED() from GLib instead.
Diffstat (limited to 'gdk/win32/gdkmain-win32.c')
-rw-r--r--gdk/win32/gdkmain-win32.c9
1 files changed, 1 insertions, 8 deletions
diff --git a/gdk/win32/gdkmain-win32.c b/gdk/win32/gdkmain-win32.c
index 49bbe61b9c..1615494166 100644
--- a/gdk/win32/gdkmain-win32.c
+++ b/gdk/win32/gdkmain-win32.c
@@ -98,13 +98,6 @@ _gdk_windowing_init (void)
_gdk_app_hmodule = GetModuleHandle (NULL);
_gdk_display_hdc = CreateDC ("DISPLAY", NULL, NULL, NULL);
_gdk_root_window = GetDesktopWindow ();
- _windows_version = GetVersion ();
-
- if (getenv ("PRETEND_WIN9X"))
- _windows_version = 0x80000004;
-
- GDK_NOTE (MISC, g_print ("Windows version: %08x\n", (guint) _windows_version));
-
_gdk_input_locale = GetKeyboardLayout (0);
_gdk_input_locale_is_ime = ImmIsIME (_gdk_input_locale);
GetLocaleInfo (MAKELCID (LOWORD (_gdk_input_locale), SORT_DEFAULT),
@@ -160,7 +153,7 @@ _gdk_win32_gdi_failed (const gchar *where,
/* On Win9x GDI calls are implemented in 16-bit code and thus
* don't set the 32-bit error code, sigh.
*/
- if (IS_WIN_NT ())
+ if (G_WIN32_IS_NT_BASED ())
_gdk_win32_api_failed (where, line, api);
else
_gdk_other_api_failed (where, line, api);