Bug 544684 - Win64 issue, window handles are assumed to be 32-bit

2008-08-04  Tor Lillqvist  <tml@novell.com>

	Bug 544684 - Win64 issue, window handles are assumed to be 32-bit

	* configure.in: On Win64, define GDK_NATIVE_WINDOW_POINTER.

	* gdk/gdkconfig.h.win32: Ditto here.

svn path=/trunk/; revision=20956

diff --git a/ChangeLog b/ChangeLog
index 1d8ed318ddf0f299c3b6f0700efd9f1b2d03d459..230d84b7762101405a4d52753dc5dbd186b649c9 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2008-08-04  Tor Lillqvist  <tml@novell.com>
+
+       Bug 544684 - Win64 issue, window handles are assumed to be 32-bit
+
+       * configure.in: On Win64, define GDK_NATIVE_WINDOW_POINTER.
+
+       * gdk/gdkconfig.h.win32: Ditto here.
+
 2008-08-04  Tor Lillqvist  <tml@novell.com>
 
        * gtk/gtkstatusicon.c: Fix typo in Win32 and Quartz code:

diff --git a/configure.in b/configure.in
index 813c489528def6b263250b8a03790440344079ed..f17a9d41ae7e287e06e35017e2f387f796d28127 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1978,6 +1978,10 @@ if test "x$gdktarget" = "xx11" ; then
 #define GDK_WINDOWING_X11'
 elif test "x$gdktarget" = "xwin32" ; then
   gdk_windowing='
+#ifdef _WIN64
+#  define GDK_NATIVE_WINDOW_POINTER
+#endif
+
 #define GDK_WINDOWING_WIN32'
 elif test "x$gdktarget" = "xquartz" ; then
   gdk_windowing='

diff --git a/gdk/gdkconfig.h.win32 b/gdk/gdkconfig.h.win32
index 7bd668e81e5c9d07547fbf370a6ee1fa13652fcd..c362dbb7c33546d856a73b73da0d80ead9dab7bb 100644 (file)
--- a/gdk/gdkconfig.h.win32
+++ b/gdk/gdkconfig.h.win32
@@ -19,6 +19,10 @@ extern "C" {
 #  endif
 #endif /* !GSEAL */
 
+#ifdef _WIN64
+#  define GDK_NATIVE_WINDOW_POINTER
+#endif
+
 #define GDK_WINDOWING_WIN32
 
 #define GDK_HAVE_WCHAR_H 1