API: gdk: Get rid of GdkNativeWindow

Also get rid of the GDK_NATIVE_WINDOW_POINTER define.

diff --git a/configure.ac b/configure.ac
index 0e9849d7aa955b1af84085a393241a321a640bdf..571f77330656441c4c6326f9e304947b3fb6a7cd 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -326,7 +326,6 @@ if test "x$enable_win32_backend" == xyes; then
   GDK_BACKENDS="$GDK_BACKENDS win32"
   backend_immodules="$backend_immodules,ime"
   GDK_WINDOWING="$GDK_WINDOWING
-#define GDK_NATIVE_WINDOW_POINTER
 #define GDK_WINDOWING_WIN32"
   GDK_EXTRA_LIBS="$GDK_EXTRA_LIBS -lgdi32 -limm32 -lshell32 -lole32 -Wl,-luuid"
   AM_CONDITIONAL(USE_WIN32, true)

diff --git a/docs/reference/gdk/gdk3-sections.txt b/docs/reference/gdk/gdk3-sections.txt
index 574977d34e6546ae5af545ee19c66c054f3f441b..2b412040ea34ebf8c9fa6be4c6acdf12abe1b5c8 100644 (file)
--- a/docs/reference/gdk/gdk3-sections.txt
+++ b/docs/reference/gdk/gdk3-sections.txt
@@ -811,7 +811,6 @@ GdkEventFocus
 GdkEventConfigure
 GdkEventProperty
 GdkEventSelection
-GdkNativeWindow
 GdkEventDND
 GdkEventProximity
 GdkEventWindowState

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

diff --git a/gdk/gdktypes.h b/gdk/gdktypes.h
index d655ff97da4964106e167ab5c935f27cc2e8a034..c3ab38f4a01f04f0aa78e15a96ef802918c876bf 100644 (file)
--- a/gdk/gdktypes.h
+++ b/gdk/gdktypes.h
@@ -104,12 +104,6 @@ typedef struct _GdkAtom            *GdkAtom;
  */
 #define GDK_POINTER_TO_ATOM(ptr)  ((GdkAtom)(ptr))
 
-#ifdef GDK_NATIVE_WINDOW_POINTER
-#define GDK_GPOINTER_TO_NATIVE_WINDOW(p) ((GdkNativeWindow) (p))
-#else
-#define GDK_GPOINTER_TO_NATIVE_WINDOW(p) GPOINTER_TO_UINT(p)
-#endif
-
 #define _GDK_MAKE_ATOM(val) ((GdkAtom)GUINT_TO_POINTER(val))
 
 /**
@@ -120,18 +114,6 @@ typedef struct _GdkAtom            *GdkAtom;
  */
 #define GDK_NONE            _GDK_MAKE_ATOM (0)
 
-/**
- * GdkNativeWindow:
- *
- * Used to represent native windows (<type>Window</type>s for the X11
- * backend, <type>HWND</type>s for Win32).
- */
-#ifdef GDK_NATIVE_WINDOW_POINTER
-typedef gpointer GdkNativeWindow;
-#else
-typedef guint32 GdkNativeWindow;
-#endif
-
 /* Forward declarations of commonly used types */
 typedef struct _GdkColor              GdkColor;
 typedef struct _GdkRGBA               GdkRGBA;