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
if (icons.GetIconCount())
SetIcons(icons);
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
}
//-----------------------------------------------------------------------------
}
//-----------------------------------------------------------------------------