Moved the cleanup code to an EVT_WINDOW_DESTROY handler.

[wxWidgets.git] / include / wx / x11 / privx.h

diff --git a/include/wx/x11/privx.h b/include/wx/x11/privx.h
index 5314cda202b86b7095a73a9634c54e5d8331bc09..c8c63f63b8adf0a5f1dca97c68db5d672b18fb54 100644 (file)
--- a/include/wx/x11/privx.h
+++ b/include/wx/x11/privx.h
@@ -65,5 +65,73 @@ wxString wxGetXEventName(XEvent& event);
 // Is the window visible?
 bool wxWindowIsVisible(Window win);
 
 // Is the window visible?
 bool wxWindowIsVisible(Window win);
 

+#if wxUSE_NANOX
+#define XEventGetWindow(event) event->general.wid
+#define XEventGetType(event) event->general.type
+#define XConfigureEventGetX(event) ((int) event->update.x)
+#define XConfigureEventGetY(event) ((int) event->update.y)
+#define XConfigureEventGetWidth(event) ((int) event->update.width)
+#define XConfigureEventGetHeight(event) ((int) event->update.height)
+#define XExposeEventGetX(event) event->exposure.x
+#define XExposeEventGetY(event) event->exposure.y
+#define XExposeEventGetWidth(event) event->exposure.width
+#define XExposeEventGetHeight(event) event->exposure.height
+#define XButtonEventGetTime(event) (wxGetLocalTime())
+#define XButtonEventLChanged(event) (event->button.changebuttons & GR_BUTTON_L)
+#define XButtonEventMChanged(event) (event->button.changebuttons & GR_BUTTON_M)
+#define XButtonEventRChanged(event) (event->button.changebuttons & GR_BUTTON_R)
+#define XButtonEventLIsDown(x) ((x)->button.buttons & GR_BUTTON_L)
+#define XButtonEventMIsDown(x) ((x)->button.buttons & GR_BUTTON_M)
+#define XButtonEventRIsDown(x) ((x)->button.buttons & GR_BUTTON_R)
+#define XButtonEventShiftIsDown(x) (x->button.modifiers & MWKMOD_SHIFT)
+#define XButtonEventCtrlIsDown(x) (x->button.modifiers & MWKMOD_CTRL)
+#define XButtonEventAltIsDown(x) (x->button.modifiers & MWKMOD_ALT)
+#define XButtonEventMetaIsDown(x) (x->button.modifiers & MWKMOD_META)
+#define XButtonEventGetX(event) (event->button.x)
+#define XButtonEventGetY(event) (event->button.y)
+#define XKeyEventGetTime(event) (wxGetLocalTime())
+#define XKeyEventGetX(event) (event->keystroke.x)
+#define XKeyEventGetY(event) (event->keystroke.y)
+#define XKeyEventShiftIsDown(x) (x->keystroke.modifiers & MWKMOD_SHIFT)
+#define XKeyEventCtrlIsDown(x) (x->keystroke.modifiers & MWKMOD_CTRL)
+#define XKeyEventAltIsDown(x) (x->keystroke.modifiers & MWKMOD_ALT)
+#define XKeyEventMetaIsDown(x) (x->keystroke.modifiers & MWKMOD_META)
+#define XFontStructGetAscent(f) f->info.baseline
+
+#else
+
+#define XEventGetWindow(event) event->xany.window
+#define XEventGetType(event) event->xany.type
+#define XConfigureEventGetX(event) event->xconfigure.x
+#define XConfigureEventGetY(event) event->xconfigure.y
+#define XConfigureEventGetWidth(event) event->xconfigure.width
+#define XConfigureEventGetHeight(event) event->xconfigure.height
+#define XExposeEventGetX(event) event->xexpose.x
+#define XExposeEventGetY(event) event->xexpose.y
+#define XExposeEventGetWidth(event) event->xexpose.width
+#define XExposeEventGetHeight(event) event->xexpose.height
+#define XButtonEventGetTime(event) (event->xbutton.time)
+#define XButtonEventLChanged(event) (event->xbutton.button == Button1)
+#define XButtonEventMChanged(event) (event->xbutton.button == Button2)
+#define XButtonEventRChanged(event) (event->xbutton.button == Button3)
+#define XButtonEventLIsDown(x) ((x)->xbutton.state & Button1Mask)
+#define XButtonEventMIsDown(x) ((x)->xbutton.state & Button2Mask)
+#define XButtonEventRIsDown(x) ((x)->xbutton.state & Button3Mask)
+#define XButtonEventShiftIsDown(x) (x->xbutton.state & ShiftMask)
+#define XButtonEventCtrlIsDown(x) (x->xbutton.state & ControlMask)
+#define XButtonEventAltIsDown(x) (x->xbutton.state & Mod3Mask)
+#define XButtonEventMetaIsDown(x) (x->xbutton.state & Mod1Mask)
+#define XButtonEventGetX(event) (event->xbutton.x)
+#define XButtonEventGetY(event) (event->xbutton.y)
+#define XKeyEventGetTime(event) (event->xkey.time)
+#define XKeyEventShiftIsDown(x) (x->xkey.state & ShiftMask)
+#define XKeyEventCtrlIsDown(x) (x->xkey.state & ControlMask)
+#define XKeyEventAltIsDown(x) (x->xkey.state & Mod3Mask)
+#define XKeyEventMetaIsDown(x) (x->xkey.state & Mod1Mask)
+#define XKeyEventGetX(event) (event->xkey.x)
+#define XKeyEventGetY(event) (event->xkey.y)
+#define XFontStructGetAscent(f) f->ascent
+#endif
+

 #endif
 // _WX_PRIVX_H_
 #endif
 // _WX_PRIVX_H_