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

delay setting the window shape until it is realized (slightly modified patch 1935497)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@53059 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2008-04-06 16:14:49 +00:00
parent f1223c8d55
commit 87e024f7d5
3 changed files with 20 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/gtk/toplevel.cpp
View File

@@ -324,6 +324,9 @@ gtk_frame_realized_callback( GtkWidget * WXUNUSED(widget),
win->SetIcon( wxNullIcon );
win->SetIcons( iconsOld );
}
if (win->HasFlag(wxFRAME_SHAPED))
win->SetShape(win->m_shape); // it will really set the window shape now
}
}
@@ -1164,13 +1167,22 @@ bool wxTopLevelWindowGTK::SetShape(const wxRegion& region)
wxCHECK_MSG( HasFlag(wxFRAME_SHAPED), false,
_T("Shaped windows must be created with the wxFRAME_SHAPED style."));
GdkWindow *window = NULL;
if (m_wxwindow)
if ( GTK_WIDGET_REALIZED(m_widget) )
{
do_shape_combine_region(m_wxwindow->window, region);
if ( m_wxwindow )
do_shape_combine_region(m_wxwindow->window, region);
return do_shape_combine_region(m_widget->window, region);
}
else // not realized yet
{
// store the shape to set, it will be really set once we're realized
m_shape = region;
// we don't know if we're going to succeed or fail, be optimistic by
// default
return true;
}
window = m_widget->window;
return do_shape_combine_region(window, region);
}
bool wxTopLevelWindowGTK::IsActive()