Calling a virtual function from a destructor is not good:

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

diff --git a/include/wx/motif/private.h b/include/wx/motif/private.h
index 8f21c4e12c5e446d54e9784428e72fc7af7fb512..2f6270776c02e9000ab383140c4111b3077ca5a8 100644 (file)
--- a/include/wx/motif/private.h
+++ b/include/wx/motif/private.h
@@ -15,11 +15,27 @@
 #include "wx/defs.h"
 #include "X11/Xlib.h"
 
+class WXDLLEXPORT wxFont;
+class WXDLLEXPORT wxWindow;
+class WXDLLEXPORT wxSize;
+
 #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 )
+
 // ----------------------------------------------------------------------------
 // common callbacks
 // ----------------------------------------------------------------------------
@@ -64,6 +80,7 @@ extern void wxDoChangeForegroundColour(WXWidget widget,
 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
@@ -81,6 +98,10 @@ extern XColor itemColors[5] ;
 // utility classes
 // ----------------------------------------------------------------------------
 
+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
@@ -96,7 +117,10 @@ public:
         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
@@ -113,7 +137,12 @@ private:
 // ----------------------------------------------------------------------------
 
 int wxDoFindStringInList( Widget listWidget, const wxString& str );
-int wxDoGetSelectionInList(Widget listWidget);
+int wxDoGetSelectionInList( Widget listWidget );
+wxString wxDoGetStringInList( Widget listWidget, int n );
+wxSize wxDoGetListBoxBestSize( Widget listWidget, const wxWindow* window );
+
+wxSize wxDoGetSingleTextCtrlBestSize( Widget textWidget,
+                                      const wxWindow* window );
 
 // ----------------------------------------------------------------------------
 // executes one main loop iteration (implemented in src/motif/evtloop.cpp)