Fix wxWindowDisabler compilation in wxOSX

Remove the duplicated version of the code in wxOSX sources which wasn't
updated in the parent commit.
This commit is contained in:
Vadim Zeitlin
2020-11-16 23:04:26 +01:00
parent be570015bf
commit d67c7c485a
3 changed files with 14 additions and 68 deletions

View File

@@ -1507,12 +1507,6 @@ void wxEnableTopLevelWindows(bool enable)
node->GetData()->Enable(enable);
}
#if defined(__WXOSX__) && wxOSX_USE_COCOA
// defined in evtloop.mm
#else
wxWindowDisabler::wxWindowDisabler(bool disable)
{
m_disabled = disable;
@@ -1547,6 +1541,10 @@ void wxWindowDisabler::DoDisable(wxWindow *winToSkip)
m_winDisabled.push_back(winTop);
}
}
#if defined(__WXOSX__) && wxOSX_USE_COCOA
AfterDisable(winToSkip);
#endif
}
wxWindowDisabler::~wxWindowDisabler()
@@ -1554,6 +1552,10 @@ wxWindowDisabler::~wxWindowDisabler()
if ( !m_disabled )
return;
#if defined(__WXOSX__) && wxOSX_USE_COCOA
BeforeEnable();
#endif
wxWindowList::compatibility_iterator node;
for ( node = wxTopLevelWindows.GetFirst(); node; node = node->GetNext() )
{
@@ -1566,8 +1568,6 @@ wxWindowDisabler::~wxWindowDisabler()
}
}
#endif
// Yield to other apps/messages and disable user input to all windows except
// the given one
bool wxSafeYield(wxWindow *win, bool onlyIfNeeded)