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:
@@ -712,10 +712,10 @@ void BitmapComboBoxWidgetsPage::LoadWidgetImages( wxArrayString* strings, wxImag
|
||||
#if wxUSE_IMAGE
|
||||
wxASSERT(fn.FileExists());
|
||||
wxImage image(fn.GetFullPath());
|
||||
wxASSERT(image.Ok());
|
||||
wxASSERT(image.IsOk());
|
||||
RescaleImage(image, foundSize.x, foundSize.y);
|
||||
wxBitmap bmp(image);
|
||||
wxASSERT( bmp.Ok() );
|
||||
wxASSERT( bmp.IsOk() );
|
||||
#else
|
||||
wxBitmap bmp(wxNullBitmap);
|
||||
#endif
|
||||
@@ -842,7 +842,7 @@ wxBitmap BitmapComboBoxWidgetsPage::LoadBitmap(const wxString& filepath)
|
||||
}
|
||||
|
||||
wxImage image(filepath);
|
||||
if ( image.Ok() )
|
||||
if ( image.IsOk() )
|
||||
{
|
||||
// Rescale very large images
|
||||
int ow = image.GetWidth();
|
||||
|
Reference in New Issue
Block a user