projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
simplify code to return from the end of the function
[wxWidgets.git]
/
src
/
univ
/
topluniv.cpp
diff --git
a/src/univ/topluniv.cpp
b/src/univ/topluniv.cpp
index a93554e73d963905e3795cada4eda7f101fffd93..f6dbfa3c497631cbe862f171fdc1d8bf8856b098 100644
(file)
--- a/
src/univ/topluniv.cpp
+++ b/
src/univ/topluniv.cpp
@@
-113,8
+113,7
@@
bool wxTopLevelWindow::Create(wxWindow *parent,
styleOrig = style;
exstyleOrig = GetExtraStyle();
style &= ~(wxCAPTION | wxMINIMIZE_BOX | wxMAXIMIZE_BOX |
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);
}
style |= wxBORDER_NONE;
SetExtraStyle(exstyleOrig & ~wxWS_EX_CONTEXTHELP);
}
@@
-163,7
+162,7
@@
void wxTopLevelWindow::UseNativeDecorationsByDefault(bool native)
void wxTopLevelWindow::UseNativeDecorations(bool native)
{
void wxTopLevelWindow::UseNativeDecorations(bool native)
{
- wxASSERT_MSG( !m_windowStyle,
_
T("must be called before Create()") );
+ wxASSERT_MSG( !m_windowStyle,
wx
T("must be called before Create()") );
m_usingNativeDecorations = native;
}
m_usingNativeDecorations = native;
}
@@
-203,12
+202,12
@@
long wxTopLevelWindow::GetDecorationsStyle() const
}
if ( (m_windowStyle & (wxSIMPLE_BORDER | wxNO_BORDER)) == 0 )
style |= wxTOPLEVEL_BORDER;
}
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() )
style |= wxTOPLEVEL_MAXIMIZED;
style |= wxTOPLEVEL_RESIZEABLE;
if ( IsMaximized() )
style |= wxTOPLEVEL_MAXIMIZED;
- if ( GetIcon().Ok() )
+ if ( GetIcon().
Is
Ok() )
style |= wxTOPLEVEL_ICON;
if ( m_isActive )
style |= wxTOPLEVEL_ACTIVE;
style |= wxTOPLEVEL_ICON;
if ( m_isActive )
style |= wxTOPLEVEL_ACTIVE;
@@
-329,13
+328,13
@@
void wxTopLevelWindow::SetIcons(const wxIconBundle& icons)
wxSize size = m_renderer->GetFrameIconSize();
const wxIcon& icon = icons.GetIcon( size );
wxSize size = m_renderer->GetFrameIconSize();
const wxIcon& icon = icons.GetIcon( size );
- if ( !icon.Ok() || size.x == wxDefaultCoord )
+ if ( !icon.
Is
Ok() || size.x == wxDefaultCoord )
m_titlebarIcon = icon;
else
{
wxBitmap bmp1;
bmp1.CopyFromIcon(icon);
m_titlebarIcon = icon;
else
{
wxBitmap bmp1;
bmp1.CopyFromIcon(icon);
- if ( !bmp1.Ok() )
+ if ( !bmp1.
Is
Ok() )
m_titlebarIcon = wxNullIcon;
else if ( bmp1.GetWidth() == size.x && bmp1.GetHeight() == size.y )
m_titlebarIcon = icon;
m_titlebarIcon = wxNullIcon;
else if ( bmp1.GetWidth() == size.x && bmp1.GetHeight() == size.y )
m_titlebarIcon = icon;