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

make access for virtuals match base

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@62771 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Paul Cornett
2009-12-03 17:20:15 +00:00
parent 470ee71463
commit cff9681b85
12 changed files with 29 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/wx/ribbon/bar.h
View File

@@ -115,7 +115,6 @@ public:
wxRibbonPage* GetPage(int n);
bool DismissExpandedPanel();
virtual wxSize DoGetBestSize() const;
virtual bool HasMultiplePages() const { return true; }
void SetWindowStyleFlag(long style);
@@ -125,6 +124,7 @@ public:
protected:
friend class wxRibbonPage;
virtual wxSize DoGetBestSize() const;
wxBorder GetDefaultBorder() const { return wxBORDER_NONE; }
wxRibbonPageTabInfo* HitTestTabs(wxPoint position, int* index = NULL);

2
include/wx/ribbon/buttonbar.h
View File

@@ -87,9 +87,9 @@ public:
virtual bool IsSizingContinuous() const;
virtual wxSize GetMinSize() const;
virtual wxSize DoGetBestSize() const;
protected:
friend class wxRibbonButtonBarEvent;
virtual wxSize DoGetBestSize() const;
wxBorder GetDefaultBorder() const { return wxBORDER_NONE; }
void OnEraseBackground(wxEraseEvent& evt);

2
include/wx/ribbon/page.h
View File

@@ -46,7 +46,6 @@ public:
wxBitmap& GetIcon() {return m_icon;}
virtual wxSize GetMinSize() const;
virtual wxSize DoGetBestSize() const;
void SetSizeWithScrollButtonAdjustment(int x, int y, int width, int height);
void AdjustRectToIncludeScrollButtons(wxRect* rect) const;
@@ -63,6 +62,7 @@ public:
virtual void RemoveChild(wxWindowBase *child);
protected:
virtual wxSize DoGetBestSize() const;
virtual wxBorder GetDefaultBorder() const { return wxBORDER_NONE; }
void DoSetSize(int x, int y, int width, int height, int sizeFlags = wxSIZE_AUTO);

2
include/wx/ribbon/panel.h
View File

@@ -65,7 +65,6 @@ public:
virtual bool Realize();
virtual bool Layout();
virtual wxSize GetMinSize() const;
virtual wxSize DoGetBestSize() const;
virtual bool IsSizingContinuous() const;
@@ -76,6 +75,7 @@ public:
wxRibbonPanel* GetExpandedPanel();
protected:
virtual wxSize DoGetBestSize() const;
wxBorder GetDefaultBorder() const { return wxBORDER_NONE; }
wxSize GetMinNotMinimisedSize() const;

2
include/wx/ribbon/toolbar.h
View File

@@ -88,10 +88,10 @@ public:
virtual void SetRows(int nMin, int nMax = -1);
virtual bool IsSizingContinuous() const;
virtual wxSize DoGetBestSize() const;
protected:
friend class wxRibbonToolBarEvent;
virtual wxSize DoGetBestSize() const;
wxBorder GetDefaultBorder() const { return wxBORDER_NONE; }
void OnEraseBackground(wxEraseEvent& evt);