Stop duplicating wxFrame dtor in all ports.
wxGTK1, wxGTK, wxMSW and wxOSX all did the same thing in their wxFrame dtor, so just do it in wxFrameBase instead. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@76804 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
parent
9456ae3b91
commit
e1655f5394
@ -39,8 +39,6 @@ public:
|
||||
long style = wxDEFAULT_FRAME_STYLE,
|
||||
const wxString& name = wxFrameNameStr);
|
||||
|
||||
virtual ~wxFrame();
|
||||
|
||||
#if wxUSE_STATUSBAR
|
||||
void SetStatusBar(wxStatusBar *statbar) wxOVERRIDE;
|
||||
#endif // wxUSE_STATUSBAR
|
||||
|
@ -50,8 +50,6 @@ public:
|
||||
long style = wxDEFAULT_FRAME_STYLE,
|
||||
const wxString& name = wxFrameNameStr);
|
||||
|
||||
virtual ~wxFrame();
|
||||
|
||||
#if wxUSE_STATUSBAR
|
||||
virtual void PositionStatusBar();
|
||||
|
||||
|
@ -37,8 +37,6 @@ public:
|
||||
long style = wxDEFAULT_FRAME_STYLE,
|
||||
const wxString& name = wxFrameNameStr);
|
||||
|
||||
virtual ~wxFrame();
|
||||
|
||||
// implement base class pure virtuals
|
||||
virtual bool ShowFullScreen(bool show, long style = wxFULLSCREEN_ALL);
|
||||
|
||||
|
@ -43,8 +43,6 @@ public:
|
||||
long style = wxDEFAULT_FRAME_STYLE,
|
||||
const wxString& name = wxFrameNameStr);
|
||||
|
||||
virtual ~wxFrame();
|
||||
|
||||
// implementation only from now on
|
||||
// -------------------------------
|
||||
|
||||
|
@ -165,7 +165,9 @@ wxFrameBase::wxFrameBase()
|
||||
|
||||
wxFrameBase::~wxFrameBase()
|
||||
{
|
||||
// this destructor is required for Darwin
|
||||
SendDestroyEvent();
|
||||
|
||||
DeleteAllBars();
|
||||
}
|
||||
|
||||
wxFrame *wxFrameBase::New(wxWindow *parent,
|
||||
|
@ -56,13 +56,6 @@ bool wxFrame::Create( wxWindow *parent,
|
||||
return wxFrameBase::Create(parent, id, title, pos, sizeOrig, style, name);
|
||||
}
|
||||
|
||||
wxFrame::~wxFrame()
|
||||
{
|
||||
SendDestroyEvent();
|
||||
|
||||
DeleteAllBars();
|
||||
}
|
||||
|
||||
// ----------------------------------------------------------------------------
|
||||
// overridden wxWindow methods
|
||||
// ----------------------------------------------------------------------------
|
||||
|
@ -224,13 +224,6 @@ bool wxFrame::Create( wxWindow *parent,
|
||||
return rt;
|
||||
}
|
||||
|
||||
wxFrame::~wxFrame()
|
||||
{
|
||||
SendDestroyEvent();
|
||||
|
||||
DeleteAllBars();
|
||||
}
|
||||
|
||||
// ----------------------------------------------------------------------------
|
||||
// overridden wxWindow methods
|
||||
// ----------------------------------------------------------------------------
|
||||
|
@ -135,13 +135,6 @@ bool wxFrame::Create(wxWindow *parent,
|
||||
return true;
|
||||
}
|
||||
|
||||
wxFrame::~wxFrame()
|
||||
{
|
||||
SendDestroyEvent();
|
||||
|
||||
DeleteAllBars();
|
||||
}
|
||||
|
||||
// ----------------------------------------------------------------------------
|
||||
// wxFrame client size calculations
|
||||
// ----------------------------------------------------------------------------
|
||||
|
@ -55,13 +55,6 @@ bool wxFrame::Create(wxWindow *parent,
|
||||
return true;
|
||||
}
|
||||
|
||||
wxFrame::~wxFrame()
|
||||
{
|
||||
SendDestroyEvent();
|
||||
|
||||
DeleteAllBars();
|
||||
}
|
||||
|
||||
// get the origin of the client area in the client coordinates
|
||||
wxPoint wxFrame::GetClientAreaOrigin() const
|
||||
{
|
||||
|
Loading…
Reference in New Issue
Block a user