renamed wxMotif::wxTLW::DoCreate() to XmDoCreateTLW() to avoid conflicts with
DoCreate()s in derived classes and removed DoDestroy() entirely because there was really no advantage in having it (it can't be called fom base class dtor) also made XmDoCreateTLW() pure virtual which required changing IMPLEMENT_DYNAMIC_CLASS into IMPLEMENT_ABSTRACT_CLASS for wxTopLevelWindow in common code but this made sense anyhow because wxTLW should be an ABC anyhow git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35508 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -196,12 +196,13 @@ bool wxFrame::Create(wxWindow *parent,
|
||||
return true;
|
||||
}
|
||||
|
||||
bool wxFrame::DoCreate( wxWindow* parent, wxWindowID id,
|
||||
const wxString& title,
|
||||
const wxPoint& pos,
|
||||
const wxSize& size,
|
||||
long style,
|
||||
const wxString& name )
|
||||
bool wxFrame::XmDoCreateTLW(wxWindow* parent,
|
||||
wxWindowID id,
|
||||
const wxString& title,
|
||||
const wxPoint& pos,
|
||||
const wxSize& size,
|
||||
long style,
|
||||
const wxString& name)
|
||||
{
|
||||
Widget frameShell;
|
||||
|
||||
@@ -292,11 +293,7 @@ wxFrame::~wxFrame()
|
||||
}
|
||||
|
||||
PreDestroy();
|
||||
DoDestroy();
|
||||
}
|
||||
|
||||
void wxFrame::DoDestroy()
|
||||
{
|
||||
Widget frameShell = (Widget)GetShellWidget();
|
||||
|
||||
if( frameShell )
|
||||
|
Reference in New Issue
Block a user