From: Vadim Zeitlin Date: Wed, 12 Oct 2011 18:08:13 +0000 (+0000) Subject: Compilation fix after a bad merge. X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/8938c6ca912d5e699a3093820b47ac60359959c8?hp=612515aff12d2a36f993767954eaa370a545af51 Compilation fix after a bad merge. Fix bad merge artefact in the previous commit. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69391 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/src/gtk/toplevel.cpp b/src/gtk/toplevel.cpp index 4a8bd7c5d8..4d73a656d9 100644 --- a/src/gtk/toplevel.cpp +++ b/src/gtk/toplevel.cpp @@ -329,8 +329,8 @@ void wxTopLevelWindowGTK::GTKHandleRealized() if (icons.GetIconCount()) SetIcons(icons); - if (win->HasFlag(wxFRAME_SHAPED)) - win->SetShape(win->m_shape); // it will really set the window shape now + if (HasFlag(wxFRAME_SHAPED)) + SetShape(win->m_shape); // it will really set the window shape now } //-----------------------------------------------------------------------------