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

Slightly simplify wxTopLevelWindowMSW::Create()

Browse Source 
Don't use "ret" variable, we can avoid testing it if we just return
immediately in case of failure.
This commit is contained in:
Vadim Zeitlin
2018-03-28 17:30:38 +02:00
parent 41c4f4153c
commit 29a12aa846
1 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/msw/toplevel.cpp
View File

@@ -421,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 )
@@ -472,14 +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) )
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);
} }
@@ -488,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()