From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Mon, 19 Sep 2005 10:36:18 +0000 (+0000)
Subject: temporarily reverted binary backwards incompatible DoCreate to XmDoCreateTLW renaming
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/e6b915ed4fcc54e5bc6997e395642f8ac49670b8

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
---

diff --git a/include/wx/motif/toplevel.h b/include/wx/motif/toplevel.h
index 061d263dc4..700e52a40f 100644
--- a/include/wx/motif/toplevel.h
+++ b/include/wx/motif/toplevel.h
@@ -72,8 +72,14 @@ 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 XmDoCreateTLW(wxWindow* parent,
+    virtual bool DoCreate(wxWindow* parent,
                                wxWindowID id,
                                const wxString& title,
                                const wxPoint& pos,
@@ -81,6 +87,7 @@ 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 dae891831b..4be633c308 100644
--- a/src/motif/dialog.cpp
+++ b/src/motif/dialog.cpp
@@ -151,7 +151,7 @@ bool wxDialog::Create(wxWindow *parent, wxWindowID id,
     return true;
 }
 
-bool wxDialog::XmDoCreateTLW(wxWindow* parent,
+bool wxDialog::DoCreate(wxWindow* parent,
                              wxWindowID id,
                              const wxString& title,
                              const wxPoint& pos,
diff --git a/src/motif/frame.cpp b/src/motif/frame.cpp
index f17078a2d5..405396ce94 100644
--- a/src/motif/frame.cpp
+++ b/src/motif/frame.cpp
@@ -196,7 +196,7 @@ bool wxFrame::Create(wxWindow *parent,
     return true;
 }
 
-bool wxFrame::XmDoCreateTLW(wxWindow* parent,
+bool wxFrame::DoCreate(wxWindow* parent,
                             wxWindowID id,
                             const wxString& title,
                             const wxPoint& pos,
diff --git a/src/motif/toplevel.cpp b/src/motif/toplevel.cpp
index 59343183b5..a1df9f3b10 100644
--- a/src/motif/toplevel.cpp
+++ b/src/motif/toplevel.cpp
@@ -121,7 +121,7 @@ bool wxTopLevelWindowMotif::Create( wxWindow *parent, wxWindowID id,
 
     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;