X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f1db433a3bcaa0c1c8a6a149eafa5e1f0f47cb71..b6428abaa5ac53c69c6113b86c0a0b8b05b93df7:/include/wx/motif/private.h diff --git a/include/wx/motif/private.h b/include/wx/motif/private.h index 5cf2b7d0e9..36b0c038fe 100644 --- 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: @@ -55,11 +55,11 @@ WXWidget wxCreateBorderWidget( WXWidget parent, long style ); // ---------------------------------------------------------------------------- // 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 -void wxUniversalRepaintProc(Widget w, XtPointer WXUNUSED(c_data), +void wxUniversalRepaintProc(Widget w, XtPointer WXUNUSED(c_data), XEvent *event, char *); // ---------------------------------------------------------------------------- @@ -76,7 +76,7 @@ extern bool wxAddWindowToTable(Widget w, wxWindow *win); // ---------------------------------------------------------------------------- // 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 @@ -99,9 +99,9 @@ extern bool wxTranslateKeyEvent(wxKeyEvent& wxevent, wxWindow *win, extern void wxDoChangeForegroundColour(WXWidget widget, wxColour& foregroundColour); extern void wxDoChangeBackgroundColour(WXWidget widget, - wxColour& backgroundColour, + const wxColour& backgroundColour, 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, @@ -147,11 +147,11 @@ public: 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; } - + private: XmString m_string; };