From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Wed, 7 Mar 2012 23:50:21 +0000 (+0000)
Subject: Deprecate wxWindow::MakeModal().
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/e94f3031736c1a23eba37892b4076893b1f6e416

Deprecate wxWindow::MakeModal().

Using this function was never the right way to show a modal window and it
didn't really work correctly. Instead of futilely trying to fix it, just
deprecate it.

Closes #1561.

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

diff --git a/docs/changes.txt b/docs/changes.txt
index 389cb414ac..37d089fc32 100644
--- a/docs/changes.txt
+++ b/docs/changes.txt
@@ -423,6 +423,8 @@ Deprecated methods and their replacements
   you use these functions.
 - wxDataViewCtrl::StartEditor(item, n) taking column index is now deprecated,
   use EditItem(item, GetColumn(n)), which takes the column itself, instead.
+- wxWindow::MakeModal() is deprecated, use wxDialog::ShowModal() instead if
+  possible or wxWindowDisabler otherwise.
 
 
 Major new features in this release
diff --git a/include/wx/window.h b/include/wx/window.h
index c4442b2141..774be3539d 100644
--- a/include/wx/window.h
+++ b/include/wx/window.h
@@ -623,9 +623,10 @@ public:
 
     bool HasExtraStyle(int exFlag) const { return (m_exStyle & exFlag) != 0; }
 
+#if WXWIN_COMPATIBILITY_2_8
         // make the window modal (all other windows unresponsive)
-    virtual void MakeModal(bool modal = true);
-
+    wxDEPRECATED( virtual void MakeModal(bool modal = true) );
+#endif
 
     // (primitive) theming support
     // ---------------------------
diff --git a/interface/wx/window.h b/interface/wx/window.h
index 524605b004..83725acb33 100644
--- a/interface/wx/window.h
+++ b/interface/wx/window.h
@@ -3172,17 +3172,6 @@ public:
     */
     virtual bool IsTopLevel() const;
 
-    /**
-        Disables all other windows in the application so that
-        the user can only interact with this window.
-
-        @param modal
-            If @true, this call disables all other windows in the application so that
-            the user can only interact with this window. If @false, the effect is
-            reversed.
-    */
-    virtual void MakeModal(bool modal = true);
-
     
     /**
         This virtual function is normally only used internally, but
diff --git a/src/common/wincmn.cpp b/src/common/wincmn.cpp
index ecc4aa8832..068a15bc40 100644
--- a/src/common/wincmn.cpp
+++ b/src/common/wincmn.cpp
@@ -1916,6 +1916,7 @@ wxWindowBase::FindWindowById( long id, const wxWindow* parent )
 // dialog oriented functions
 // ----------------------------------------------------------------------------
 
+#if WXWIN_COMPATIBILITY_2_8
 void wxWindowBase::MakeModal(bool modal)
 {
     // Disable all other windows
@@ -1932,6 +1933,7 @@ void wxWindowBase::MakeModal(bool modal)
         }
     }
 }
+#endif // WXWIN_COMPATIBILITY_2_8
 
 bool wxWindowBase::Validate()
 {