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

Replaced Ok() occurrences with IsOk() throughout trunk.

Browse Source 
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:
Dimitri Schoolwerth
2011-05-03 16:29:04 +00:00
parent ddd7e4307b
commit a1b806b982
322 changed files with 1261 additions and 1260 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/univ/button.cpp
View File

@@ -125,7 +125,7 @@ bool wxButton::Create(wxWindow *parent,
SetLabel(label);
if (bitmap.Ok())
if (bitmap.IsOk())
SetBitmap(bitmap); // SetInitialSize called by SetBitmap()
else
SetInitialSize(size);
@@ -170,7 +170,7 @@ wxSize wxButton::DoGetBestClientSize() const
wxCoord width, height;
dc.GetMultiLineTextExtent(GetLabel(), &width, &height);
if ( m_bitmap.Ok() )
if ( m_bitmap.IsOk() )
{
// allocate extra space for the bitmap
wxCoord heightBmp = m_bitmap.GetHeight() + 2*m_marginBmpY;
@@ -221,7 +221,7 @@ bool wxButton::DoDrawBackground(wxDC& dc)
rect.width = size.x;
rect.height = size.y;
if ( GetBackgroundBitmap().Ok() )
if ( GetBackgroundBitmap().IsOk() )
{
// get the bitmap and the flags
int alignment;

4
src/univ/checkbox.cpp
View File

@@ -116,7 +116,7 @@ void wxCheckBox::OnCheck()
wxBitmap wxCheckBox::GetBitmap(State state, Status status) const
{
wxBitmap bmp = m_bitmaps[state][status];
if ( !bmp.Ok() )
if ( !bmp.IsOk() )
bmp = m_bitmaps[State_Normal][status];
return bmp;
@@ -178,7 +178,7 @@ void wxCheckBox::DoDraw(wxControlRenderer *renderer)
wxSize wxCheckBox::GetBitmapSize() const
{
wxBitmap bmp = GetBitmap(State_Normal, Status_Checked);
return bmp.Ok() ? wxSize(bmp.GetWidth(), bmp.GetHeight())
return bmp.IsOk() ? wxSize(bmp.GetWidth(), bmp.GetHeight())
: GetRenderer()->GetCheckBitmapSize();
}

6
src/univ/ctrlrend.cpp
View File

@@ -95,10 +95,10 @@ void wxControlRenderer::DrawButtonLabel(const wxBitmap& bitmap,
m_dc.SetTextForeground(m_window->GetForegroundColour());
wxString label = m_window->GetLabel();
if ( !label.empty() || bitmap.Ok() )
if ( !label.empty() || bitmap.IsOk() )
{
wxRect rectLabel = m_rect;
if ( bitmap.Ok() )
if ( bitmap.IsOk() )
{
rectLabel.Inflate(-marginX, -marginY);
}
@@ -158,7 +158,7 @@ void wxControlRenderer::DrawBitmap(wxDC &dc,
{
// we may change the bitmap if we stretch it
wxBitmap bmp = bitmap;
if ( !bmp.Ok() )
if ( !bmp.IsOk() )
return;
int width = bmp.GetWidth(),

2
src/univ/menu.cpp
View File

@@ -602,7 +602,7 @@ void wxPopupMenuWindow::DoDraw(wxControlRenderer *renderer)
bmp = item->GetDisabledBitmap();
}
if ( !bmp.Ok() )
if ( !bmp.IsOk() )
{
// strangely enough, for unchecked item we use the
// "checked" bitmap because this is the default one - this

2
src/univ/radiobut.cpp
View File

@@ -148,7 +148,7 @@ void wxRadioButton::SendEvent()
wxSize wxRadioButton::GetBitmapSize() const
{
wxBitmap bmp = GetBitmap(State_Normal, Status_Checked);
return bmp.Ok() ? wxSize(bmp.GetWidth(), bmp.GetHeight())
return bmp.IsOk() ? wxSize(bmp.GetWidth(), bmp.GetHeight())
: GetRenderer()->GetRadioBitmapSize();
}

10
src/univ/stdrend.cpp
View File

@@ -169,7 +169,7 @@ void wxStdRenderer::DrawBackground(wxDC& dc,
{
wxColour colBg;
if (col.Ok())
if (col.IsOk())
{
colBg = col;
}
@@ -678,7 +678,7 @@ void wxStdRenderer::DrawCheckButton(wxDC& dc,
wxAlignment align,
int indexAccel)
{
if (bitmap.Ok())
if (bitmap.IsOk())
DrawCheckOrRadioButton(dc, label, bitmap, rect, flags, align, indexAccel);
else
DrawCheckOrRadioButton(dc, label, GetCheckBitmap(flags), rect, flags, align, indexAccel);
@@ -692,7 +692,7 @@ void wxStdRenderer::DrawRadioButton(wxDC& dc,
wxAlignment align,
int indexAccel)
{
if (bitmap.Ok())
if (bitmap.IsOk())
DrawCheckOrRadioButton(dc, label, bitmap, rect, flags, align, indexAccel);
else
DrawCheckOrRadioButton(dc, label, GetRadioBitmap(flags), rect, flags, align, indexAccel);
@@ -1148,7 +1148,7 @@ void wxStdRenderer::DrawFrameIcon(wxDC& dc,
const wxIcon& icon,
int flags)
{
if ( icon.Ok() )
if ( icon.IsOk() )
{
wxRect r = GetFrameClientArea(rect, flags & ~wxTOPLEVEL_TITLEBAR);
dc.DrawIcon(icon, r.x, r.y);
@@ -1174,7 +1174,7 @@ void wxStdRenderer::DrawFrameButton(wxDC& dc,
}
wxBitmap bmp = GetFrameButtonBitmap(idx);
if ( !bmp.Ok() )
if ( !bmp.IsOk() )
return;
wxRect rectBtn(x, y, FRAME_BUTTON_WIDTH, FRAME_BUTTON_HEIGHT);

32
src/univ/themes/gtk.cpp
View File

@@ -646,7 +646,7 @@ wxColour wxGTKColourScheme::GetBackground(wxWindow *win) const
if ( !win->ShouldInheritColours() )
{
// doesn't depend on the state
if ( !col.Ok() )
if ( !col.IsOk() )
{
col = Get(WINDOW);
}
@@ -657,7 +657,7 @@ wxColour wxGTKColourScheme::GetBackground(wxWindow *win) const
// the colour set by the user should be used for the normal state
// and for the states for which we don't have any specific colours
if ( !col.Ok() || (flags != 0) )
if ( !col.IsOk() || (flags != 0) )
{
#if wxUSE_SCROLLBAR
if ( wxDynamicCast(win, wxScrollBar) )
@@ -1069,7 +1069,7 @@ void wxGTKRenderer::DrawDownZag(wxDC& dc,
wxBitmap wxGTKRenderer::GetCheckBitmap(int flags)
{
if ( !m_bitmapsCheckbox[0][0].Ok() )
if ( !m_bitmapsCheckbox[0][0].IsOk() )
{
// init the bitmaps once only
wxRect rect;
@@ -1126,7 +1126,7 @@ wxBitmap wxGTKRenderer::GetRadioBitmap(int flags)
GetIndicatorsFromFlags(flags, state, status);
wxBitmap& bmp = m_bitmapsRadiobtn[state][status];
if ( !bmp.Ok() )
if ( !bmp.IsOk() )
{
const wxSize size = GetRadioBitmapSize();
@@ -1142,7 +1142,7 @@ wxBitmap wxGTKRenderer::GetRadioBitmap(int flags)
wxBitmap wxGTKRenderer::GetLineWrapBitmap() const
{
if ( !m_bmpLineWrap.Ok() )
if ( !m_bmpLineWrap.IsOk() )
{
// the line wrap bitmap as used by GTK+
#define line_wrap_width 6
@@ -1153,7 +1153,7 @@ wxBitmap wxGTKRenderer::GetLineWrapBitmap() const
};
wxBitmap bmpLineWrap(line_wrap_bits, line_wrap_width, line_wrap_height);
if ( !bmpLineWrap.Ok() )
if ( !bmpLineWrap.IsOk() )
{
wxFAIL_MSG( wxT("Failed to create line wrap XBM") );
}
@@ -1176,7 +1176,7 @@ void wxGTKRenderer::DrawToolBarButton(wxDC& dc,
int tbarStyle)
{
// we don't draw the separators at all
if ( !label.empty() || bitmap.Ok() )
if ( !label.empty() || bitmap.IsOk() )
{
wxRect rect = rectOrig;
rect.Deflate(BORDER_THICKNESS);
@@ -1260,7 +1260,7 @@ void wxGTKRenderer::DrawLineWrapMark(wxDC& dc, const wxRect& rect)
dc.DrawBitmap(bmpLineWrap,
rect.x, rect.y + (rect.height - bmpLineWrap.GetHeight())/2);
if ( colFgOld.Ok() )
if ( colFgOld.IsOk() )
{
// restore old colour
dc.SetTextForeground(colFgOld);
@@ -1677,12 +1677,12 @@ void wxGTKRenderer::DoDrawMenuItem(wxDC& dc,
if ( geometryInfo )
{
wxBitmap bmp = bitmap;
if ( !bmp.Ok() && (flags & wxCONTROL_CHECKABLE) )
if ( !bmp.IsOk() && (flags & wxCONTROL_CHECKABLE) )
{
bmp = GetCheckBitmap(flags);
}
if ( bmp.Ok() )
if ( bmp.IsOk() )
{
rect.SetRight(geometryInfo->GetLabelOffset());
wxControlRenderer::DrawBitmap(dc, bmp, rect);
@@ -1796,7 +1796,7 @@ wxMenuGeometryInfo *wxGTKRenderer::GetMenuGeometry(wxWindow *win,
}
const wxBitmap& bmp = item->GetBitmap();
if ( bmp.Ok() )
if ( bmp.IsOk() )
{
wxCoord widthBmp = bmp.GetWidth();
if ( widthBmp > widthBmpMax )
@@ -1878,7 +1878,7 @@ void wxGTKRenderer::GetComboBitmaps(wxBitmap *bmpNormal,
wxBitmap *bmpPressed,
wxBitmap *bmpDisabled)
{
if ( !m_bitmapsCombo[ComboState_Normal].Ok() )
if ( !m_bitmapsCombo[ComboState_Normal].IsOk() )
{
InitComboBitmaps();
}
@@ -2097,7 +2097,7 @@ void wxGTKRenderer::DrawArrow(wxDC& dc,
case wxUP:
dc.DrawLine(ptArrow[Point_Second], ptArrow[Point_First]);
dc.DrawPoint(ptArrow[Point_First]);
if ( penShadow[3].Ok() )
if ( penShadow[3].IsOk() )
{
dc.SetPen(penShadow[3]);
dc.DrawLine(ptArrow[Point_First].x + 1, ptArrow[Point_First].y,
@@ -2109,7 +2109,7 @@ void wxGTKRenderer::DrawArrow(wxDC& dc,
dc.DrawPoint(ptArrow[Point_Third]);
dc.DrawLine(ptArrow[Point_Third].x - 2, ptArrow[Point_Third].y,
ptArrow[Point_First].x + 1, ptArrow[Point_First].y);
if ( penShadow[2].Ok() )
if ( penShadow[2].IsOk() )
{
dc.SetPen(penShadow[2]);
dc.DrawLine(ptArrow[Point_Third].x - 1, ptArrow[Point_Third].y,
@@ -2123,7 +2123,7 @@ void wxGTKRenderer::DrawArrow(wxDC& dc,
dc.DrawLine(ptArrow[Point_First], ptArrow[Point_Second]);
dc.DrawLine(ptArrow[Point_First].x + 2, ptArrow[Point_First].y,
ptArrow[Point_Third].x - 1, ptArrow[Point_Third].y);
if ( penShadow[2].Ok() )
if ( penShadow[2].IsOk() )
{
dc.SetPen(penShadow[2]);
dc.DrawLine(ptArrow[Point_Second].x, ptArrow[Point_Second].y - 1,
@@ -2137,7 +2137,7 @@ void wxGTKRenderer::DrawArrow(wxDC& dc,
case wxLEFT:
dc.DrawLine(ptArrow[Point_Second], ptArrow[Point_First]);
dc.DrawPoint(ptArrow[Point_First]);
if ( penShadow[2].Ok() )
if ( penShadow[2].IsOk() )
{
dc.SetPen(penShadow[2]);
dc.DrawLine(ptArrow[Point_Third].x - 1, ptArrow[Point_Third].y,

8
src/univ/themes/mono.cpp
View File

@@ -585,7 +585,7 @@ wxColour wxMonoColourScheme::GetBackground(wxWindow *win) const
}
// doesn't depend on the state
if ( !col.Ok() )
if ( !col.IsOk() )
{
col = GetBg();
}
@@ -770,7 +770,7 @@ wxBitmap wxMonoRenderer::GetIndicator(IndicatorType indType, int flags)
GetIndicatorsFromFlags(flags, indState, indStatus);
wxBitmap& bmp = m_bmpIndicators[indType][indState][indStatus];
if ( !bmp.Ok() )
if ( !bmp.IsOk() )
{
const char **xpm = ms_xpmIndicators[indType][indState][indStatus];
if ( xpm )
@@ -787,7 +787,7 @@ wxBitmap wxMonoRenderer::GetFrameButtonBitmap(FrameButtonType type)
{
if ( type == FrameButton_Close )
{
if ( !m_bmpFrameClose.Ok() )
if ( !m_bmpFrameClose.IsOk() )
{
static const char *xpmFrameClose[] = {
/* columns rows colors chars-per-pixel */
@@ -1045,7 +1045,7 @@ void wxMonoRenderer::DrawArrow(wxDC& dc,
wxCHECK_RET( arrowDir != Arrow_Max, wxT("invalid arrow direction") );
wxBitmap& bmp = m_bmpArrows[arrowDir];
if ( !bmp.Ok() )
if ( !bmp.IsOk() )
{
bmp = wxBitmap(ms_xpmArrows[arrowDir]);
}

20
src/univ/themes/win32.cpp
View File

@@ -1253,7 +1253,7 @@ wxColour wxWin32ColourScheme::GetBackground(wxWindow *win) const
col = Get(CONTROL);
else
{
if ( !col.Ok() )
if ( !col.IsOk() )
{
// doesn't depend on the state
col = Get(WINDOW);
@@ -1262,7 +1262,7 @@ wxColour wxWin32ColourScheme::GetBackground(wxWindow *win) const
}
#endif // wxUSE_TEXTCTRL
if (!col.Ok())
if (!col.IsOk())
col = Get(CONTROL); // Most controls should be this colour, not WINDOW
}
else
@@ -1271,7 +1271,7 @@ wxColour wxWin32ColourScheme::GetBackground(wxWindow *win) const
// the colour set by the user should be used for the normal state
// and for the states for which we don't have any specific colours
if ( !col.Ok() || (flags & wxCONTROL_PRESSED) != 0 )
if ( !col.IsOk() || (flags & wxCONTROL_PRESSED) != 0 )
{
#if wxUSE_SCROLLBAR
if ( wxDynamicCast(win, wxScrollBar) )
@@ -1681,7 +1681,7 @@ void wxWin32Renderer::DrawCheckItemBitmap(wxDC& dc,
int flags)
{
wxBitmap bmp;
if ( bitmap.Ok() )
if ( bitmap.IsOk() )
{
bmp = bitmap;
}
@@ -1691,7 +1691,7 @@ void wxWin32Renderer::DrawCheckItemBitmap(wxDC& dc,
? IndicatorStatus_Checked
: IndicatorStatus_Unchecked;
if ( !m_bmpCheckBitmaps[i].Ok() )
if ( !m_bmpCheckBitmaps[i].IsOk() )
{
m_bmpCheckBitmaps[i] = wxBitmap(ms_xpmChecked[i]);
}
@@ -1714,7 +1714,7 @@ wxBitmap wxWin32Renderer::GetIndicator(IndicatorType indType, int flags)
GetIndicatorsFromFlags(flags, indState, indStatus);
wxBitmap& bmp = m_bmpIndicators[indType][indState][indStatus];
if ( !bmp.Ok() )
if ( !bmp.IsOk() )
{
const char **xpm = ms_xpmIndicators[indType][indState][indStatus];
if ( xpm )
@@ -2442,12 +2442,12 @@ void wxWin32Renderer::DrawMenuItem(wxDC& dc,
// draw the bitmap: use the bitmap provided or the standard checkmark for
// the checkable items
wxBitmap bmp = bitmap;
if ( !bmp.Ok() && (flags & wxCONTROL_CHECKED) )
if ( !bmp.IsOk() && (flags & wxCONTROL_CHECKED) )
{
bmp = GetIndicator(IndicatorType_Menu, flags);
}
if ( bmp.Ok() )
if ( bmp.IsOk() )
{
rect.SetRight(geometryInfo.GetLabelOffset());
wxControlRenderer::DrawBitmap(dc, bmp, rect);
@@ -2557,7 +2557,7 @@ wxMenuGeometryInfo *wxWin32Renderer::GetMenuGeometry(wxWindow *win,
}
const wxBitmap& bmp = item->GetBitmap();
if ( bmp.Ok() )
if ( bmp.IsOk() )
{
wxCoord widthBmp = bmp.GetWidth();
if ( widthBmp > widthBmpMax )
@@ -3205,7 +3205,7 @@ void wxWin32Renderer::AdjustSize(wxSize *size, const wxWindow *window)
wxBitmap wxWin32Renderer::GetFrameButtonBitmap(FrameButtonType type)
{
wxBitmap& bmp = m_bmpFrameButtons[type];
if ( !bmp.Ok() )
if ( !bmp.IsOk() )
{
bmp = wxBitmap(ms_xpmFrameButtons[type]);
}

2
src/univ/toolbar.cpp
View File

@@ -292,7 +292,7 @@ void wxToolBar::DoEnableTool(wxToolBarToolBase *tool, bool enable)
{
#if wxUSE_IMAGE
// created disabled-state bitmap on demand
if ( !enable && !tool->GetDisabledBitmap().Ok() )
if ( !enable && !tool->GetDisabledBitmap().IsOk() )
{
wxImage image(tool->GetNormalBitmap().ConvertToImage());

6
src/univ/topluniv.cpp
View File

@@ -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;

4
src/univ/winuniv.cpp
View File

@@ -258,7 +258,7 @@ void wxWindow::SetBackground(const wxBitmap& bitmap,
const wxBitmap& wxWindow::GetBackgroundBitmap(int *alignment,
wxStretch *stretch) const
{
if ( m_bitmapBg.Ok() )
if ( m_bitmapBg.IsOk() )
{
if ( alignment )
*alignment = m_alignBgBitmap;
@@ -408,7 +408,7 @@ bool wxWindow::DoDrawBackground(wxDC& dc)
void wxWindow::EraseBackground(wxDC& dc, const wxRect& rect)
{
if ( GetBackgroundBitmap().Ok() )
if ( GetBackgroundBitmap().IsOk() )
{
// Get the bitmap and the flags
int alignment;