Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71896 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
2012-06-30 20:59:46 +00:00
parent 55d47fc2b1
commit ba8540022f
2 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
include/wx/generic/headerctrlg.h
View File

@@ -48,6 +48,10 @@ public:
virtual ~wxHeaderCtrl(); virtual ~wxHeaderCtrl();
protected:
virtual wxSize DoGetBestSize() const;
private: private:
// implement base class pure virtuals // implement base class pure virtuals
virtual void DoSetCount(unsigned int count); virtual void DoSetCount(unsigned int count);
@@ -59,9 +63,6 @@ private:
virtual void DoSetColumnsOrder(const wxArrayInt& order); virtual void DoSetColumnsOrder(const wxArrayInt& order);
virtual wxArrayInt DoGetColumnsOrder() const; virtual wxArrayInt DoGetColumnsOrder() const;
// override wxWindow methods which must be implemented by a new control
virtual wxSize DoGetBestSize() const;
// common part of all ctors // common part of all ctors
void Init(); void Init();

6
include/wx/headerctrl.h
View File

@@ -210,6 +210,10 @@ protected:
// indices after the number of columns changed // indices after the number of columns changed
void DoResizeColumnIndices(wxArrayInt& colIndices, unsigned int count); 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: private:
// methods implementing our public API and defined in platform-specific // methods implementing our public API and defined in platform-specific
// implementations // implementations
@@ -222,8 +226,6 @@ private:
virtual void DoSetColumnsOrder(const wxArrayInt& order) = 0; virtual void DoSetColumnsOrder(const wxArrayInt& order) = 0;
virtual wxArrayInt DoGetColumnsOrder() const = 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 // event handlers
void OnSeparatorDClick(wxHeaderCtrlEvent& event); void OnSeparatorDClick(wxHeaderCtrlEvent& event);