From 65fb4b3a4f18e1d8b58ac92d50d4cc7f81f03783 Mon Sep 17 00:00:00 2001 From: Robin Dunn Date: Tue, 10 Jul 2012 06:42:15 +0000 Subject: [PATCH] Make a couple virtuals protected so they can be overridden. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71998 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/msw/headerctrl.h | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/include/wx/msw/headerctrl.h b/include/wx/msw/headerctrl.h index 069b73a606..bf925b0650 100644 --- a/include/wx/msw/headerctrl.h +++ b/include/wx/msw/headerctrl.h @@ -46,7 +46,14 @@ public: virtual ~wxHeaderCtrl(); - + +protected: + // override wxWindow methods which must be implemented by a new control + virtual wxSize DoGetBestSize() const; + virtual void DoSetSize(int x, int y, + int width, int height, + int sizeFlags = wxSIZE_AUTO); + private: // implement base class pure virtuals virtual void DoSetCount(unsigned int count); @@ -58,12 +65,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; - virtual void DoSetSize(int x, int y, - int width, int height, - int sizeFlags = wxSIZE_AUTO); - // override MSW-specific methods needed for new control virtual WXDWORD MSWGetStyle(long style, WXDWORD *exstyle) const; virtual bool MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result);