make access for virtuals match base

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@56795 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/gtk/bmpcbox.h b/include/wx/gtk/bmpcbox.h
index b0555904f7eae0b6b10f02bd1218fc862a0143c5..f146577248f5643ea4bcccbbd4b272d8ad1f453d 100644 (file)
--- a/include/wx/gtk/bmpcbox.h
+++ b/include/wx/gtk/bmpcbox.h
@@ -125,9 +125,9 @@ public:
     virtual bool IsEditable() const;
     virtual void SetEditable(bool editable);
 
-protected:
-
     virtual GtkWidget* GetConnectWidget();
+
+protected:
     virtual GdkWindow *GTKGetWindow(wxArrayGdkWindows& windows) const;
 
     virtual void GTKCreateComboBoxWidget();

diff --git a/include/wx/gtk/msgdlg.h b/include/wx/gtk/msgdlg.h
index cb3c49c772a1326521cdae951eecf434480e44a6..785a0b18e2ac57da4937839bd32a7675660d21e1 100644 (file)
--- a/include/wx/gtk/msgdlg.h
+++ b/include/wx/gtk/msgdlg.h
@@ -31,6 +31,8 @@ protected:
                            int WXUNUSED(sizeFlags) = wxSIZE_AUTO) {}
     virtual void DoMoveWindow(int WXUNUSED(x), int WXUNUSED(y),
                               int WXUNUSED(width), int WXUNUSED(height)) {}
+    // override to convert wx mnemonics to GTK+ ones and handle stock ids
+    virtual void DoSetCustomLabel(wxString& var, const ButtonLabel& label);
 
 private:
     // override to use stock GTK+ defaults instead of just string ones
@@ -39,9 +41,6 @@ private:
     virtual wxString GetDefaultOKLabel() const;
     virtual wxString GetDefaultCancelLabel() const;
 
-    // override to convert wx mnemonics to GTK+ ones and handle stock ids
-    virtual void DoSetCustomLabel(wxString& var, const ButtonLabel& label);
-
     // create the real GTK+ dialog: this is done from ShowModal() to allow
     // changing the message between constructing the dialog and showing it
     void GTKCreateMsgDialog();

diff --git a/include/wx/odcombo.h b/include/wx/odcombo.h
index f5fd36a87122ebe18bde4cd6476cbfbf964a3a05..1c803aa5a2303396328bbd87fa53b561c88ffd1a 100644 (file)
--- a/include/wx/odcombo.h
+++ b/include/wx/odcombo.h
@@ -307,8 +307,6 @@ public:
     }
 
     // wxControlWithItems methods
-    virtual void DoClear();
-    virtual void DoDeleteOneItem(unsigned int n);
     virtual unsigned int GetCount() const;
     virtual wxString GetString(unsigned int n) const;
     virtual void SetString(unsigned int n, const wxString& s);
@@ -335,6 +333,8 @@ public:
     wxCONTROL_ITEMCONTAINER_CLIENTDATAOBJECT_RECAST
 
 protected:
+    virtual void DoClear();
+    virtual void DoDeleteOneItem(unsigned int n);
 
     // Callback for drawing. Font, background and text colour have been
     // prepared according to selection, focus and such.

diff --git a/include/wx/propgrid/manager.h b/include/wx/propgrid/manager.h
index c3768ab07a8d8dab8e76d1153181e43e839559f0..6910682a83364d586cc41b391ff7e35da6caec2d 100644 (file)
--- a/include/wx/propgrid/manager.h
+++ b/include/wx/propgrid/manager.h
@@ -442,10 +442,12 @@ public:
     */
     int GetPageByState( const wxPropertyGridPageState* pstate ) const;
 
+protected:
     /** Returns wxPropertyGridPageState of given page, current page's for -1.
     */
     virtual wxPropertyGridPageState* GetPageState( int page ) const;
 
+public:
     /** Returns number of managed pages. */
     size_t GetPageCount() const;
 
@@ -610,15 +612,13 @@ protected:
     */
     virtual wxPropertyGrid* CreatePropertyGrid() const;
 
-    virtual void RefreshProperty( wxPGProperty* p );
-
 public:
+    virtual void RefreshProperty( wxPGProperty* p );
 
     //
     // Overridden functions - no documentation required.
     //
 
-    virtual wxSize DoGetBestSize() const;
     void SetId( wxWindowID winid );
 
     virtual void Freeze();
@@ -628,11 +628,13 @@ public:
     virtual void SetWindowStyleFlag ( long style );
 
 protected:
+    virtual wxSize DoGetBestSize() const;
 
 public:
 
 #ifndef SWIG
 
+    virtual bool ProcessEvent( wxEvent& event );
     //
     // Event handlers
     //
@@ -727,8 +729,6 @@ protected:
     virtual bool SetEditableStateItem( const wxString& name, wxVariant value );
     virtual wxVariant GetEditableStateItem( const wxString& name ) const;
 
-    virtual bool ProcessEvent( wxEvent& event );
-
 private:
     DECLARE_EVENT_TABLE()
 #endif // #ifndef SWIG

diff --git a/include/wx/propgrid/propgrid.h b/include/wx/propgrid/propgrid.h
index a35360ccce93addf13dbb730a347d754fe4e7949..277d5852d1579f348c165aff784a961c670f5762 100644 (file)
--- a/include/wx/propgrid/propgrid.h
+++ b/include/wx/propgrid/propgrid.h
@@ -1327,6 +1327,9 @@ public:
     */
     bool UnfocusEditor();
 
+    virtual bool ProcessEvent(wxEvent& event);
+    virtual void SetWindowStyleFlag( long style );
+
 protected:
 
     /**
@@ -1375,7 +1378,6 @@ public:
 
     // Overridden functions.
     virtual bool Destroy();
-    virtual wxSize DoGetBestSize() const;
     // Returns property at given y coordinate (relative to grid's top left).
     wxPGProperty* GetItemAtY( int y ) const { return DoGetItemAtY(y); }
 
@@ -1391,6 +1393,7 @@ public:
 
 
 protected:
+    virtual wxSize DoGetBestSize() const;
 
 #ifndef wxPG_ICON_WIDTH
     wxBitmap            *m_expandbmp, *m_collbmp;
@@ -1792,9 +1795,6 @@ protected:
 
     void CustomSetCursor( int type, bool override = false );
 
-    virtual bool ProcessEvent(wxEvent& event);
-    virtual void SetWindowStyleFlag( long style );
-
     /**
         Repositions scrollbar and underlying panel according to changed virtual
         size.

diff --git a/include/wx/propgrid/props.h b/include/wx/propgrid/props.h
index b096bb24e106da0f22db4a2e316bfe5620ae389a..d0f4d31950edc503cefeadd958b8de301e34f769 100644 (file)
--- a/include/wx/propgrid/props.h
+++ b/include/wx/propgrid/props.h
@@ -302,10 +302,10 @@ public:
                               wxPGValidationInfo* pValidationInfo,
                               int mode =
                                  wxPG_PROPERTY_VALIDATION_ERROR_MESSAGE );
+    virtual wxValidator* DoGetValidator () const;
 
 protected:
     int m_precision;
-    virtual wxValidator* DoGetValidator () const;
 };
 
 // -----------------------------------------------------------------------

diff --git a/include/wx/weakref.h b/include/wx/weakref.h
index 74b590d6278daff5c4c07298d373030b677301f2..e0bd1f90dd9286522d928c2607a1177f733d594f 100644 (file)
--- a/include/wx/weakref.h
+++ b/include/wx/weakref.h
@@ -59,6 +59,13 @@ public:
         }
     }
 
+    virtual void OnObjectDestroy()
+    {
+        // Tracked object itself removes us from list of trackers
+        wxASSERT(m_pobj != NULL);
+        m_pobj = NULL;
+    }
+
 protected:
     void Assign(T* pobj)
     {
@@ -82,13 +89,6 @@ protected:
         Assign( wr.m_pobj );
     }
 
-    virtual void OnObjectDestroy()
-    {
-        // Tracked object itself removes us from list of trackers
-        wxASSERT( m_pobj!=NULL );
-        m_pobj = NULL;
-    }
-
     T *m_pobj;
 };
 
@@ -122,6 +122,14 @@ struct wxWeakRefImpl<T, false> : public wxTrackerNode
         }
     }
 
+    virtual void OnObjectDestroy()
+    {
+        // Tracked object itself removes us from list of trackers
+        wxASSERT(m_pobj != NULL);
+        m_pobj = NULL;
+        m_ptbase = NULL;
+    }
+
 protected:
     wxWeakRefImpl() : m_pobj(NULL), m_ptbase(NULL) { }
 
@@ -177,14 +185,6 @@ protected:
         }
     }
 
-    virtual void OnObjectDestroy()
-    {
-        // Tracked object itself removes us from list of trackers
-        wxASSERT( m_pobj!=NULL );
-        m_pobj = NULL;
-        m_ptbase = NULL;
-    }
-
     T *m_pobj;
     wxTrackable *m_ptbase;
 };
@@ -293,6 +293,13 @@ public:
         }
     }
 
+    virtual void OnObjectDestroy()
+    {
+        wxASSERT_MSG(m_pobj, "tracked object should have removed us itself");
+
+        m_pobj = NULL;
+    }
+
 protected:
     void Assign(T *pobj)
     {
@@ -320,13 +327,6 @@ protected:
         }
     }
 
-    virtual void OnObjectDestroy()
-    {
-        wxASSERT_MSG( m_pobj, "tracked object should have removed us itself" );
-
-        m_pobj = NULL;
-    }
-
     T *m_pobj;
 };