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

applying slightly modified patch 1825163

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_8_BRANCH@49619 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor
2007-11-04 11:28:41 +00:00
parent 639db60ccb
commit cdc86e05a3
1 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/mac/carbon/app.cpp
View File

@@ -321,18 +321,24 @@ void wxApp::MacReopenApp()
else else
{ {
wxTopLevelWindow* firstIconized = NULL ; wxTopLevelWindow* firstIconized = NULL ;
wxTopLevelWindow* firstHidden = NULL ;
while (node) while (node)
{ {
wxTopLevelWindow* win = (wxTopLevelWindow*) node->GetData(); wxTopLevelWindow* win = (wxTopLevelWindow*) node->GetData();
if ( !win->IsIconized() ) if ( !win->IsShown() )
{ {
firstIconized = NULL ; if ( firstHidden == NULL /* && wxDynamicCast( win, wxFrame ) */ )
break ; firstHidden = win ;
}
else if ( win->IsIconized() )
{
if ( firstIconized == NULL )
firstIconized = win ;
} }
else else
{ {
if ( firstIconized == NULL ) // we do have a visible, non-iconized toplevelwindow -> do nothing
firstIconized = win ; return;
} }
node = node->GetNext(); node = node->GetNext();
@@ -340,6 +346,8 @@ void wxApp::MacReopenApp()
if ( firstIconized ) if ( firstIconized )
firstIconized->Iconize( false ) ; firstIconized->Iconize( false ) ;
else if ( firstHidden )
firstHidden->Show( true );
} }
} }