SetTextColour is gone

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

diff --git a/include/wx/motif/private.h b/include/wx/motif/private.h
index 9246449cde5a98ddefd1240c9e49aea1d373fb37..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:


@@ -38,6 +38,12 @@ class WXDLLEXPORT wxColour;
 
 #define wxCHECK_LESSTIF() ( __WXLESSTIF__ )
 
 
 #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
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // Miscellaneous functions
 // ----------------------------------------------------------------------------


@@ -49,11 +55,11 @@ WXWidget wxCreateBorderWidget( WXWidget parent, long style );
 // ----------------------------------------------------------------------------
 
 // All widgets should have this as their resize proc.
 // ----------------------------------------------------------------------------
 
 // 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 *);
 
 // ----------------------------------------------------------------------------


@@ -70,7 +76,7 @@ extern bool wxAddWindowToTable(Widget w, wxWindow *win);
 // ----------------------------------------------------------------------------
 
 // Creates a bitmap with transparent areas drawn in the given colour.
 // ----------------------------------------------------------------------------
 
 // Creates a bitmap with transparent areas drawn in the given colour.

-wxBitmap wxCreateMaskedBitmap(const wxBitmap& bitmap, wxColour& colour);
+wxBitmap wxCreateMaskedBitmap(const wxBitmap& bitmap, const wxColour& colour);

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


@@ -93,9 +99,9 @@ extern bool wxTranslateKeyEvent(wxKeyEvent& wxevent, wxWindow *win,
 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,
+                                       const wxColour& backgroundColour,

                                        bool changeArmColour = false);
                                        bool changeArmColour = false);

-extern void wxDoChangeFont(WXWidget widget, wxFont& font);
+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,
 extern void wxGetTextExtent(WXDisplay* display, const wxFont& font,
                             double scale,
                             const wxString& string, int* width, int* height,


@@ -141,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;
 };