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

wrapped up Show() calls to prevent gtk bug from manifesting

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@40389 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Benjamin Williams
2006-07-31 06:54:49 +00:00
parent f0f1afb8b9
commit 26178b5d2a
1 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/aui/framemanager.cpp
View File

@@ -876,7 +876,9 @@ bool wxFrameManager::DetachPane(wxWindow* window)
// reduce flicker // reduce flicker
p.window->SetSize(1,1); p.window->SetSize(1,1);
p.frame->Show(false);
if (p.frame->IsShown())
p.frame->Show(false);
// reparent to m_frame and destroy the pane // reparent to m_frame and destroy the pane
p.window->Reparent(m_frame); p.window->Reparent(m_frame);
@@ -1945,7 +1947,9 @@ void wxFrameManager::Update()
// reduce flicker // reduce flicker
p.window->SetSize(1,1); p.window->SetSize(1,1);
p.frame->Show(false);
if (p.frame->IsShown())
p.frame->Show(false);
// reparent to m_frame and destroy the pane // reparent to m_frame and destroy the pane
p.window->Reparent(m_frame); p.window->Reparent(m_frame);
@@ -1987,10 +1991,8 @@ void wxFrameManager::Update()
frame->SetPaneWindow(p); frame->SetPaneWindow(p);
p.frame = frame; p.frame = frame;
if (p.IsShown()) if (p.IsShown() && !frame->IsShown())
{
frame->Show(); frame->Show();
}
} }
else else
{ {
@@ -2010,7 +2012,8 @@ void wxFrameManager::Update()
} }
else else
{ {
p.window->Show(p.IsShown()); if (p.window->IsShown() != p.IsShown())
p.window->Show(p.IsShown());
} }
// if "active panes" are no longer allowed, clear // if "active panes" are no longer allowed, clear
@@ -2724,7 +2727,8 @@ void wxFrameManager::HideHint()
// hides a transparent window hint, if there is one // hides a transparent window hint, if there is one
if (m_hint_wnd) if (m_hint_wnd)
{ {
m_hint_wnd->Show(false); if (m_hint_wnd->IsShown())
m_hint_wnd->Show(false);
#if wxCHECK_VERSION(2,7,0) #if wxCHECK_VERSION(2,7,0)
m_hint_wnd->SetTransparent(0); m_hint_wnd->SetTransparent(0);
#else #else
@@ -2980,7 +2984,8 @@ void wxFrameManager::OnFloatingPaneClosed(wxWindow* wnd, wxCloseEvent& evt)
{ {
// reparent the pane window back to us and // reparent the pane window back to us and
// prepare the frame window for destruction // prepare the frame window for destruction
pane.window->Show(false); if (pane.window->IsShown())
pane.window->Show(false);
pane.window->Reparent(m_frame); pane.window->Reparent(m_frame);
pane.frame = NULL; pane.frame = NULL;
pane.Hide(); pane.Hide();