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

Merge branch 'msw-style-fixes'

Browse Source 
Minor simplifications related to handling of wxTLW styles in wxMSW.

No real changes.
This commit is contained in:
Vadim Zeitlin
2018-03-31 01:48:46 +02:00
parent 8d074e65a7 95ba7a3ef2
commit 882c425f42
2 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/msw/mdi.cpp
View File

@@ -876,7 +876,7 @@ bool wxMDIChildFrame::Create(wxMDIParentFrame *parent,
msflags |= WS_THICKFRAME; msflags |= WS_THICKFRAME;
if (style & wxSYSTEM_MENU) if (style & wxSYSTEM_MENU)
msflags |= WS_SYSMENU; msflags |= WS_SYSMENU;
if ((style & wxMINIMIZE) || (style & wxICONIZE)) if (style & wxMINIMIZE)
msflags |= WS_MINIMIZE; msflags |= WS_MINIMIZE;
if (style & wxMAXIMIZE) if (style & wxMAXIMIZE)
msflags |= WS_MAXIMIZE; msflags |= WS_MAXIMIZE;

20
src/msw/toplevel.cpp
View File

@@ -38,6 +38,7 @@
#endif //WX_PRECOMP #endif //WX_PRECOMP
#include "wx/dynlib.h" #include "wx/dynlib.h"
#include "wx/scopeguard.h"
#include "wx/tooltip.h" #include "wx/tooltip.h"
#include "wx/msw/private.h" #include "wx/msw/private.h"
@@ -420,8 +421,7 @@ bool wxTopLevelWindowMSW::Create(wxWindow *parent,
// non-TLW windows // non-TLW windows
wxTopLevelWindows.Append(this); wxTopLevelWindows.Append(this);
bool ret = CreateBase(parent, id, pos, sizeReal, style, name); if ( !CreateBase(parent, id, pos, sizeReal, style, name) )
if ( !ret )
return false; return false;
if ( parent ) if ( parent )
@@ -438,6 +438,8 @@ bool wxTopLevelWindowMSW::Create(wxWindow *parent,
// don't use DS_SETFONT we don't need the fourth WORD for the font) // don't use DS_SETFONT we don't need the fourth WORD for the font)
static const int dlgsize = sizeof(DLGTEMPLATE) + (sizeof(WORD) * 3); static const int dlgsize = sizeof(DLGTEMPLATE) + (sizeof(WORD) * 3);
DLGTEMPLATE *dlgTemplate = (DLGTEMPLATE *)malloc(dlgsize); DLGTEMPLATE *dlgTemplate = (DLGTEMPLATE *)malloc(dlgsize);
wxON_BLOCK_EXIT1(free, dlgTemplate);
memset(dlgTemplate, 0, dlgsize); memset(dlgTemplate, 0, dlgsize);
// these values are arbitrary, they won't be used normally anyhow // these values are arbitrary, they won't be used normally anyhow
@@ -469,15 +471,16 @@ bool wxTopLevelWindowMSW::Create(wxWindow *parent,
if ( style & (wxRESIZE_BORDER | wxCAPTION) ) if ( style & (wxRESIZE_BORDER | wxCAPTION) )
dlgTemplate->style |= DS_MODALFRAME; dlgTemplate->style |= DS_MODALFRAME;
ret = CreateDialog(dlgTemplate, title, pos, sizeReal); if ( !CreateDialog(dlgTemplate, title, pos, sizeReal) )
free(dlgTemplate); return false;
} }
else // !dialog else // !dialog
{ {
ret = CreateFrame(title, pos, sizeReal); if ( !CreateFrame(title, pos, sizeReal) )
return false;
} }
if ( ret && !(GetWindowStyleFlag() & wxCLOSE_BOX) ) if ( !(GetWindowStyleFlag() & wxCLOSE_BOX) )
{ {
EnableCloseButton(false); EnableCloseButton(false);
} }
@@ -486,12 +489,9 @@ bool wxTopLevelWindowMSW::Create(wxWindow *parent,
// itself but for custom windows we have to do it ourselves in order to // itself but for custom windows we have to do it ourselves in order to
// make the keyboard indicators (such as underlines for accelerators and // make the keyboard indicators (such as underlines for accelerators and
// focus rectangles) work under Win2k+ // focus rectangles) work under Win2k+
if ( ret )
{
MSWUpdateUIState(UIS_INITIALIZE); MSWUpdateUIState(UIS_INITIALIZE);
}
return ret; return true;
} }
wxTopLevelWindowMSW::~wxTopLevelWindowMSW() wxTopLevelWindowMSW::~wxTopLevelWindowMSW()