From: Václav Slavík Date: Thu, 23 Nov 2006 14:50:42 +0000 (+0000) Subject: correctly render titlebars for TLWs with wxCAPTION but without wxCLOSE_BOX X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/79d3dfac2fab5566dd0773e7226bee74fe989e15 correctly render titlebars for TLWs with wxCAPTION but without wxCLOSE_BOX git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@43616 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/src/univ/topluniv.cpp b/src/univ/topluniv.cpp index fd967417a1..a93554e73d 100644 --- a/src/univ/topluniv.cpp +++ b/src/univ/topluniv.cpp @@ -184,7 +184,9 @@ long wxTopLevelWindow::GetDecorationsStyle() const ms_canIconize = wxSystemSettings::HasFeature(wxSYS_CAN_ICONIZE_FRAME); } - style |= wxTOPLEVEL_TITLEBAR | wxTOPLEVEL_BUTTON_CLOSE; + style |= wxTOPLEVEL_TITLEBAR; + if ( m_windowStyle & wxCLOSE_BOX ) + style |= wxTOPLEVEL_BUTTON_CLOSE; if ( (m_windowStyle & wxMINIMIZE_BOX) && ms_canIconize ) style |= wxTOPLEVEL_BUTTON_ICONIZE; if ( m_windowStyle & wxMAXIMIZE_BOX )