Lots of updates for color dialog and sliders

[wxWidgets.git] / 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 2e28627cb27a5ca62c962ed3efa2378ef351d999..01ebd461b2ba2e313e07285a5409789e56ed979d 100644 (file)
--- a/include/wx/x11/nanox/X11/Xlib.h
+++ b/include/wx/x11/nanox/X11/Xlib.h
@@ -111,8 +111,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
@@ -286,6 +284,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 +348,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