1. a couple of compilation warnings fixed (strconv/listctrl)
2. now reenable windows disabled by wxWindowDisabler slightly earlier: this solves the problem with "wrong" window being brought to top and eliminates the need for BringWindowToTop() and SetActiveWindow() in our code 3. style wxFRAME_FLOAT_ON_PARENT is now obsolete and unused, all frames have WS_EX_APPWINDOW style and appear on the taskbar git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@8487 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -1071,17 +1071,6 @@ void wxEnableTopLevelWindows(bool enable)
|
||||
|
||||
wxWindowDisabler::wxWindowDisabler(wxWindow *winToSkip)
|
||||
{
|
||||
#ifdef __WXMSW__
|
||||
#ifdef __WIN32__
|
||||
// and the top level window too
|
||||
HWND hwndFG = ::GetForegroundWindow();
|
||||
m_winTop = hwndFG ? wxFindWinFromHandle((WXHWND)hwndFG) : (wxWindow *)NULL;
|
||||
#else
|
||||
HWND hwndFG = ::GetTopWindow(0);
|
||||
m_winTop = hwndFG ? wxFindWinFromHandle((WXHWND)hwndFG) : (wxWindow *)NULL;
|
||||
#endif
|
||||
#endif // MSW
|
||||
|
||||
// remember the top level windows which were already disabled, so that we
|
||||
// don't reenable them later
|
||||
m_winDisabled = NULL;
|
||||
@@ -1123,29 +1112,6 @@ wxWindowDisabler::~wxWindowDisabler()
|
||||
}
|
||||
|
||||
delete m_winDisabled;
|
||||
|
||||
#ifdef __WXMSW__
|
||||
#ifdef __WIN32__
|
||||
if ( m_winTop )
|
||||
{
|
||||
if ( !::SetForegroundWindow(GetHwndOf(m_winTop)) )
|
||||
{
|
||||
wxLogLastError(wxT("SetForegroundWindow"));
|
||||
}
|
||||
}
|
||||
#else
|
||||
if ( m_winTop )
|
||||
{
|
||||
// 16-bit SetForegroundWindow() replacement
|
||||
RECT reWin;
|
||||
GetWindowRect((HWND) m_winTop, &reWin);
|
||||
SetWindowPos ((HWND) m_winTop, HWND_TOP,
|
||||
reWin.left, reWin.top,
|
||||
reWin.right - reWin.left, reWin.bottom,
|
||||
SWP_SHOWWINDOW);
|
||||
}
|
||||
#endif
|
||||
#endif // MSW
|
||||
}
|
||||
|
||||
// Yield to other apps/messages and disable user input to all windows except
|
||||
|
Reference in New Issue
Block a user