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

changed wxSystemSettings::HasFrameDecorations to more general GetCapability(index)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@12222 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2001-10-30 23:30:04 +00:00
parent 6296744f45
commit 253293c103
17 changed files with 125 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/univ/topluniv.cpp
View File

@@ -55,6 +55,7 @@ WX_FORWARD_TO_INPUT_CONSUMER(wxTopLevelWindow)
// ============================================================================
int wxTopLevelWindow::ms_drawDecorations = -1;
int wxTopLevelWindow::ms_canIconize = -1;
void wxTopLevelWindow::Init()
{
@@ -76,10 +77,18 @@ bool wxTopLevelWindow::Create(wxWindow *parent,
exstyleOrig = 0;
if ( ms_drawDecorations == -1 )
ms_drawDecorations = !wxSystemSettings::HasFrameDecorations() ||
wxGetEnv(wxT("WXDECOR"), NULL);
{
ms_drawDecorations =
!wxSystemSettings::GetCapability(wxSYS_CAN_DRAW_FRAME_DECORATIONS)
|| wxGetEnv(wxT("WXDECOR"), NULL);
// FIXME -- wxUniv should provide a way to force non-native decorations!
// $WXDECOR is just a hack in absence of better wxUniv solution
}
if ( ms_canIconize == -1 )
{
ms_canIconize = wxSystemSettings::GetCapability(wxSYS_CAN_ICONIZE_FRAME);
}
if ( ms_drawDecorations )
{
@@ -138,7 +147,7 @@ long wxTopLevelWindow::GetDecorationsStyle() const
if ( m_windowStyle & wxCAPTION )
{
style |= wxTOPLEVEL_TITLEBAR | wxTOPLEVEL_BUTTON_CLOSE;
if ( m_windowStyle & wxMINIMIZE_BOX )
if ( (m_windowStyle & wxMINIMIZE_BOX) && ms_canIconize )
style |= wxTOPLEVEL_BUTTON_ICONIZE;
if ( m_windowStyle & wxMAXIMIZE_BOX )
{