Build fix for wxMSWUniv makefile driven builds. univ/setup0.h should be autoregenerat...

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

diff --git a/include/wx/motif/private.h b/include/wx/motif/private.h
index f93dc7b81e5e8158921ea38ea6b327aa6d3b364b..36b0c038fe53680893a96352d9dc2dc54de6cc0b 100644 (file)
--- a/include/wx/motif/private.h
+++ b/include/wx/motif/private.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        private.h
+// Name:        wx/motif/private.h

 // Purpose:     Private declarations for wxMotif port
 // Author:      Julian Smart
 // Modified by:
 // Purpose:     Private declarations for wxMotif port
 // Author:      Julian Smart
 // Modified by:


@@ -15,6 +15,12 @@
 #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
 #include "wx/x11/privx.h"
 
 // Put any private declarations here: native Motif types may be used because


@@ -30,18 +36,30 @@
 #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__ )
+
+// some compilers (e.g. Sun CC) give warnings when treating string literals as
+// (non const) "char *" but many Motif functions take "char *" parameters which
+// are really "const char *" so use this macro to suppress the warnings when we
+// know it's ok
+#define wxMOTIF_STR(x) wx_const_cast(char *, x)
+
+// ----------------------------------------------------------------------------
+// Miscellaneous functions
+// ----------------------------------------------------------------------------
+
+WXWidget wxCreateBorderWidget( WXWidget parent, long style );

 
 // ----------------------------------------------------------------------------
 // common callbacks
 // ----------------------------------------------------------------------------
 
 // All widgets should have this as their resize proc.
 
 // ----------------------------------------------------------------------------
 // common callbacks
 // ----------------------------------------------------------------------------
 
 // All widgets should have this as their resize proc.

-extern void wxWidgetResizeProc(Widget w, XConfigureEvent *event, 
+extern void wxWidgetResizeProc(Widget w, XConfigureEvent *event,

                                String args[], int *num_args);
 
 // For repainting arbitrary windows
                                String args[], int *num_args);
 
 // For repainting arbitrary windows

-void wxUniversalRepaintProc(Widget w, XtPointer WXUNUSED(c_data), 
+void wxUniversalRepaintProc(Widget w, XtPointer WXUNUSED(c_data),

                             XEvent *event, char *);
 
 // ----------------------------------------------------------------------------
                             XEvent *event, char *);
 
 // ----------------------------------------------------------------------------


@@ -53,6 +71,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, const wxColour& colour);
+

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


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

-                                       wxColour& backgroundColour,
-                                       bool changeArmColour = FALSE);
-extern void wxDoChangeFont(WXWidget widget, wxFont& font);
+                                       const wxColour& backgroundColour,
+                                       bool changeArmColour = false);
+extern void wxDoChangeFont(WXWidget widget, const 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


@@ -91,14 +120,14 @@ 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 );
 
 // ----------------------------------------------------------------------------
 
 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
+// XmString made easy to use in wxWidgets (and has an added benefit of

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


@@ -118,11 +147,11 @@ public:
     wxXmString(const XmString& string) { m_string = string; }
 
     ~wxXmString() { XmStringFree(m_string); }
     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; }
     // 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;
 };


@@ -141,14 +170,18 @@ wxSize wxDoGetSingleTextCtrlBestSize( Widget textWidget,
                                       const wxWindow* window );
 
 // ----------------------------------------------------------------------------
                                       const wxWindow* window );
 
 // ----------------------------------------------------------------------------

-// executes one main loop iteration (implemented in src/motif/evtloop.cpp)
+// 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
 // ----------------------------------------------------------------------------