]> git.saurik.com Git - wxWidgets.git/commitdiff
correctly render titlebars for TLWs with wxCAPTION but without wxCLOSE_BOX
authorVáclav Slavík <vslavik@fastmail.fm>
Thu, 23 Nov 2006 14:50:42 +0000 (14:50 +0000)
committerVáclav Slavík <vslavik@fastmail.fm>
Thu, 23 Nov 2006 14:50:42 +0000 (14:50 +0000)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@43616 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

src/univ/topluniv.cpp

index fd967417a1af631c903329d7d7cab649dd1bc983..a93554e73d963905e3795cada4eda7f101fffd93 100644 (file)
@@ -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 )