Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

don't enable disabled windows when showing them (patch 1871879)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_8_BRANCH@51230 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2008-01-16 01:49:36 +00:00
parent 90b5819c2e
commit 0a585911c0
2 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
docs/changes.txt
View File

@@ -115,7 +115,7 @@ All (GUI):
All (Unix): All (Unix):
- Fixed shared libraries do not depend on GStreamer when built with - Fixed shared libraries to not depend on GStreamer when built with
--enable-media; only wxMedia library depends on it now. --enable-media; only wxMedia library depends on it now.
wxMSW: wxMSW:
@@ -123,6 +123,7 @@ wxMSW:
- Fix rare bug with messages delivered to wrong wxSocket (Tim Kosse). - Fix rare bug with messages delivered to wrong wxSocket (Tim Kosse).
- Fix setting icons when they have non-default (16*16 and 32*32) sizes. - Fix setting icons when they have non-default (16*16 and 32*32) sizes.
- Fixed wxLocale::GetInfo to use the C locale. - Fixed wxLocale::GetInfo to use the C locale.
- Don't enable disabled windows when showing them (Harry McKame).
wxGTK: wxGTK:

12
src/msw/toplevel.cpp
View File

@@ -674,10 +674,14 @@ bool wxTopLevelWindowMSW::Show(bool show)
} }
else // just show else // just show
{ {
if ( GetWindowStyle() & wxFRAME_TOOL_WINDOW ) // we shouldn't use SW_SHOW which also activates the window for
nShowCmd = SW_SHOWNA; // tool frames (as they shouldn't steal focus from the main window)
else // nor for the currently disabled windows as they would be enabled
nShowCmd = SW_SHOW; // as a side effect
if ( HasFlag(wxFRAME_TOOL_WINDOW) || !IsEnabled() )
nShowCmd = SW_SHOWNA;
else
nShowCmd = SW_SHOW;
} }
} }
else // hide else // hide