really fix binary backwards compatibility for wxMotif

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

diff --git a/include/wx/motif/dialog.h b/include/wx/motif/dialog.h
index dba81d148b070f371606b2eb3684da86a8bc06db..5dc85da9743d133bef1a258192cc84eae827feea 100644 (file)
--- a/include/wx/motif/dialog.h
+++ b/include/wx/motif/dialog.h
@@ -99,6 +99,12 @@ 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 efb804eb05aa3a869b18fbf8fe02508eab506d40..b29732525cc9607693d7e8044fa237bc064727e7 100644 (file)
--- a/include/wx/motif/frame.h
+++ b/include/wx/motif/frame.h
@@ -126,9 +126,15 @@ 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)
 };
 
-#endif
-// _WX_MOTIF_FRAME_H_
+#endif // _WX_MOTIF_FRAME_H_
+

diff --git a/src/motif/dialog.cpp b/src/motif/dialog.cpp
index cf91fefe54fc4414d70147a72c5f80358c9893b1..196ccc04fa746ac253315841807dbb4a2a8578ec 100644 (file)
--- a/src/motif/dialog.cpp
+++ b/src/motif/dialog.cpp
@@ -196,6 +196,10 @@ 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 405396ce94fe43064c948c453bc4af3aa8e066ef..b29231b5c75ab0eb52eb9adf31c41c26b1543e5b 100644 (file)
--- a/src/motif/frame.cpp
+++ b/src/motif/frame.cpp
@@ -266,6 +266,10 @@ bool wxFrame::DoCreate(wxWindow* parent,
     return true;
 }
 
+void wxFrame::DoDestroy()
+{
+}
+
 wxFrame::~wxFrame()
 {
     m_isBeingDeleted = true;