From: Robin Dunn <robin@alldunn.com>
Date: Sat, 30 Jun 2012 20:59:46 +0000 (+0000)
Subject: Move a couple standard virtuals to protected sections so they can be overridden in... 
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/ba8540022fee5c7eced87c5fe2470b64affec6de

Move a couple standard virtuals to protected sections so they can be overridden in derived classes

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

diff --git a/include/wx/generic/headerctrlg.h b/include/wx/generic/headerctrlg.h
index 8c9a842d3c..db2fa2ec72 100644
--- a/include/wx/generic/headerctrlg.h
+++ b/include/wx/generic/headerctrlg.h
@@ -48,6 +48,10 @@ public:
 
     virtual ~wxHeaderCtrl();
 
+protected:
+    virtual wxSize DoGetBestSize() const;
+
+    
 private:
     // implement base class pure virtuals
     virtual void DoSetCount(unsigned int count);
@@ -59,9 +63,6 @@ private:
     virtual void DoSetColumnsOrder(const wxArrayInt& order);
     virtual wxArrayInt DoGetColumnsOrder() const;
 
-    // override wxWindow methods which must be implemented by a new control
-    virtual wxSize DoGetBestSize() const;
-
     // common part of all ctors
     void Init();
 
diff --git a/include/wx/headerctrl.h b/include/wx/headerctrl.h
index 08940d5b21..31373bb1c3 100644
--- a/include/wx/headerctrl.h
+++ b/include/wx/headerctrl.h
@@ -210,6 +210,10 @@ protected:
     // indices after the number of columns changed
     void DoResizeColumnIndices(wxArrayInt& colIndices, unsigned int count);
 
+protected:
+    // this window doesn't look nice with the border so don't use it by default
+    virtual wxBorder GetDefaultBorder() const { return wxBORDER_NONE; }
+
 private:
     // methods implementing our public API and defined in platform-specific
     // implementations
@@ -222,8 +226,6 @@ private:
     virtual void DoSetColumnsOrder(const wxArrayInt& order) = 0;
     virtual wxArrayInt DoGetColumnsOrder() const = 0;
 
-    // this window doesn't look nice with the border so don't use it by default
-    virtual wxBorder GetDefaultBorder() const { return wxBORDER_NONE; }
 
     // event handlers
     void OnSeparatorDClick(wxHeaderCtrlEvent& event);