compilation fix for cygwin

[wxWidgets.git] / include / wx / motif / private.h

diff --git a/include/wx/motif/private.h b/include/wx/motif/private.h
index f72bd63cd8a5641f7772190f27844c9c0bd2a528..ec1f7efa653a6cac594fb8ede8486cde7a459cfe 100644 (file)
--- a/include/wx/motif/private.h
+++ b/include/wx/motif/private.h
@@ -13,9 +13,9 @@
 #define _WX_PRIVATE_H_
 
 #include "wx/defs.h"
 #define _WX_PRIVATE_H_
 
 #include "wx/defs.h"

+#include "X11/Xlib.h"

 
 

-class wxMouseEvent;
-class wxKeyEvent;
+#include "wx/x11/privx.h"

 
 // Put any private declarations here: native Motif types may be used because
 // this header is included after Xm/Xm.h
 
 // Put any private declarations here: native Motif types may be used because
 // this header is included after Xm/Xm.h


@@ -39,11 +39,14 @@ extern void wxDeleteWindowFromTable(Widget w);
 extern wxWindow *wxGetWindowFromTable(Widget w);
 extern bool wxAddWindowToTable(Widget w, wxWindow *win);
 
 extern wxWindow *wxGetWindowFromTable(Widget w);
 extern bool wxAddWindowToTable(Widget w, wxWindow *win);
 

+// ----------------------------------------------------------------------------
+// key events related functions
+// ----------------------------------------------------------------------------
+

 extern char wxFindMnemonic(const char* s);
 extern char wxFindMnemonic(const char* s);

-extern char * wxFindAccelerator (char *s);
-extern XmString wxFindAcceleratorText (char *s);
-extern int wxCharCodeXToWX(KeySym keySym);
-extern KeySym wxCharCodeWXToX(int id);
+
+extern char * wxFindAccelerator (const char *s);
+extern XmString wxFindAcceleratorText (const char *s);

 
 // ----------------------------------------------------------------------------
 // TranslateXXXEvent() functions - translate Motif event to wxWindow one
 
 // ----------------------------------------------------------------------------
 // TranslateXXXEvent() functions - translate Motif event to wxWindow one


@@ -51,12 +54,6 @@ extern KeySym wxCharCodeWXToX(int id);
 extern bool wxTranslateMouseEvent(wxMouseEvent& wxevent, wxWindow *win, Widget widget, XEvent *xevent);
 extern bool wxTranslateKeyEvent(wxKeyEvent& wxevent, wxWindow *win, Widget widget, XEvent *xevent);
 
 extern bool wxTranslateMouseEvent(wxMouseEvent& wxevent, wxWindow *win, Widget widget, XEvent *xevent);
 extern bool wxTranslateKeyEvent(wxKeyEvent& wxevent, wxWindow *win, Widget widget, XEvent *xevent);
 

-int wxGetBestMatchingPixel(Display *display, XColor *desiredColor, Colormap cmap);
-Pixmap XCreateInsensitivePixmap( Display *display, Pixmap pixmap );
-
-extern XColor g_itemColors[];
-extern int wxComputeColours (Display *display, wxColour * back, wxColour * fore);
-

 extern void wxDoChangeForegroundColour(WXWidget widget, wxColour& foregroundColour);
 extern void wxDoChangeBackgroundColour(WXWidget widget, wxColour& backgroundColour, bool changeArmColour = FALSE);
 
 extern void wxDoChangeForegroundColour(WXWidget widget, wxColour& foregroundColour);
 extern void wxDoChangeBackgroundColour(WXWidget widget, wxColour& backgroundColour, bool changeArmColour = FALSE);
 


@@ -84,15 +81,15 @@ public:
     wxXmString(const wxString& str)
     {
         m_string = XmStringCreateLtoR((char *)str.c_str(),
     wxXmString(const wxString& str)
     {
         m_string = XmStringCreateLtoR((char *)str.c_str(),

-                                      XmSTRING_DEFAULT_CHARSET);
+            XmSTRING_DEFAULT_CHARSET);

     }
     }

-
+    

     ~wxXmString() { XmStringFree(m_string); }
     ~wxXmString() { XmStringFree(m_string); }

-
+    

     // semi-implicit conversion to XmString (shouldn't rely on implicit
     // conversion because many of Motif functions are macros)
     XmString operator()() const { return m_string; }
     // semi-implicit conversion to XmString (shouldn't rely on implicit
     // conversion because many of Motif functions are macros)
     XmString operator()() const { return m_string; }

-
+    

 private:
     XmString m_string;
 };
 private:
     XmString m_string;
 };


@@ -104,5 +101,11 @@ private:
 // argument is of type "wxWindow *"
 #define GetWidget(w)    ((Widget)(w)->GetHandle())
 
 // argument is of type "wxWindow *"
 #define GetWidget(w)    ((Widget)(w)->GetHandle())
 

+// ----------------------------------------------------------------------------
+// accessors for C modules
+// ----------------------------------------------------------------------------
+
+extern "C" XtAppContext wxGetAppContext();
+

 #endif
 #endif

-    // _WX_PRIVATE_H_
+// _WX_PRIVATE_H_