re-renamed DoCreate() to XmDoCreateTLW() to avoid virtual function hiding in other...

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35692 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/motif/dialog.h b/include/wx/motif/dialog.h
index 3c8866fb1d7eb8577c1acb6bbe7d43bc4e724a44..9fa1cfd9c11ccb7fd7e70abf2d31d62a9d487ddf 100644 (file)
--- a/include/wx/motif/dialog.h
+++ b/include/wx/motif/dialog.h
@@ -75,7 +75,7 @@ public:
     void OnCloseWindow(wxCloseEvent& event);
 
 private:
-    virtual bool DoCreate(wxWindow* parent,
+    virtual bool XmDoCreateTLW(wxWindow* parent,
                                wxWindowID id,
                                const wxString& title,
                                const wxPoint& pos,
@@ -95,11 +95,6 @@ protected:
 
     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:
     DECLARE_EVENT_TABLE()

diff --git a/include/wx/motif/frame.h b/include/wx/motif/frame.h
index e18ef08d4eeed325f514b15b43e634b9834c4db7..a5cf1996377e8b360de9026a3f97f60d87ab2de4 100644 (file)
--- a/include/wx/motif/frame.h
+++ b/include/wx/motif/frame.h
@@ -113,7 +113,7 @@ private:
     virtual void DoSetClientSize(int width, int height);
 
 private:
-    virtual bool DoCreate(wxWindow* parent,
+    virtual bool XmDoCreateTLW(wxWindow* parent,
                                wxWindowID id,
                                const wxString& title,
                                const wxPoint& pos,
@@ -122,11 +122,6 @@ private:
                                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_DYNAMIC_CLASS(wxFrame)

diff --git a/include/wx/motif/toplevel.h b/include/wx/motif/toplevel.h
index ae5e79cce943b1f36bcbd33feec4d899c8f06096..80e3f1d204fb4838004a7befc98e457230572cc9 100644 (file)
--- a/include/wx/motif/toplevel.h
+++ b/include/wx/motif/toplevel.h
@@ -68,14 +68,8 @@ protected:
     virtual void DoGetPosition(int* x, int* y) const;
 
 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
-    virtual bool DoCreate(wxWindow* parent,
+    virtual bool XmDoCreateTLW(wxWindow* parent,
                                wxWindowID id,
                                const wxString& title,
                                const wxPoint& pos,
@@ -83,7 +77,6 @@ private:
                                long style,
                                const wxString& name) = 0;
 
-    virtual void DoDestroy() { }
 
     wxString m_title;
 };

diff --git a/src/motif/dialog.cpp b/src/motif/dialog.cpp
index 8f234a2f20286a948d331dc960c72f5757a6fb75..0b812eadba4a4bd01c9b8ef9613ca964903f8bc5 100644 (file)
--- a/src/motif/dialog.cpp
+++ b/src/motif/dialog.cpp
@@ -147,7 +147,7 @@ bool wxDialog::Create(wxWindow *parent, wxWindowID id,
     return true;
 }
 
-bool wxDialog::DoCreate(wxWindow* parent,
+bool wxDialog::XmDoCreateTLW(wxWindow* parent,
                              wxWindowID id,
                              const wxString& title,
                              const wxPoint& pos,
@@ -192,10 +192,6 @@ bool wxDialog::DoCreate(wxWindow* parent,
     return true;
 }
 
-void wxDialog::DoDestroy()
-{
-}
-
 void wxDialog::SetModal(bool flag)
 {
 #ifdef __VMS

diff --git a/src/motif/frame.cpp b/src/motif/frame.cpp
index 56b6ddefaa7d3f57aa79b55ac87626ac343bd055..9dd9f8067372e7db6fa00779490d411d4196147b 100644 (file)
--- a/src/motif/frame.cpp
+++ b/src/motif/frame.cpp
@@ -192,7 +192,7 @@ bool wxFrame::Create(wxWindow *parent,
     return true;
 }
 
-bool wxFrame::DoCreate(wxWindow* parent,
+bool wxFrame::XmDoCreateTLW(wxWindow* parent,
                             wxWindowID id,
                             const wxString& title,
                             const wxPoint& pos,
@@ -262,10 +262,6 @@ bool wxFrame::DoCreate(wxWindow* parent,
     return true;
 }
 
-void wxFrame::DoDestroy()
-{
-}
-
 wxFrame::~wxFrame()
 {
     m_isBeingDeleted = true;

diff --git a/src/motif/toplevel.cpp b/src/motif/toplevel.cpp
index 89a5d8003c6f81bad3f6527fbd9c03353c62178a..7d0613e6b8599939b33ec4244f1f6609f29f349e 100644 (file)
--- a/src/motif/toplevel.cpp
+++ b/src/motif/toplevel.cpp
@@ -117,7 +117,7 @@ bool wxTopLevelWindowMotif::Create( wxWindow *parent, wxWindowID id,
 
     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;