Deprecated and obsolete parts marked up for backward compatibility.

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

diff --git a/src/os2/dialog.cpp b/src/os2/dialog.cpp
index 5b76f3ca10ab01e296234eaa4305370c72566244..06f4e62c6749fc37bb1691d0ea2927e5f2b021ed 100644 (file)
--- a/src/os2/dialog.cpp
+++ b/src/os2/dialog.cpp
@@ -130,6 +130,8 @@ bool wxDialog::Create( wxWindow*       pParent,
     return true;
 } // end of wxDialog::Create
 
     return true;
 } // end of wxDialog::Create
 

+#if WXWIN_COMPATIBILITY_2_6
+

 // deprecated ctor
 wxDialog::wxDialog(wxWindow *parent,
                    const wxString& title,
 // deprecated ctor
 wxDialog::wxDialog(wxWindow *parent,
                    const wxString& title,


@@ -146,13 +148,13 @@ wxDialog::wxDialog(wxWindow *parent,
     Create(parent, wxID_ANY, title, wxPoint(x, y), wxSize(w, h), style, name);
 }
 
     Create(parent, wxID_ANY, title, wxPoint(x, y), wxSize(w, h), style, name);
 }
 

-void wxDialog::SetModal(
-  bool                              WXUNUSED(bFlag)
-)
+void wxDialog::SetModal(bool WXUNUSED(bFlag))

 {
     // nothing to do, obsolete method
 } // end of wxDialog::SetModal
 
 {
     // nothing to do, obsolete method
 } // end of wxDialog::SetModal
 

+#endif // WXWIN_COMPATIBILITY_2_6
+

 wxDialog::~wxDialog()
 {
     m_isBeingDeleted = true;
 wxDialog::~wxDialog()
 {
     m_isBeingDeleted = true;


@@ -199,11 +201,14 @@ void wxDialog::OnCharHook(
 // showing the dialogs
 // ----------------------------------------------------------------------------
 
 // showing the dialogs
 // ----------------------------------------------------------------------------
 

+#if WXWIN_COMPATIBILITY_2_6
+

 bool wxDialog::IsModalShowing() const
 {
     return IsModal();
 } // end of wxDialog::IsModalShowing
 
 bool wxDialog::IsModalShowing() const
 {
     return IsModal();
 } // end of wxDialog::IsModalShowing
 

+#endif // WXWIN_COMPATIBILITY_2_6

 
 wxWindow *wxDialog::FindSuitableParent() const
 {
 
 wxWindow *wxDialog::FindSuitableParent() const
 {