fixed MSVC6 compiler warning

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

diff --git a/include/wx/motif/private.h b/include/wx/motif/private.h
index f93dc7b81e5e8158921ea38ea6b327aa6d3b364b..6afab90e108d3b26ca7a02ad5aabdd1a7fd19d41 100644 (file)
--- a/include/wx/motif/private.h
+++ b/include/wx/motif/private.h
@@ -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


@@ -32,6 +38,12 @@
 
 #define wxCHECK_LESSTIF() ( defined(LesstifVersion) && LesstifVersion > 0 )
 
 
 #define wxCHECK_LESSTIF() ( defined(LesstifVersion) && LesstifVersion > 0 )
 

+// ----------------------------------------------------------------------------
+// Miscellaneous functions
+// ----------------------------------------------------------------------------
+
+WXWidget wxCreateBorderWidget( WXWidget parent, long style );
+

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


@@ -53,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
 // ----------------------------------------------------------------------------


@@ -67,9 +86,9 @@ 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 wxDoChangeForegroundColour(WXWidget widget,
                                        wxColour& foregroundColour);


@@ -91,14 +110,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
 {


@@ -141,14 +160,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
 // ----------------------------------------------------------------------------