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:
@@ -852,7 +852,7 @@ bool wxBitmapDataObject2::SetData(size_t WXUNUSED(len), const void *pBuf)
|
||||
wxBitmap bitmap(bmp.bmWidth, bmp.bmHeight, bmp.bmPlanes);
|
||||
bitmap.SetHBITMAP((WXHBITMAP)hbmp);
|
||||
|
||||
if ( !bitmap.Ok() ) {
|
||||
if ( !bitmap.IsOk() ) {
|
||||
wxFAIL_MSG(wxT("pasting/dropping invalid bitmap"));
|
||||
|
||||
return false;
|
||||
@@ -898,7 +898,7 @@ size_t wxBitmapDataObject::GetDataSize(const wxDataFormat& format) const
|
||||
bool wxBitmapDataObject::GetDataHere(const wxDataFormat& format,
|
||||
void *pBuf) const
|
||||
{
|
||||
wxASSERT_MSG( m_bitmap.Ok(), wxT("copying invalid bitmap") );
|
||||
wxASSERT_MSG( m_bitmap.IsOk(), wxT("copying invalid bitmap") );
|
||||
|
||||
HBITMAP hbmp = (HBITMAP)m_bitmap.GetHBITMAP();
|
||||
if ( format.GetFormatId() == CF_DIB )
|
||||
@@ -977,7 +977,7 @@ bool wxBitmapDataObject::SetData(const wxDataFormat& format,
|
||||
|
||||
m_bitmap.SetHBITMAP((WXHBITMAP)hbmp);
|
||||
|
||||
wxASSERT_MSG( m_bitmap.Ok(), wxT("pasting invalid bitmap") );
|
||||
wxASSERT_MSG( m_bitmap.IsOk(), wxT("pasting invalid bitmap") );
|
||||
|
||||
return true;
|
||||
}
|
||||
|
Reference in New Issue
Block a user