X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d391a3451080638e6b1f2f24f92078d18c5ab9d8..31eefb998d894e3b566e13714fa53186101829a1:/include/wx/motif/private.h?ds=sidebyside

diff --git a/include/wx/motif/private.h b/include/wx/motif/private.h
index 23737aecba..5020ca20f9 100644
--- a/include/wx/motif/private.h
+++ b/include/wx/motif/private.h
@@ -13,22 +13,48 @@
 #define _WX_PRIVATE_H_
 
 #include "wx/defs.h"
+#include "X11/Xlib.h"
 
-class wxMouseEvent;
-class wxKeyEvent;
+class WXDLLEXPORT wxFont;
+class WXDLLEXPORT wxWindow;
+class WXDLLEXPORT wxSize;
+class WXDLLEXPORT wxBitmap;
+class WXDLLEXPORT wxColour;
+
+#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
 
+// ----------------------------------------------------------------------------
+// convenience macros
+// ----------------------------------------------------------------------------
+
+#define wxCHECK_MOTIF_VERSION( major, minor ) \
+  ( XmVersion >= (major) * 1000 + (minor) )
+
+#define wxCHECK_LESSTIF_VERSION( major, minor ) \
+  ( LesstifVersion >= (major) * 1000 + (minor) )
+
+#define wxCHECK_LESSTIF() ( defined(LesstifVersion) && LesstifVersion > 0 )
+
+// ----------------------------------------------------------------------------
+// Miscellaneous functions
+// ----------------------------------------------------------------------------
+
+WXWidget wxCreateBorderWidget( WXWidget parent, long style );
+
 // ----------------------------------------------------------------------------
 // common callbacks
 // ----------------------------------------------------------------------------
 
 // All widgets should have this as their resize proc.
-extern void wxWidgetResizeProc(Widget w, XConfigureEvent *event, String args[], int *num_args);
+extern void wxWidgetResizeProc(Widget w, XConfigureEvent *event, 
+                               String args[], int *num_args);
 
 // For repainting arbitrary windows
-void wxUniversalRepaintProc(Widget w, XtPointer WXUNUSED(c_data), XEvent *event, char *);
+void wxUniversalRepaintProc(Widget w, XtPointer WXUNUSED(c_data), 
+                            XEvent *event, char *);
 
 // ----------------------------------------------------------------------------
 // we maintain a hash table which contains the mapping from Widget to wxWindow
@@ -39,6 +65,13 @@ extern void wxDeleteWindowFromTable(Widget w);
 extern wxWindow *wxGetWindowFromTable(Widget w);
 extern bool wxAddWindowToTable(Widget w, wxWindow *win);
 
+// ----------------------------------------------------------------------------
+// wxBitmap related functions
+// ----------------------------------------------------------------------------
+
+// Creates a bitmap with transparent areas drawn in the given colour.
+wxBitmap wxCreateMaskedBitmap(const wxBitmap& bitmap, wxColour& colour);
+
 // ----------------------------------------------------------------------------
 // key events related functions
 // ----------------------------------------------------------------------------
@@ -48,23 +81,21 @@ extern char wxFindMnemonic(const char* s);
 extern char * wxFindAccelerator (const char *s);
 extern XmString wxFindAcceleratorText (const char *s);
 
-extern int wxCharCodeXToWX(KeySym keySym);
-extern KeySym wxCharCodeWXToX(int id);
-
 // ----------------------------------------------------------------------------
 // TranslateXXXEvent() functions - translate Motif event to wxWindow one
 // ----------------------------------------------------------------------------
-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 bool wxTranslateMouseEvent(wxMouseEvent& wxevent, wxWindow *win,
+                                  Widget widget, XEvent *xevent);
+extern bool wxTranslateKeyEvent(wxKeyEvent& wxevent, wxWindow *win,
+                                Widget widget, XEvent *xevent);
 
-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);
+extern void wxDoChangeFont(WXWidget widget, wxFont& font);
 
 #define wxNO_COLORS   0x00
 #define wxBACK_COLORS 0x01
@@ -79,30 +110,68 @@ extern XColor itemColors[5] ;
 #define wxBOTS_INDEX 4
 
 // ----------------------------------------------------------------------------
-// utility classes
+// XmString/wxString conversion utilities
 // ----------------------------------------------------------------------------
 
+wxString wxXmStringToString( const XmString& xmString );
+XmString wxStringToXmString( const wxString& string );
+XmString wxStringToXmString( const char* string );
+
 // XmString made easy to use in wxWindows (and has an added benefit of
 // cleaning up automatically)
 class wxXmString
 {
 public:
+    wxXmString(const char* str)
+    {
+        m_string = XmStringCreateLtoR((char *)str, XmSTRING_DEFAULT_CHARSET);
+    }
+
     wxXmString(const wxString& str)
     {
         m_string = XmStringCreateLtoR((char *)str.c_str(),
-                                      XmSTRING_DEFAULT_CHARSET);
+            XmSTRING_DEFAULT_CHARSET);
     }
 
-    ~wxXmString() { XmStringFree(m_string); }
+    // just to avoid calling XmStringFree()
+    wxXmString(const XmString& string) { m_string = 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; }
-
+    
 private:
     XmString m_string;
 };
 
+// ----------------------------------------------------------------------------
+// Routines used in both wxTextCtrl/wxListBox and nativa wxComboBox
+// (defined in src/motif/listbox.cpp or src/motif/textctrl.cpp
+// ----------------------------------------------------------------------------
+
+int wxDoFindStringInList( Widget listWidget, const wxString& str );
+int wxDoGetSelectionInList( Widget listWidget );
+wxString wxDoGetStringInList( Widget listWidget, int n );
+wxSize wxDoGetListBoxBestSize( Widget listWidget, const wxWindow* window );
+
+wxSize wxDoGetSingleTextCtrlBestSize( Widget textWidget,
+                                      const wxWindow* window );
+
+// ----------------------------------------------------------------------------
+// event-related functions
+// ----------------------------------------------------------------------------
+
+class wxEventLoop;
+
+// executes one main loop iteration (implemented in src/motif/evtloop.cpp)
+// returns true if the loop should be exited
+bool wxDoEventLoopIteration( wxEventLoop& evtLoop );
+
+// Consume all events until no more left
+void wxFlushEvents(WXDisplay* display);
+
 // ----------------------------------------------------------------------------
 // macros to avoid casting WXFOO to Foo all the time
 // ----------------------------------------------------------------------------
@@ -117,4 +186,4 @@ private:
 extern "C" XtAppContext wxGetAppContext();
 
 #endif
-    // _WX_PRIVATE_H_
+// _WX_PRIVATE_H_