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

re-renamed DoCreate() to XmDoCreateTLW() to avoid virtual function hiding in other classes with their own DoCreate() and re-removed DoDestroy()

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35692 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2005-09-25 20:29:58 +00:00
parent 48f625bc2c
commit 02bcd285fa
6 changed files with 6 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
include/wx/motif/dialog.h
View File

@@ -75,7 +75,7 @@ public:
void OnCloseWindow(wxCloseEvent& event); void OnCloseWindow(wxCloseEvent& event);
private: private:
virtual bool DoCreate(wxWindow* parent, virtual bool XmDoCreateTLW(wxWindow* parent,
wxWindowID id, wxWindowID id,
const wxString& title, const wxString& title,
const wxPoint& pos, const wxPoint& pos,
@@ -95,11 +95,6 @@ protected:
virtual void DoSetClientSize(int width, int height); virtual void DoSetClientSize(int width, int height);
#if wxCHECK_VERSION(2,7,0)
#error "Remove DoDestroy(), it was only kept for binary backwards compatibility"
#endif
virtual void DoDestroy();
private: private:
DECLARE_EVENT_TABLE() DECLARE_EVENT_TABLE()

7
include/wx/motif/frame.h
View File

@@ -113,7 +113,7 @@ private:
virtual void DoSetClientSize(int width, int height); virtual void DoSetClientSize(int width, int height);
private: private:
virtual bool DoCreate(wxWindow* parent, virtual bool XmDoCreateTLW(wxWindow* parent,
wxWindowID id, wxWindowID id,
const wxString& title, const wxString& title,
const wxPoint& pos, const wxPoint& pos,
@@ -122,11 +122,6 @@ private:
const wxString& name); const wxString& name);
#if wxCHECK_VERSION(2,7,0)
#error "Remove DoDestroy(), it was only kept for binary backwards compatibility"
#endif
virtual void DoDestroy();
DECLARE_EVENT_TABLE() DECLARE_EVENT_TABLE()
DECLARE_DYNAMIC_CLASS(wxFrame) DECLARE_DYNAMIC_CLASS(wxFrame)

9
include/wx/motif/toplevel.h
View File

@@ -68,14 +68,8 @@ 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 DoCreate(wxWindow* parent, virtual bool XmDoCreateTLW(wxWindow* parent,
wxWindowID id, wxWindowID id,
const wxString& title, const wxString& title,
const wxPoint& pos, const wxPoint& pos,
@@ -83,7 +77,6 @@ private:
long style, long style,
const wxString& name) = 0; const wxString& name) = 0;
virtual void DoDestroy() { }
wxString m_title; wxString m_title;
}; };

6
src/motif/dialog.cpp
View File

@@ -147,7 +147,7 @@ bool wxDialog::Create(wxWindow *parent, wxWindowID id,
return true; return true;
} }
bool wxDialog::DoCreate(wxWindow* parent, bool wxDialog::XmDoCreateTLW(wxWindow* parent,
wxWindowID id, wxWindowID id,
const wxString& title, const wxString& title,
const wxPoint& pos, const wxPoint& pos,
@@ -192,10 +192,6 @@ bool wxDialog::DoCreate(wxWindow* parent,
return true; return true;
} }
void wxDialog::DoDestroy()
{
}
void wxDialog::SetModal(bool flag) void wxDialog::SetModal(bool flag)
{ {
#ifdef __VMS #ifdef __VMS

6
src/motif/frame.cpp
View File

@@ -192,7 +192,7 @@ bool wxFrame::Create(wxWindow *parent,
return true; return true;
} }
bool wxFrame::DoCreate(wxWindow* parent, bool wxFrame::XmDoCreateTLW(wxWindow* parent,
wxWindowID id, wxWindowID id,
const wxString& title, const wxString& title,
const wxPoint& pos, const wxPoint& pos,
@@ -262,10 +262,6 @@ bool wxFrame::DoCreate(wxWindow* parent,
return true; return true;
} }
void wxFrame::DoDestroy()
{
}
wxFrame::~wxFrame() wxFrame::~wxFrame()
{ {
m_isBeingDeleted = true; m_isBeingDeleted = true;

2
src/motif/toplevel.cpp
View File

@@ -117,7 +117,7 @@ bool wxTopLevelWindowMotif::Create( wxWindow *parent, wxWindowID id,
m_windowId = ( id > -1 ) ? id : NewControlId(); m_windowId = ( id > -1 ) ? id : NewControlId();
bool retval = DoCreate( parent, id, title, pos, size, style, name ); bool retval = XmDoCreateTLW( parent, id, title, pos, size, style, name );
if( !retval ) return false; if( !retval ) return false;