temporarily reverted binary backwards incompatible DoCreate to XmDoCreateTLW renaming
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35592 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -72,8 +72,14 @@ protected:
|
|||||||
virtual void DoGetPosition(int* x, int* y) const;
|
virtual void DoGetPosition(int* x, int* y) const;
|
||||||
|
|
||||||
private:
|
private:
|
||||||
|
#if wxCHECK_VERSION(2,7,0)
|
||||||
|
// DoDestroy() is not used anywhere else, DoCreate() should also be renamed
|
||||||
|
// in src/motif/dialog.cpp, frame.cpp and toplevel.cp
|
||||||
|
#error "Remove DoDestroy() and rename DoCreate() to XmDoCreateTLW(), they were only kept for binary backwards compatibility"
|
||||||
|
#endif
|
||||||
|
|
||||||
// really create the Motif widget for TLW
|
// really create the Motif widget for TLW
|
||||||
virtual bool XmDoCreateTLW(wxWindow* parent,
|
virtual bool DoCreate(wxWindow* parent,
|
||||||
wxWindowID id,
|
wxWindowID id,
|
||||||
const wxString& title,
|
const wxString& title,
|
||||||
const wxPoint& pos,
|
const wxPoint& pos,
|
||||||
@@ -81,6 +87,7 @@ private:
|
|||||||
long style,
|
long style,
|
||||||
const wxString& name) = 0;
|
const wxString& name) = 0;
|
||||||
|
|
||||||
|
virtual void DoDestroy() { }
|
||||||
|
|
||||||
wxString m_title;
|
wxString m_title;
|
||||||
};
|
};
|
||||||
|
@@ -151,7 +151,7 @@ bool wxDialog::Create(wxWindow *parent, wxWindowID id,
|
|||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
bool wxDialog::XmDoCreateTLW(wxWindow* parent,
|
bool wxDialog::DoCreate(wxWindow* parent,
|
||||||
wxWindowID id,
|
wxWindowID id,
|
||||||
const wxString& title,
|
const wxString& title,
|
||||||
const wxPoint& pos,
|
const wxPoint& pos,
|
||||||
|
@@ -196,7 +196,7 @@ bool wxFrame::Create(wxWindow *parent,
|
|||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
bool wxFrame::XmDoCreateTLW(wxWindow* parent,
|
bool wxFrame::DoCreate(wxWindow* parent,
|
||||||
wxWindowID id,
|
wxWindowID id,
|
||||||
const wxString& title,
|
const wxString& title,
|
||||||
const wxPoint& pos,
|
const wxPoint& pos,
|
||||||
|
@@ -121,7 +121,7 @@ bool wxTopLevelWindowMotif::Create( wxWindow *parent, wxWindowID id,
|
|||||||
|
|
||||||
m_windowId = ( id > -1 ) ? id : NewControlId();
|
m_windowId = ( id > -1 ) ? id : NewControlId();
|
||||||
|
|
||||||
bool retval = XmDoCreateTLW( parent, id, title, pos, size, style, name );
|
bool retval = DoCreate( parent, id, title, pos, size, style, name );
|
||||||
|
|
||||||
if( !retval ) return false;
|
if( !retval ) return false;
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user