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

2
src/os2/accel.cpp
View File

@@ -199,7 +199,7 @@ bool wxAcceleratorTable::Translate( WXHWND hWnd,
,GetHaccel()
,pMsg
);
return (Ok() && rc);
return (IsOk() && rc);
} // end of wxAcceleratorTable::Translate
// ---------------------------------------------------------------------------

28
src/os2/bitmap.cpp
View File

@@ -142,7 +142,7 @@ bool wxBitmap::CopyFromCursor(
{
UnRef();
if (!rCursor.Ok())
if (!rCursor.IsOk())
return(false);
return(CopyFromIconOrCursor(rCursor));
} // end of wxBitmap::CopyFromCursor
@@ -153,7 +153,7 @@ bool wxBitmap::CopyFromIcon(
{
UnRef();
if (!rIcon.Ok())
if (!rIcon.IsOk())
return(false);
return CopyFromIconOrCursor(rIcon);
@@ -379,7 +379,7 @@ bool wxBitmap::Create(
}
SetHBITMAP((WXHBITMAP)hBmp);
return Ok();
return IsOk();
} // end of wxBitmap::Create
bool wxBitmap::LoadFile(const wxString& filename, wxBitmapType type)
@@ -398,7 +398,7 @@ bool wxBitmap::LoadFile(const wxString& filename, wxBitmapType type)
else // no bitmap handler found
{
wxImage image;
if ( image.LoadFile( filename, type ) && image.Ok() )
if ( image.LoadFile( filename, type ) && image.IsOk() )
{
*this = wxBitmap(image);
@@ -493,7 +493,7 @@ bool wxBitmap::SaveFile(
// FIXME what about palette? shouldn't we use it?
wxImage vImage = ConvertToImage();
if (!vImage.Ok())
if (!vImage.IsOk())
return false;
return(vImage.SaveFile( rFilename
@@ -512,7 +512,7 @@ bool wxBitmap::CreateFromImage (
, int nDepth
)
{
wxCHECK_MSG(rImage.Ok(), false, wxT("invalid image"));
wxCHECK_MSG(rImage.IsOk(), false, wxT("invalid image"));
m_refData = new wxBitmapRefData();
int nSizeLimit = 1024 * 768 * 3;
@@ -549,7 +549,7 @@ bool wxBitmap::CreateFromImage (
//
// Set bitmap parameters
//
wxCHECK_MSG(rImage.Ok(), false, wxT("invalid image"));
wxCHECK_MSG(rImage.IsOk(), false, wxT("invalid image"));
SetWidth(nWidth);
SetHeight(nBmpHeight);
if (nDepth == 1)
@@ -624,7 +624,7 @@ bool wxBitmap::CreateFromImage (
);
#if wxUSE_PALETTE
HPAL hOldPalette = NULLHANDLE;
if (rImage.GetPalette().Ok())
if (rImage.GetPalette().IsOk())
{
hOldPalette = ::GpiSelectPalette(hPS, (HPAL)rImage.GetPalette().GetHPALETTE());
}
@@ -840,7 +840,7 @@ wxImage wxBitmap::ConvertToImage() const
wxImage vImage;
wxDC* pDC;
wxCHECK_MSG( Ok(), wxNullImage, wxT("invalid bitmap") );
wxCHECK_MSG( IsOk(), wxNullImage, wxT("invalid bitmap") );
//
// Create an wxImage object
@@ -1072,7 +1072,7 @@ wxBitmap wxBitmap::GetSubBitmap(
const wxRect& rRect
) const
{
wxCHECK_MSG( Ok() &&
wxCHECK_MSG( IsOk() &&
(rRect.x >= 0) && (rRect.y >= 0) &&
(rRect.x + rRect.width <= GetWidth()) &&
(rRect.y + rRect.height <= GetHeight()),
@@ -1082,7 +1082,7 @@ wxBitmap wxBitmap::GetSubBitmap(
,rRect.height
,GetDepth()
);
wxASSERT_MSG( vRet.Ok(), wxT("GetSubBitmap error") );
wxASSERT_MSG( vRet.IsOk(), wxT("GetSubBitmap error") );
//
@@ -1268,7 +1268,7 @@ bool wxMask::Create(
::GpiDeleteBitmap((HBITMAP) m_hMaskBitmap);
m_hMaskBitmap = 0;
}
if (!rBitmap.Ok() || rBitmap.GetDepth() != 1)
if (!rBitmap.IsOk() || rBitmap.GetDepth() != 1)
{
return false;
}
@@ -1316,7 +1316,7 @@ bool wxMask::Create(
::GpiDeleteBitmap((HBITMAP) m_hMaskBitmap);
m_hMaskBitmap = 0;
}
if (rBitmap.Ok() && rBitmap.GetPalette()->Ok())
if (rBitmap.IsOk() && rBitmap.GetPalette()->IsOk())
{
unsigned char cRed;
unsigned char cGreen;
@@ -1366,7 +1366,7 @@ bool wxMask::Create(
::GpiDeleteBitmap((HBITMAP) m_hMaskBitmap);
m_hMaskBitmap = 0;
}
if (!rBitmap.Ok())
if (!rBitmap.IsOk())
{
return false;
}

12
src/os2/brush.cpp
View File

@@ -215,7 +215,7 @@ bool wxBrush::RealizeResource()
break;
case wxSTIPPLE:
if (M_BRUSHDATA->m_vStipple.Ok())
if (M_BRUSHDATA->m_vStipple.IsOk())
{
::GpiSetBitmapId( M_BRUSHDATA->m_hBrush
,(USHORT)M_BRUSHDATA->m_vStipple.GetHBITMAP()
@@ -266,35 +266,35 @@ bool wxBrush::RealizeResource()
wxColour wxBrush::GetColour() const
{
wxCHECK_MSG( Ok(), wxNullColour, wxT("invalid brush") );
wxCHECK_MSG( IsOk(), wxNullColour, wxT("invalid brush") );
return M_BRUSHDATA->m_vColour;
}
wxBrushStyle wxBrush::GetStyle() const
{
wxCHECK_MSG( Ok(), wxBRUSHSTYLE_INVALID, wxT("invalid brush") );
wxCHECK_MSG( IsOk(), wxBRUSHSTYLE_INVALID, wxT("invalid brush") );
return M_BRUSHDATA->m_nStyle;
}
wxBitmap *wxBrush::GetStipple() const
{
wxCHECK_MSG( Ok(), NULL, wxT("invalid brush") );
wxCHECK_MSG( IsOk(), NULL, wxT("invalid brush") );
return &(M_BRUSHDATA->m_vStipple);
}
int wxBrush::GetPS() const
{
wxCHECK_MSG( Ok(), 0, wxT("invalid brush") );
wxCHECK_MSG( IsOk(), 0, wxT("invalid brush") );
return M_BRUSHDATA->m_hBrush;
}
WXHANDLE wxBrush::GetResourceHandle() const
{
wxCHECK_MSG( Ok(), 0, wxT("invalid brush") );
wxCHECK_MSG( IsOk(), 0, wxT("invalid brush") );
return (WXHANDLE)M_BRUSHDATA->m_hBrush;
} // end of wxBrush::GetResourceHandle

2
src/os2/cursor.cpp
View File

@@ -302,7 +302,7 @@ void wxSetCursor(const wxCursor& cursor)
{
extern wxCursor *g_globalCursor;
if ( cursor.Ok() && cursor.GetHCURSOR() )
if ( cursor.IsOk() && cursor.GetHCURSOR() )
{
// ::SetCursor((HCURSOR) cursor.GetHCURSOR());

4
src/os2/dataobj.cpp
View File

@@ -329,12 +329,12 @@ bool wxBitmapDataObject::SetData( size_t nSize, const void* pBuf)
m_bitmap = wxBitmap(vImage);
#endif //wxUSE_STREAMS
return m_bitmap.Ok();
return m_bitmap.IsOk();
}
void wxBitmapDataObject::DoConvertToPng()
{
if (!m_bitmap.Ok())
if (!m_bitmap.IsOk())
return;
#if wxUSE_STREAMS

56
src/os2/dc.cpp
View File

@@ -386,7 +386,7 @@ void wxPMDCImpl::SelectOldObjects(
if (m_hOldBitmap)
{
::GpiSetBitmap(hPS, (HBITMAP) m_hOldBitmap);
if (m_vSelectedBitmap.Ok())
if (m_vSelectedBitmap.IsOk())
{
m_vSelectedBitmap.SetSelectedInto(NULL);
}
@@ -644,7 +644,7 @@ void wxPMDCImpl::DoDrawLine(
}
else
{
if (m_vSelectedBitmap.Ok())
if (m_vSelectedBitmap.IsOk())
{
m_vRclPaint.yTop = m_vSelectedBitmap.GetHeight();
m_vRclPaint.xRight = m_vSelectedBitmap.GetWidth();
@@ -656,7 +656,7 @@ void wxPMDCImpl::DoDrawLine(
vPoint[0].y = vY1;
vPoint[1].x = vX2;
vPoint[1].y = vY2;
if (m_pen.Ok())
if (m_pen.IsOk())
{
vColor = m_pen.GetColour().GetPixel();
}
@@ -822,7 +822,7 @@ void wxPMDCImpl::DoDrawPoint(
POINTL vPoint;
COLORREF vColor = 0x00ffffff;
if (m_pen.Ok())
if (m_pen.IsOk())
{
vColor = m_pen.GetColour().GetPixel();
}
@@ -974,7 +974,7 @@ void wxPMDCImpl::DoDrawRectangle(
vY = OS2Y(vY,vHeight);
else
{
if (m_vSelectedBitmap.Ok())
if (m_vSelectedBitmap.IsOk())
{
m_vRclPaint.yTop = m_vSelectedBitmap.GetHeight();
m_vRclPaint.xRight = m_vSelectedBitmap.GetWidth();
@@ -1064,7 +1064,7 @@ void wxPMDCImpl::DoDrawRoundedRectangle(
vY = OS2Y(vY,vHeight);
else
{
if (m_vSelectedBitmap.Ok())
if (m_vSelectedBitmap.IsOk())
{
m_vRclPaint.yTop = m_vSelectedBitmap.GetHeight();
m_vRclPaint.xRight = m_vSelectedBitmap.GetWidth();
@@ -1359,7 +1359,7 @@ void wxPMDCImpl::DoDrawBitmap(
lColor = pWindowDC->m_pCanvas->GetBackgroundColour().GetPixel();
}
else if (GetBrush().Ok())
else if (GetBrush().IsOk())
lColor = GetBrush().GetColour().GetPixel();
else
lColor = m_textBackgroundColour.GetPixel();
@@ -1526,13 +1526,13 @@ void wxPMDCImpl::DoDrawBitmap(
ULONG lOldForeGround = ::GpiQueryColor((HPS)GetHPS());
ULONG lOldBackGround = ::GpiQueryBackColor((HPS)GetHPS());
if (m_textForegroundColour.Ok())
if (m_textForegroundColour.IsOk())
{
::GpiSetColor( (HPS)GetHPS()
,m_textForegroundColour.GetPixel()
);
}
if (m_textBackgroundColour.Ok())
if (m_textBackgroundColour.IsOk())
{
::GpiSetBackColor( (HPS)GetHPS()
,m_textBackgroundColour.GetPixel()
@@ -1703,14 +1703,14 @@ void wxPMDCImpl::DrawAnyText( const wxString& rsText,
//
// Set text color attributes
//
if (m_textForegroundColour.Ok())
if (m_textForegroundColour.IsOk())
{
SetTextColor( m_hPS
,(int)m_textForegroundColour.GetPixel()
);
}
if (m_textBackgroundColour.Ok())
if (m_textBackgroundColour.IsOk())
{
nOldBackground = SetTextBkColor( m_hPS
,(int)m_textBackgroundColour.GetPixel()
@@ -1733,7 +1733,7 @@ void wxPMDCImpl::DrawAnyText( const wxString& rsText,
}
else
{
if (m_vSelectedBitmap.Ok())
if (m_vSelectedBitmap.IsOk())
{
m_vRclPaint.yTop = m_vSelectedBitmap.GetHeight();
m_vRclPaint.xRight = m_vSelectedBitmap.GetWidth();
@@ -1758,7 +1758,7 @@ void wxPMDCImpl::DrawAnyText( const wxString& rsText,
// it never is set to anything else, but background should remain
// transparent even if we just drew an opaque string)
//
if (m_textBackgroundColour.Ok())
if (m_textBackgroundColour.IsOk())
SetTextBkColor( m_hPS
,nOldBackground
);
@@ -1849,7 +1849,7 @@ void wxPMDCImpl::DoSelectPalette( bool WXUNUSED(bRealize) )
m_hOldPalette = 0;
}
if (m_palette.Ok())
if (m_palette.IsOk())
{
HPALETTE hOldPal;
@@ -1891,7 +1891,7 @@ void wxPMDCImpl::SetPalette(
m_hOldFont = 0;
}
m_palette = rPalette;
if (!rPalette.Ok())
if (!rPalette.IsOk())
{
if (m_hOldFont)
{
@@ -1916,14 +1916,14 @@ void wxPMDCImpl::SetFont(
m_hOldFont = 0;
}
m_font = rFont;
if (!rFont.Ok())
if (!rFont.IsOk())
{
m_hOldFont = 0;
}
m_font.SetPS(m_hPS); // this will realize the font
if (m_font.Ok())
if (m_font.IsOk())
{
HFONT hFont = m_font.GetResourceHandle();
if (hFont == (HFONT) NULL)
@@ -1942,14 +1942,14 @@ void wxPMDCImpl::SetPen(
if (m_pen == rPen)
return;
m_pen = rPen;
if (!m_pen.Ok())
if (!m_pen.IsOk())
return;
if (m_hOldPen)
m_hOldPen = 0L;
m_pen = rPen;
if (!m_pen.Ok())
if (!m_pen.IsOk())
{
if (m_hOldPen)
{
@@ -1958,7 +1958,7 @@ void wxPMDCImpl::SetPen(
m_hOldPen = 0L;
}
if (m_pen.Ok())
if (m_pen.IsOk())
{
if (m_pen.GetResourceHandle())
{
@@ -1977,14 +1977,14 @@ void wxPMDCImpl::SetBrush(
if (m_hOldBrush)
m_hOldBrush = 0L;
m_brush = rBrush;
if (!m_brush.Ok())
if (!m_brush.IsOk())
if (m_brush == rBrush)
return;
if (!m_brush.Ok())
if (!m_brush.IsOk())
if (m_hOldBrush)
m_hOldBrush = 0L;
if (!m_brush.Ok())
if (!m_brush.IsOk())
{
if (m_hOldBrush)
{
@@ -1993,7 +1993,7 @@ void wxPMDCImpl::SetBrush(
m_hOldBrush = 0L;
}
if (m_brush.Ok())
if (m_brush.IsOk())
{
if (m_brush.GetResourceHandle())
{
@@ -2008,7 +2008,7 @@ void wxPMDCImpl::SetBackground(const wxBrush& rBrush)
{
m_backgroundBrush = rBrush;
if (m_backgroundBrush.Ok())
if (m_backgroundBrush.IsOk())
{
(void)::GpiSetBackColor((HPS)m_hPS, m_backgroundBrush.GetColour().GetPixel());
}
@@ -2383,7 +2383,7 @@ bool wxPMDCImpl::DoBlit( wxCoord vXdest,
const wxBitmap& rBmp = pm_impl->GetSelectedBitmap();
pMask = rBmp.GetMask();
if (!(rBmp.Ok() && pMask && pMask->GetMaskBitmap()))
if (!(rBmp.IsOk() && pMask && pMask->GetMaskBitmap()))
{
bUseMask = false;
}
@@ -2396,7 +2396,7 @@ bool wxPMDCImpl::DoBlit( wxCoord vXdest,
);
vOldTextColor = (COLORREF)vCbnd.lColor;
if (m_textForegroundColour.Ok())
if (m_textForegroundColour.IsOk())
{
vCbnd.lColor = (LONG)m_textForegroundColour.GetPixel();
::GpiSetAttrs( m_hPS // presentation-space handle
@@ -2406,7 +2406,7 @@ bool wxPMDCImpl::DoBlit( wxCoord vXdest,
,&vCbnd // buffer for attributes.
);
}
if (m_textBackgroundColour.Ok())
if (m_textBackgroundColour.IsOk())
{
::GpiSetBackColor(m_hPS, (LONG)m_textBackgroundColour.GetPixel());
}

4
src/os2/dcmemory.cpp
View File

@@ -139,7 +139,7 @@ void wxMemoryDCImpl::DoSelect(
if (m_hOldBitmap)
{
::GpiSetBitmap(m_hPS, NULLHANDLE);
if (m_vSelectedBitmap.Ok())
if (m_vSelectedBitmap.IsOk())
{
m_vSelectedBitmap.SetSelectedInto(NULL);
m_vSelectedBitmap = wxNullBitmap;
@@ -201,7 +201,7 @@ void wxMemoryDCImpl::DoGetSize(
, int* pHeight
) const
{
if (!m_vSelectedBitmap.Ok())
if (!m_vSelectedBitmap.IsOk())
{
*pWidth = 0;
*pHeight = 0;

2
src/os2/dcprint.cpp
View File

@@ -261,7 +261,7 @@ void wxPrinterDCImpl::DoDrawBitmap( const wxBitmap& rBmp,
wxCoord WXUNUSED(vY),
bool WXUNUSED(bUseMask))
{
wxCHECK_RET( rBmp.Ok(), wxT("invalid bitmap in wxPrinterDC::DrawBitmap") );
wxCHECK_RET( rBmp.IsOk(), wxT("invalid bitmap in wxPrinterDC::DrawBitmap") );
// int nWidth = rBmp.GetWidth();
// int nHeight = rBmp.GetHeight();

2
src/os2/dnd.cpp
View File

@@ -499,7 +499,7 @@ bool wxDropSource::GiveFeedback (
{
const wxCursor& rCursor = GetCursor(eEffect);
if (rCursor.Ok())
if (rCursor.IsOk())
{
::WinSetPointer(HWND_DESKTOP, (HPOINTER)rCursor.GetHCURSOR());
m_vDragImage.hImage = (LHANDLE)rCursor.GetHCURSOR();

12
src/os2/font.cpp
View File

@@ -1075,7 +1075,7 @@ void wxFont::DoSetNativeFontInfo(
int wxFont::GetPointSize() const
{
wxCHECK_MSG( Ok(), 0, wxT("invalid font") );
wxCHECK_MSG( IsOk(), 0, wxT("invalid font") );
return M_FONTDATA->GetPointSize();
} // end of wxFont::GetPointSize
@@ -1087,35 +1087,35 @@ wxFontFamily wxFont::DoGetFamily() const
wxFontStyle wxFont::GetStyle() const
{
wxCHECK_MSG( Ok(), wxFONTSTYLE_MAX, wxT("invalid font") );
wxCHECK_MSG( IsOk(), wxFONTSTYLE_MAX, wxT("invalid font") );
return M_FONTDATA->GetStyle();
} // end of wxFont::GetStyle
wxFontWeight wxFont::GetWeight() const
{
wxCHECK_MSG( Ok(), wxFONTWEIGHT_MAX, wxT("invalid font") );
wxCHECK_MSG( IsOk(), wxFONTWEIGHT_MAX, wxT("invalid font") );
return M_FONTDATA->GetWeight();
}
bool wxFont::GetUnderlined() const
{
wxCHECK_MSG( Ok(), false, wxT("invalid font") );
wxCHECK_MSG( IsOk(), false, wxT("invalid font") );
return M_FONTDATA->GetUnderlined();
} // end of wxFont::GetUnderlined
wxString wxFont::GetFaceName() const
{
wxCHECK_MSG( Ok(), wxEmptyString, wxT("invalid font") );
wxCHECK_MSG( IsOk(), wxEmptyString, wxT("invalid font") );
return M_FONTDATA->GetFaceName();
} // end of wxFont::GetFaceName
wxFontEncoding wxFont::GetEncoding() const
{
wxCHECK_MSG( Ok(), wxFONTENCODING_DEFAULT, wxT("invalid font") );
wxCHECK_MSG( IsOk(), wxFONTENCODING_DEFAULT, wxT("invalid font") );
return M_FONTDATA->GetEncoding();
} // end of wxFont::GetEncoding

4
src/os2/frame.cpp
View File

@@ -852,7 +852,7 @@ bool wxFrame::HandlePaint()
const wxIcon& vIcon = GetIcon();
HPOINTER hIcon;
if (vIcon.Ok())
if (vIcon.IsOk())
hIcon = (HPOINTER)::WinSendMsg(m_hFrame, WM_QUERYICON, 0L, 0L);
else
hIcon = (HPOINTER)m_hDefaultIcon;
@@ -1302,7 +1302,7 @@ MRESULT wxFrame::OS2WindowProc( WXUINT uMessage,
const wxIcon& vIcon = GetIcon();
HPOINTER hIcon;
if (vIcon.Ok())
if (vIcon.IsOk())
hIcon = (HPOINTER)::WinSendMsg(GetHWND(), WM_QUERYICON, 0L, 0L);
else
hIcon = (HPOINTER)m_hDefaultIcon;

6
src/os2/gdiimage.cpp
View File

@@ -376,7 +376,7 @@ bool wxBMPResourceHandler::LoadFile( wxBitmap* pBitmap,
wxBitmapRefData* pData = pBitmap->GetBitmapData();
if ( pBitmap->Ok() )
if ( pBitmap->IsOk() )
{
BITMAPINFOHEADER vBmph;
@@ -385,7 +385,7 @@ bool wxBMPResourceHandler::LoadFile( wxBitmap* pBitmap,
pData->m_nHeight = vBmph.cy;
pData->m_nDepth = vBmph.cBitCount;
}
return(pBitmap->Ok());
return(pBitmap->IsOk());
} // end of wxBMPResourceHandler::LoadFile
bool wxBMPFileHandler::LoadFile( wxBitmap* pBitmap,
@@ -477,5 +477,5 @@ bool wxICOResourceHandler::LoadIcon( wxIcon* pIcon,
pIcon->SetHICON((WXHICON)hIcon);
return pIcon->Ok();
return pIcon->IsOk();
} // end of wxICOResourceHandler::LoadIcon

6
src/os2/menuitem.cpp
View File

@@ -489,7 +489,7 @@ bool wxMenuItem::OnMeasureItem( size_t* pWidth, size_t* pHeight )
// resize the space so the BMP will fit. Without this, BMPs
// must be no larger or smaller than 16x16.
//
if (m_bmpChecked.Ok())
if (m_bmpChecked.IsOk())
{
//
// Is BMP height larger than text height?
@@ -695,7 +695,7 @@ bool wxMenuItem::OnDrawItem( wxDC& rDC,
// Draw the bitmap
// ---------------
//
if (IsCheckable() && !m_bmpChecked.Ok())
if (IsCheckable() && !m_bmpChecked.IsOk())
{
if (eStatus & wxODChecked)
{
@@ -724,7 +724,7 @@ bool wxMenuItem::OnDrawItem( wxDC& rDC,
//
wxBitmap vBmp(GetBitmap(IsCheckable() ? ((eStatus & wxODChecked) != 0) : TRUE));
if (vBmp.Ok())
if (vBmp.IsOk())
{
wxMemoryDC vDCMem(&rDC);

20
src/os2/pen.cpp
View File

@@ -490,49 +490,49 @@ void wxPen::SetCap(
wxColour wxPen::GetColour() const
{
wxCHECK_MSG( Ok(), wxNullColour, wxT("invalid pen") );
wxCHECK_MSG( IsOk(), wxNullColour, wxT("invalid pen") );
return M_PENDATA->m_vColour;
}
int wxPen::GetWidth() const
{
wxCHECK_MSG( Ok(), -1, wxT("invalid pen") );
wxCHECK_MSG( IsOk(), -1, wxT("invalid pen") );
return M_PENDATA->m_nWidth;
}
wxPenStyle wxPen::GetStyle() const
{
wxCHECK_MSG( Ok(), wxPENSTYLE_INVALID, wxT("invalid pen") );
wxCHECK_MSG( IsOk(), wxPENSTYLE_INVALID, wxT("invalid pen") );
return M_PENDATA->m_nStyle;
}
wxPenJoin wxPen::GetJoin() const
{
wxCHECK_MSG( Ok(), wxJOIN_INVALID, wxT("invalid pen") );
wxCHECK_MSG( IsOk(), wxJOIN_INVALID, wxT("invalid pen") );
return M_PENDATA->m_nJoin;
}
wxPenCap wxPen::GetCap() const
{
wxCHECK_MSG( Ok(), wxCAP_INVALID, wxT("invalid pen") );
wxCHECK_MSG( IsOk(), wxCAP_INVALID, wxT("invalid pen") );
return M_PENDATA->m_nCap;
}
int wxPen::GetPS() const
{
wxCHECK_MSG( Ok(), 0, wxT("invalid pen") );
wxCHECK_MSG( IsOk(), 0, wxT("invalid pen") );
return M_PENDATA->m_hPen;
}
int wxPen::GetDashes(wxDash** ptr) const
{
wxCHECK_MSG( Ok(), -1, wxT("invalid pen") );
wxCHECK_MSG( IsOk(), -1, wxT("invalid pen") );
*ptr = M_PENDATA->m_dash;
return M_PENDATA->m_nbDash;
@@ -540,21 +540,21 @@ int wxPen::GetDashes(wxDash** ptr) const
wxDash* wxPen::GetDash() const
{
wxCHECK_MSG( Ok(), NULL, wxT("invalid pen") );
wxCHECK_MSG( IsOk(), NULL, wxT("invalid pen") );
return M_PENDATA->m_dash;
}
int wxPen::GetDashCount() const
{
wxCHECK_MSG( Ok(), -1, wxT("invalid pen") );
wxCHECK_MSG( IsOk(), -1, wxT("invalid pen") );
return M_PENDATA->m_nbDash;
}
wxBitmap* wxPen::GetStipple() const
{
wxCHECK_MSG( Ok(), NULL, wxT("invalid pen") );
wxCHECK_MSG( IsOk(), NULL, wxT("invalid pen") );
return &(M_PENDATA->m_vStipple);
}

2
src/os2/slider.cpp
View File

@@ -368,7 +368,7 @@ bool wxSlider::Create(
,NULL // no control data
,NULL // no Presentation parameters
);
if (GetFont().Ok())
if (GetFont().IsOk())
{
if (GetFont().GetResourceHandle())
{

2
src/os2/statbmp.cpp
View File

@@ -134,7 +134,7 @@ bool wxStaticBitmap::Create( wxWindow* pParent,
bool wxStaticBitmap::ImageIsOk() const
{
return(m_pImage && m_pImage->Ok());
return(m_pImage && m_pImage->IsOk());
}
void wxStaticBitmap::Free()

6
src/os2/toolbar.cpp
View File

@@ -821,7 +821,7 @@ void wxToolBar::DrawTool( wxDC& rDc, wxToolBarToolBase* pToolBase )
PrepareDC(rDc);
if (!vBitmap.Ok())
if (!vBitmap.IsOk())
return;
if ((pMask = vBitmap.GetMask()) != NULL)
if (pMask->GetMaskBitmap() != NULLHANDLE)
@@ -835,7 +835,7 @@ void wxToolBar::DrawTool( wxDC& rDc, wxToolBarToolBase* pToolBase )
wxColour vColor(wxT("GREY"));
rDc.SetTextForeground(vColor);
if (!pTool->GetDisabledBitmap().Ok())
if (!pTool->GetDisabledBitmap().IsOk())
pTool->SetDisabledBitmap(wxDisableBitmap( vBitmap
,(long)GetBackgroundColour().GetPixel()
));
@@ -894,7 +894,7 @@ void wxToolBar::DrawTool( wxDC& rDc, wxToolBarToolBase* pToolBase )
LowerTool(pTool);
rDc.SetTextForeground(vColor);
if (!pTool->GetDisabledBitmap().Ok())
if (!pTool->GetDisabledBitmap().IsOk())
pTool->SetDisabledBitmap(wxDisableBitmap( vBitmap
,(long)GetBackgroundColour().GetPixel()
));

2
src/os2/toplevel.cpp
View File

@@ -1015,7 +1015,7 @@ void wxTopLevelWindowOS2::SetIcons(
const wxIcon& vIcon = rIcons.GetIconOfExactSize(32);
if (vIcon.Ok())
if (vIcon.IsOk())
{
::WinSendMsg( m_hFrame
,WM_SETICON

2
src/os2/utilsgui.cpp
View File

@@ -859,7 +859,7 @@ wxBitmap wxDisableBitmap(
::GpiSetBitmap(hPS, NULLHANDLE);
::GpiDestroyPS(hPS);
::DevCloseDC(hDC);
if (vNewBmp.Ok())
if (vNewBmp.IsOk())
return(vNewBmp);
return(wxNullBitmap);
} // end of wxDisableBitmap

2
src/os2/window.cpp
View File

@@ -571,7 +571,7 @@ bool wxWindowOS2::SetCursor( const wxCursor& rCursor)
return false;
}
if ( m_cursor.Ok() ) {
if ( m_cursor.IsOk() ) {
HWND hWnd = GetHwnd();
POINTL vPoint;
RECTL vRect;