callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

API: gdk: Get rid of GdkNativeWindow

Browse Source 
Also get rid of the GDK_NATIVE_WINDOW_POINTER define.
This commit is contained in:
Benjamin Otte
2011-02-01 18:31:44 +01:00
parent 7b5ad65e71
commit 5f594b613e
4 changed files with 0 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
configure.ac
View File

@ -326,7 +326,6 @@ if test "x$enable_win32_backend" == xyes; then
GDK_BACKENDS="$GDK_BACKENDS win32" GDK_BACKENDS="$GDK_BACKENDS win32"
backend_immodules="$backend_immodules,ime" backend_immodules="$backend_immodules,ime"
GDK_WINDOWING="$GDK_WINDOWING GDK_WINDOWING="$GDK_WINDOWING
#define GDK_NATIVE_WINDOW_POINTER
#define GDK_WINDOWING_WIN32" #define GDK_WINDOWING_WIN32"
GDK_EXTRA_LIBS="$GDK_EXTRA_LIBS -lgdi32 -limm32 -lshell32 -lole32 -Wl,-luuid" GDK_EXTRA_LIBS="$GDK_EXTRA_LIBS -lgdi32 -limm32 -lshell32 -lole32 -Wl,-luuid"
AM_CONDITIONAL(USE_WIN32, true) AM_CONDITIONAL(USE_WIN32, true)

1
docs/reference/gdk/gdk3-sections.txt
View File

@ -811,7 +811,6 @@ GdkEventFocus
GdkEventConfigure GdkEventConfigure
GdkEventProperty GdkEventProperty
GdkEventSelection GdkEventSelection
GdkNativeWindow
GdkEventDND GdkEventDND
GdkEventProximity GdkEventProximity
GdkEventWindowState GdkEventWindowState

2
gdk/gdkconfig.h.win32
View File

@ -19,8 +19,6 @@ extern "C" {
# endif # endif
#endif /* !GSEAL */ #endif /* !GSEAL */
#define GDK_NATIVE_WINDOW_POINTER
#define GDK_WINDOWING_WIN32 #define GDK_WINDOWING_WIN32
#define GDK_HAVE_WCHAR_H 1 #define GDK_HAVE_WCHAR_H 1

18
gdk/gdktypes.h
View File

@ -104,12 +104,6 @@ typedef struct _GdkAtom *GdkAtom;
*/ */
#define GDK_POINTER_TO_ATOM(ptr) ((GdkAtom)(ptr)) #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)) #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) #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 */ /* Forward declarations of commonly used types */
typedef struct _GdkColor GdkColor; typedef struct _GdkColor GdkColor;
typedef struct _GdkRGBA GdkRGBA; typedef struct _GdkRGBA GdkRGBA;