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

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 8c9a842d3c5cfd5501395215bb822a813928047e..db2fa2ec72e9b320d7c84cb8985f2127f9d8dd76 100644 (file)
--- a/include/wx/generic/headerctrlg.h
+++ b/include/wx/generic/headerctrlg.h
@@ -48,6 +48,10 @@ public:
 
     virtual ~wxHeaderCtrl();
 
 
     virtual ~wxHeaderCtrl();
 

+protected:
+    virtual wxSize DoGetBestSize() const;
+
+    

 private:
     // implement base class pure virtuals
     virtual void DoSetCount(unsigned int count);
 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;
 
     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();
 
     // common part of all ctors
     void Init();
 

diff --git a/include/wx/headerctrl.h b/include/wx/headerctrl.h
index 08940d5b21170af70ccf791fcbdb70101962e727..31373bb1c34924b772c06cbf2b615b0cbf74128c 100644 (file)
--- 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);
 
     // 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
 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;
 
     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);
 
     // event handlers
     void OnSeparatorDClick(wxHeaderCtrlEvent& event);