don't enable disabled windows when showing them (patch 1871879)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@51230 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -321,11 +321,15 @@ All (GUI):
|
||||
- Added wxWindow::GetNextSibling() and GetPrevSibling()
|
||||
- Improve wximage::ResampleBox() (Mihai Ciocarlie)
|
||||
- Implemented ScrollList() in generic wxListCtrl (Tim Kosse)
|
||||
- Fixed wxXmlResource::GetText() to convert data to current locale's
|
||||
charset in ANSI build.
|
||||
|
||||
wxMSW:
|
||||
|
||||
- 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
|
||||
- Fixed wxLocale::GetInfo to use the C locale.
|
||||
- Don't enable disabled windows when showing them (Harry McKame).
|
||||
|
||||
wxGTK:
|
||||
|
||||
|
@@ -660,10 +660,14 @@ bool wxTopLevelWindowMSW::Show(bool show)
|
||||
}
|
||||
else // just show
|
||||
{
|
||||
if ( GetWindowStyle() & wxFRAME_TOOL_WINDOW )
|
||||
nShowCmd = SW_SHOWNA;
|
||||
else
|
||||
nShowCmd = SW_SHOW;
|
||||
// we shouldn't use SW_SHOW which also activates the window for
|
||||
// tool frames (as they shouldn't steal focus from the main window)
|
||||
// nor for the currently disabled windows as they would be enabled
|
||||
// as a side effect
|
||||
if ( HasFlag(wxFRAME_TOOL_WINDOW) || !IsEnabled() )
|
||||
nShowCmd = SW_SHOWNA;
|
||||
else
|
||||
nShowCmd = SW_SHOW;
|
||||
}
|
||||
}
|
||||
else // hide
|
||||
|
Reference in New Issue
Block a user