glcanvas fix and toplevel event handler exposed

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

diff --git a/include/wx/motif/private.h b/include/wx/motif/private.h
index 5d1f132aad1ea74bd712a54c1011260842b6e8fb..e7901129e3347b7606af65ad1f918d21ca0035d4 100644 (file)
--- a/include/wx/motif/private.h
+++ b/include/wx/motif/private.h
@@ -15,11 +15,35 @@
 #include "wx/defs.h"
 #include "X11/Xlib.h"
 
 #include "wx/defs.h"
 #include "X11/Xlib.h"
 

+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
 
 #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
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // common callbacks
 // ----------------------------------------------------------------------------


@@ -41,6 +65,13 @@ 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);
 

+// ----------------------------------------------------------------------------
+// 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
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // key events related functions
 // ----------------------------------------------------------------------------


@@ -55,15 +86,16 @@ extern XmString wxFindAcceleratorText (const char *s);
 // ----------------------------------------------------------------------------
 
 extern bool wxTranslateMouseEvent(wxMouseEvent& wxevent, wxWindow *win,
 // ----------------------------------------------------------------------------
 
 extern bool wxTranslateMouseEvent(wxMouseEvent& wxevent, wxWindow *win,

-                                  Widget widget, XEvent *xevent);
+                                  Widget widget, const XEvent *xevent);

 extern bool wxTranslateKeyEvent(wxKeyEvent& wxevent, wxWindow *win,
 extern bool wxTranslateKeyEvent(wxKeyEvent& wxevent, wxWindow *win,

-                                Widget widget, XEvent *xevent);
+                                Widget widget, const XEvent *xevent);

 
 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
 
 #define wxNO_COLORS   0x00
 #define wxBACK_COLORS 0x01


@@ -78,9 +110,13 @@ extern XColor itemColors[5] ;
 #define wxBOTS_INDEX 4
 
 // ----------------------------------------------------------------------------
 #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
 // XmString made easy to use in wxWindows (and has an added benefit of
 // cleaning up automatically)
 class wxXmString


@@ -96,7 +132,10 @@ public:
         m_string = XmStringCreateLtoR((char *)str.c_str(),
             XmSTRING_DEFAULT_CHARSET);
     }
         m_string = XmStringCreateLtoR((char *)str.c_str(),
             XmSTRING_DEFAULT_CHARSET);
     }

-    
+
+    // 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
     ~wxXmString() { XmStringFree(m_string); }
     
     // semi-implicit conversion to XmString (shouldn't rely on implicit


@@ -108,14 +147,31 @@ private:
 };
 
 // ----------------------------------------------------------------------------
 };
 
 // ----------------------------------------------------------------------------

-// executes one main loop iteration (implemented in src/motif/evtloop.cpp)
+// 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;
 
 // ----------------------------------------------------------------------------
 
 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 );
 
 // 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
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // macros to avoid casting WXFOO to Foo all the time
 // ----------------------------------------------------------------------------