Override DoThaw() in wxAuiNotebook correctly.
Don't "override" Thaw() in wxAuiNotebook as it's not virtual any more. Override DoThaw() instead. Also use wxBookCtrlBase instead of wxControl as the base class. Closes #14179. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71081 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
parent
554b7d9f8d
commit
c52f18dfc8
@ -335,9 +335,6 @@ public:
|
||||
// we don't want focus for ourselves
|
||||
// virtual bool AcceptsFocus() const { return false; }
|
||||
|
||||
// Redo sizing after thawing
|
||||
virtual void Thaw();
|
||||
|
||||
//wxBookCtrlBase functions
|
||||
|
||||
virtual void SetPageSize (const wxSize &size);
|
||||
@ -363,6 +360,9 @@ protected:
|
||||
// choose the default border for this window
|
||||
virtual wxBorder GetDefaultBorder() const { return wxBORDER_NONE; }
|
||||
|
||||
// Redo sizing after thawing
|
||||
virtual void DoThaw();
|
||||
|
||||
// these can be overridden
|
||||
|
||||
// update the height, return true if it was done or false if the new height
|
||||
|
@ -3238,11 +3238,11 @@ bool wxAuiNotebook::ShowWindowMenu()
|
||||
return false;
|
||||
}
|
||||
|
||||
void wxAuiNotebook::Thaw()
|
||||
void wxAuiNotebook::DoThaw()
|
||||
{
|
||||
DoSizing();
|
||||
|
||||
wxControl::Thaw();
|
||||
wxBookCtrlBase::DoThaw();
|
||||
}
|
||||
|
||||
void wxAuiNotebook::SetPageSize (const wxSize& WXUNUSED(size))
|
||||
|
Loading…
Reference in New Issue
Block a user