No changes, just remove duplicate flags checks in wxUniv wxTLW.
For some reason (rename of the old wxTHICK_FRAME to wxRESIZE_BORDER?) we tested for wxRESIZE_BORDER twice in a couple of places. Don't do it for clarity. Closes #14264. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71345 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -113,8 +113,7 @@ bool wxTopLevelWindow::Create(wxWindow *parent,
|
||||
styleOrig = style;
|
||||
exstyleOrig = GetExtraStyle();
|
||||
style &= ~(wxCAPTION | wxMINIMIZE_BOX | wxMAXIMIZE_BOX |
|
||||
wxSYSTEM_MENU | wxRESIZE_BORDER | wxFRAME_TOOL_WINDOW |
|
||||
wxRESIZE_BORDER);
|
||||
wxSYSTEM_MENU | wxFRAME_TOOL_WINDOW | wxRESIZE_BORDER);
|
||||
style |= wxBORDER_NONE;
|
||||
SetExtraStyle(exstyleOrig & ~wxWS_EX_CONTEXTHELP);
|
||||
}
|
||||
@@ -203,7 +202,7 @@ long wxTopLevelWindow::GetDecorationsStyle() const
|
||||
}
|
||||
if ( (m_windowStyle & (wxSIMPLE_BORDER | wxNO_BORDER)) == 0 )
|
||||
style |= wxTOPLEVEL_BORDER;
|
||||
if ( m_windowStyle & (wxRESIZE_BORDER | wxRESIZE_BORDER) )
|
||||
if ( m_windowStyle & wxRESIZE_BORDER )
|
||||
style |= wxTOPLEVEL_RESIZEABLE;
|
||||
|
||||
if ( IsMaximized() )
|
||||
|
Reference in New Issue
Block a user