From: Paul Cornett <paulcor@bullseye.com>
Date: Sat, 27 Oct 2007 18:05:28 +0000 (+0000)
Subject: correct access for virtuals
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/4e7b25f056b1c983eb35d3f71ba67da84a15be19?ds=sidebyside

correct access for virtuals

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

diff --git a/include/wx/mac/carbon/choice.h b/include/wx/mac/carbon/choice.h
index 838da21dc0..3a5337440e 100644
--- a/include/wx/mac/carbon/choice.h
+++ b/include/wx/mac/carbon/choice.h
@@ -69,9 +69,6 @@ public:
                 const wxValidator& validator = wxDefaultValidator,
                 const wxString& name = wxChoiceNameStr);
 
-    virtual void DoDeleteOneItem(unsigned int n);
-    virtual void DoClear();
-
     virtual unsigned int GetCount() const ;
     virtual int GetSelection() const ;
     virtual void SetSelection(int n);
@@ -82,6 +79,9 @@ public:
     virtual wxInt32 MacControlHit( WXEVENTHANDLERREF handler , WXEVENTREF event ) ;
 
 protected:
+    virtual void DoDeleteOneItem(unsigned int n);
+    virtual void DoClear();
+
     virtual wxSize DoGetBestSize() const ;
     virtual int DoInsertItems(const wxArrayStringsAdapter& items,
                               unsigned int pos,
diff --git a/include/wx/mac/carbon/combobox.h b/include/wx/mac/carbon/combobox.h
index 510673b380..6614099e2f 100644
--- a/include/wx/mac/carbon/combobox.h
+++ b/include/wx/mac/carbon/combobox.h
@@ -84,10 +84,6 @@ class WXDLLEXPORT wxComboBox : public wxControl, public wxComboBoxBase
            const wxValidator& validator = wxDefaultValidator,
            const wxString& name = wxComboBoxNameStr);
 
-    // List functions
-    virtual void DoDeleteOneItem(unsigned int n);
-    virtual void DoClear();
-
     virtual int GetSelection() const;
     virtual void SetSelection(int n);
     virtual int FindString(const wxString& s, bool bCase = false) const;
@@ -127,6 +123,8 @@ class WXDLLEXPORT wxComboBox : public wxControl, public wxComboBoxBase
     virtual bool CanUndo() const;
     virtual bool CanRedo() const;
 
+    virtual wxClientDataType GetClientDataType() const;
+
     wxInt32 MacControlHit( WXEVENTHANDLERREF handler, WXEVENTREF event );
 
     wxCONTROL_ITEMCONTAINER_CLIENTDATAOBJECT_RECAST
@@ -137,6 +135,10 @@ protected:
     // common part of all ctors
     void Init();
 
+    // List functions
+    virtual void DoDeleteOneItem(unsigned int n);
+    virtual void DoClear();
+
     // override the base class virtuals involved in geometry calculations
     virtual wxSize DoGetBestSize() const;
     virtual void DoMoveWindow(int x, int y, int width, int height);
@@ -148,7 +150,6 @@ protected:
     virtual void DoSetItemClientData(unsigned int n, void* clientData);
     virtual void * DoGetItemClientData(unsigned int n) const;
 
-    virtual wxClientDataType GetClientDataType() const;
     virtual void SetClientDataType(wxClientDataType clientDataItemsType);
 
     // the subcontrols
diff --git a/include/wx/mac/carbon/dialog.h b/include/wx/mac/carbon/dialog.h
index 39d3ec0ad0..fab1aabaec 100644
--- a/include/wx/mac/carbon/dialog.h
+++ b/include/wx/mac/carbon/dialog.h
@@ -59,15 +59,16 @@ public:
     // may be called to terminate the dialog with the given return code
     virtual void EndModal(int retCode);
 
-    // mac also takes command-period as cancel
-    virtual bool IsEscapeKey(const wxKeyEvent& event);
-
     // implementation
     // --------------
 
     // show modal dialog and enter modal loop
     void DoShowModal();
 
+protected:
+    // mac also takes command-period as cancel
+    virtual bool IsEscapeKey(const wxKeyEvent& event);
+
 private:
     void Init();
 
diff --git a/include/wx/mac/carbon/listbox.h b/include/wx/mac/carbon/listbox.h
index 91214b05b6..9d4800171f 100644
--- a/include/wx/mac/carbon/listbox.h
+++ b/include/wx/mac/carbon/listbox.h
@@ -89,8 +89,6 @@ public:
 
     // implement base class pure virtuals
     virtual void Refresh(bool eraseBack = true, const wxRect *rect = NULL);
-    virtual void DoClear();
-    virtual void DoDeleteOneItem(unsigned int n);
 
     virtual unsigned int GetCount() const;
     virtual wxString GetString(unsigned int n) const;
@@ -110,6 +108,9 @@ public:
     wxMacListControl* GetPeer() const;
 
 protected:
+    virtual void DoClear();
+    virtual void DoDeleteOneItem(unsigned int n);
+
     // from wxItemContainer
     virtual int DoInsertItems(const wxArrayStringsAdapter& items,
                               unsigned int pos,
diff --git a/include/wx/mac/carbon/scrolbar.h b/include/wx/mac/carbon/scrolbar.h
index cabbeb9dc3..50aaa416b7 100644
--- a/include/wx/mac/carbon/scrolbar.h
+++ b/include/wx/mac/carbon/scrolbar.h
@@ -56,9 +56,9 @@ public:
     virtual void  MacHandleControlClick( WXWidget control , wxInt16 controlpart , bool mouseStillDown ) ;
     virtual wxInt32 MacControlHit( WXEVENTHANDLERREF handler , WXEVENTREF mevent ) ;
 
+protected:
     wxSize DoGetBestSize() const;
     
-protected:
     int m_pageSize;
     int m_viewSize;
     int m_objectSize;
diff --git a/include/wx/mac/carbon/window.h b/include/wx/mac/carbon/window.h
index aee0e91ffa..95039401e2 100644
--- a/include/wx/mac/carbon/window.h
+++ b/include/wx/mac/carbon/window.h
@@ -55,8 +55,6 @@ public:
     virtual void Lower();
 
     virtual bool Show( bool show = true );
-    virtual void DoEnable( bool enable );
-    virtual void OnEnabled( bool enabled );
 
     virtual void SetFocus();
 
@@ -85,6 +83,8 @@ public:
                                const wxFont *theFont = NULL )
                                const;
 protected:
+    virtual void DoEnable( bool enable );
+    virtual void OnEnabled( bool enabled );
     virtual bool DoPopupMenu( wxMenu *menu, int x, int y );
 public:
     virtual void SetScrollbar( int orient, int pos, int thumbVisible,