Replaced Ok() occurrences with IsOk() throughout trunk.
Additionally renamed wxOSX' private wxNativePrinterDC::Ok() function to IsOk(). Didn't deprecate the various Ok() functions: given the amount of changes already introduced in 3.0 a trivial one like this seems more suitable for after 3.0. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67681 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -208,7 +208,7 @@ long wxTopLevelWindow::GetDecorationsStyle() const
|
||||
|
||||
if ( IsMaximized() )
|
||||
style |= wxTOPLEVEL_MAXIMIZED;
|
||||
if ( GetIcon().Ok() )
|
||||
if ( GetIcon().IsOk() )
|
||||
style |= wxTOPLEVEL_ICON;
|
||||
if ( m_isActive )
|
||||
style |= wxTOPLEVEL_ACTIVE;
|
||||
@@ -329,13 +329,13 @@ void wxTopLevelWindow::SetIcons(const wxIconBundle& icons)
|
||||
wxSize size = m_renderer->GetFrameIconSize();
|
||||
const wxIcon& icon = icons.GetIcon( size );
|
||||
|
||||
if ( !icon.Ok() || size.x == wxDefaultCoord )
|
||||
if ( !icon.IsOk() || size.x == wxDefaultCoord )
|
||||
m_titlebarIcon = icon;
|
||||
else
|
||||
{
|
||||
wxBitmap bmp1;
|
||||
bmp1.CopyFromIcon(icon);
|
||||
if ( !bmp1.Ok() )
|
||||
if ( !bmp1.IsOk() )
|
||||
m_titlebarIcon = wxNullIcon;
|
||||
else if ( bmp1.GetWidth() == size.x && bmp1.GetHeight() == size.y )
|
||||
m_titlebarIcon = icon;
|
||||
|
Reference in New Issue
Block a user