X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d75638f85f4f385f3cfdc3e8a2a9acc6a686e7b2..0c0d686fe5693f29d86f068a81abdcfeab63dc7f:/include/wx/motif/window.h

diff --git a/include/wx/motif/window.h b/include/wx/motif/window.h
index fed6259e2d..77b8625430 100644
--- a/include/wx/motif/window.h
+++ b/include/wx/motif/window.h
@@ -91,8 +91,6 @@ public:
                                const wxFont *theFont = (const wxFont *) NULL)
                                const;
 
-    virtual bool PopupMenu( wxMenu *menu, int x, int y );
-
     virtual void SetScrollbar( int orient, int pos, int thumbVisible,
                                int range, bool refresh = TRUE );
     virtual void SetScrollPos( int orient, int pos, bool refresh = TRUE );
@@ -173,6 +171,10 @@ public:
     void ClearUpdateRegion() { m_updateRegion.Clear(); }
     void SetUpdateRegion(const wxRegion& region) { m_updateRegion = region; }
 
+    // sets the fore/background colour for the given widget
+    static void DoChangeForegroundColour(WXWidget widget, wxColour& foregroundColour);
+    static void DoChangeBackgroundColour(WXWidget widget, wxColour& backgroundColour, bool changeArmColour = FALSE);
+
 protected:
     // event handlers (not virtual by design)
     void OnIdle(wxIdleEvent& event);
@@ -209,10 +211,9 @@ protected:
     int GetPixmapWidth() const { return m_pixmapWidth; }
     int GetPixmapHeight() const { return m_pixmapHeight; }
 
+public:
     // Change properties
     virtual void ChangeFont(bool keepOriginalSize = TRUE);             // Change to the current font (often overridden)
-    virtual void DoChangeForegroundColour(WXWidget widget, wxColour& foregroundColour);
-    virtual void DoChangeBackgroundColour(WXWidget widget, wxColour& backgroundColour, bool changeArmColour = FALSE);
 
     // Change background and foreground colour using current background colour
     // setting (Motif generates foreground based on background)
@@ -220,6 +221,7 @@ protected:
     // Change foreground colour using current foreground colour setting
     virtual void ChangeForegroundColour();
 
+protected:
     // Adds the widget to the hash table and adds event handlers.
     bool AttachWidget(wxWindow* parent, WXWidget mainWidget,
                       WXWidget formWidget, int x, int y, int width, int height);
@@ -315,6 +317,7 @@ protected:
                            int width, int height,
                            int sizeFlags = wxSIZE_AUTO);
     virtual void DoSetClientSize(int width, int height);
+    virtual bool DoPopupMenu(wxMenu *menu, int x, int y);
 
 #if wxUSE_TOOLTIPS
     virtual void DoSetToolTip( wxToolTip *tip );