From 219ee9ba9d64d7e5764c5a56a46658a37e251c68 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Tue, 20 Sep 2005 20:33:47 +0000 Subject: [PATCH] really fix binary backwards compatibility for wxMotif git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35627 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/motif/dialog.h | 6 ++++++ include/wx/motif/frame.h | 10 ++++++++-- src/motif/dialog.cpp | 4 ++++ src/motif/frame.cpp | 4 ++++ 4 files changed, 22 insertions(+), 2 deletions(-) diff --git a/include/wx/motif/dialog.h b/include/wx/motif/dialog.h index dba81d148b..5dc85da974 100644 --- 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 efb804eb05..b29732525c 100644 --- 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 cf91fefe54..196ccc04fa 100644 --- 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 405396ce94..b29231b5c7 100644 --- 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; -- 2.45.2