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
This commit is contained in:
Vadim Zeitlin
2012-03-07 23:50:21 +00:00
parent fca74306c5
commit e94f303173
4 changed files with 7 additions and 13 deletions

View File

@@ -423,6 +423,8 @@ Deprecated methods and their replacements
you use these functions. you use these functions.
- wxDataViewCtrl::StartEditor(item, n) taking column index is now deprecated, - wxDataViewCtrl::StartEditor(item, n) taking column index is now deprecated,
use EditItem(item, GetColumn(n)), which takes the column itself, instead. 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 Major new features in this release

View File

@@ -623,9 +623,10 @@ public:
bool HasExtraStyle(int exFlag) const { return (m_exStyle & exFlag) != 0; } bool HasExtraStyle(int exFlag) const { return (m_exStyle & exFlag) != 0; }
#if WXWIN_COMPATIBILITY_2_8
// make the window modal (all other windows unresponsive) // 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 // (primitive) theming support
// --------------------------- // ---------------------------

View File

@@ -3172,17 +3172,6 @@ public:
*/ */
virtual bool IsTopLevel() const; 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 This virtual function is normally only used internally, but

View File

@@ -1916,6 +1916,7 @@ wxWindowBase::FindWindowById( long id, const wxWindow* parent )
// dialog oriented functions // dialog oriented functions
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
#if WXWIN_COMPATIBILITY_2_8
void wxWindowBase::MakeModal(bool modal) void wxWindowBase::MakeModal(bool modal)
{ {
// Disable all other windows // Disable all other windows
@@ -1932,6 +1933,7 @@ void wxWindowBase::MakeModal(bool modal)
} }
} }
} }
#endif // WXWIN_COMPATIBILITY_2_8
bool wxWindowBase::Validate() bool wxWindowBase::Validate()
{ {