fix for shown TLW having m_isShown == false, #9909
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@56986 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -335,9 +335,7 @@ gtk_frame_map_callback( GtkWidget*,
|
|||||||
wxTopLevelWindow *win )
|
wxTopLevelWindow *win )
|
||||||
{
|
{
|
||||||
const bool wasIconized = win->IsIconized();
|
const bool wasIconized = win->IsIconized();
|
||||||
|
|
||||||
win->SetIconizeState(false);
|
win->SetIconizeState(false);
|
||||||
|
|
||||||
if (wasIconized)
|
if (wasIconized)
|
||||||
{
|
{
|
||||||
// Because GetClientSize() returns (0,0) when IsIconized() is true,
|
// Because GetClientSize() returns (0,0) when IsIconized() is true,
|
||||||
@@ -349,7 +347,13 @@ gtk_frame_map_callback( GtkWidget*,
|
|||||||
win->m_oldClientWidth = 0;
|
win->m_oldClientWidth = 0;
|
||||||
gtk_widget_queue_resize(win->m_wxwindow);
|
gtk_widget_queue_resize(win->m_wxwindow);
|
||||||
}
|
}
|
||||||
|
// it is possible for m_isShown to be false here, see bug #9909
|
||||||
|
if (win->wxWindowBase::Show(true))
|
||||||
|
{
|
||||||
|
wxShowEvent eventShow(win->GetId(), true);
|
||||||
|
eventShow.SetEventObject(win);
|
||||||
|
win->GetEventHandler()->ProcessEvent(eventShow);
|
||||||
|
}
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user