X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/461e93f921df33c09637db5dddcfd07411ff0ded..2d55af1dfa7fd1cc2df13a6593fd51591cfcfcb1:/include/wx/x11/nanox/X11/Xlib.h

diff --git a/include/wx/x11/nanox/X11/Xlib.h b/include/wx/x11/nanox/X11/Xlib.h
index 2e28627cb2..0e3aed4d23 100644
--- a/include/wx/x11/nanox/X11/Xlib.h
+++ b/include/wx/x11/nanox/X11/Xlib.h
@@ -5,10 +5,6 @@
 #ifndef _DUMMY_XLIBH_
 #define _DUMMY_XLIBH_
 
-#ifdef __GNUG__
-    #pragma interface "Xlib.h"
-#endif
-
 /* Move away the typedef in XtoNX.h */
 #define XFontStruct XFontStruct1
 #include <XtoNX.h>
@@ -48,7 +44,7 @@ typedef struct {
 #define   CWStackMode                 (1<<6)
 
 /* Values */
- 
+
 typedef struct {
         int x, y;
         int width, height;
@@ -111,8 +107,6 @@ typedef struct {
 #define GXnand GR_MODE_NAND
 #define GXset GR_MODE_SET
 
-inline void wxNoop() { /* Do nothing */ }
-
 #define XSynchronize(display,sync)
 #define XDefaultRootWindow(d) GR_ROOT_WINDOW_ID
 #define RootWindowOfScreen(s) GR_ROOT_WINDOW_ID
@@ -120,8 +114,8 @@ inline void wxNoop() { /* Do nothing */ }
 #define XFreeCursor(d, c) GrDestroyCursor(c)
 #define XFreeGC(d, gc) GrDestroyGC(gc)
 #define XSetBackground(d, gc, c) GrSetGCBackground(gc, c)
-#define DefaultVisual(d, s) ((Visual*) NULL)
-#define DefaultColormap(d, s) DefaultColormapOfScreen((Screen*) NULL)
+#define DefaultVisual(d, s) (NULL)
+#define DefaultColormap(d, s) DefaultColormapOfScreen(NULL)
 #define DefaultScreenOfDisplay(d) 0
 #define XSetFillStyle(d, gc, s) wxNoop()
 #define XSetLineAttributes(d, gc, a, b, c, e) wxNoop()
@@ -286,6 +280,12 @@ typedef int (*XErrorHandler) (	    /* WARNING, this type not in Xlib spec */
 #define KeymapStateMask 0
 #define StructureNotifyMask GR_EVENT_MASK_UPDATE
 
+#ifdef ConfigureNotify
+/* XtoNX.h gets it wrong */
+#undef ConfigureNotify
+#endif
+#define ConfigureNotify GR_EVENT_TYPE_UPDATE
+
 #ifndef FocusIn
 #define FocusIn GR_EVENT_TYPE_FOCUS_IN
 #define FocusOut GR_EVENT_TYPE_FOCUS_OUT
@@ -344,6 +344,8 @@ Status XGetWindowAttributes(Display* display, Window w,
 int XConfigureWindow(Display* display, Window w, int mask, XWindowChanges* changes);
 int XTranslateCoordinates(Display* display, Window srcWindow, Window destWindow, int srcX, int srcY, int* destX, int* destY, Window* childReturn);
 
+void wxNoop();
+
 #ifdef __cplusplus
 }
 #endif