don't remember size passed to SetSize() as pending position/size for TLW as deferred...

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

diff --git a/include/wx/motif/private.h b/include/wx/motif/private.h
index e48ad8311f07eeda4f8d079bde24fdb8caa8b3ba..9246449cde5a98ddefd1240c9e49aea1d373fb37 100644 (file)
--- a/include/wx/motif/private.h
+++ b/include/wx/motif/private.h
@@ -36,7 +36,13 @@ class WXDLLEXPORT wxColour;
 #define wxCHECK_LESSTIF_VERSION( major, minor ) \
   ( LesstifVersion >= (major) * 1000 + (minor) )
 
 #define wxCHECK_LESSTIF_VERSION( major, minor ) \
   ( LesstifVersion >= (major) * 1000 + (minor) )
 

-#define wxCHECK_LESSTIF() ( defined(LesstifVersion) && LesstifVersion > 0 )
+#define wxCHECK_LESSTIF() ( __WXLESSTIF__ )
+
+// ----------------------------------------------------------------------------
+// Miscellaneous functions
+// ----------------------------------------------------------------------------
+
+WXWidget wxCreateBorderWidget( WXWidget parent, long style );

 
 // ----------------------------------------------------------------------------
 // common callbacks
 
 // ----------------------------------------------------------------------------
 // common callbacks


@@ -80,16 +86,20 @@ 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,
 
 extern void wxDoChangeForegroundColour(WXWidget widget,
                                        wxColour& foregroundColour);
 extern void wxDoChangeBackgroundColour(WXWidget widget,
                                        wxColour& backgroundColour,

-                                       bool changeArmColour = FALSE);
+                                       bool changeArmColour = false);

 extern void wxDoChangeFont(WXWidget widget, wxFont& font);
 extern void wxDoChangeFont(WXWidget widget, wxFont& font);

+extern void wxGetTextExtent(WXDisplay* display, const wxFont& font,
+                            double scale,
+                            const wxString& string, int* width, int* height,
+                            int* ascent, int* descent);

 
 #define wxNO_COLORS   0x00
 #define wxBACK_COLORS 0x01
 
 #define wxNO_COLORS   0x00
 #define wxBACK_COLORS 0x01


@@ -111,7 +121,7 @@ wxString wxXmStringToString( const XmString& xmString );
 XmString wxStringToXmString( const wxString& string );
 XmString wxStringToXmString( const char* string );
 
 XmString wxStringToXmString( const wxString& string );
 XmString wxStringToXmString( const char* string );
 

-// XmString made easy to use in wxWindows (and has an added benefit of
+// XmString made easy to use in wxWidgets (and has an added benefit of

 // cleaning up automatically)
 class wxXmString
 {
 // cleaning up automatically)
 class wxXmString
 {