Add virtual ~wxAnyScrollHelperBase() to fix compiler warning.

[wxWidgets.git] / src / cocoa / bitmap.mm

diff --git a/src/cocoa/bitmap.mm b/src/cocoa/bitmap.mm
index 3ce0eee2a72cc079ae0d86470043f6fa0ec7ffc5..3ec4e42e8f799f2af1485f1629a09778a87610d6 100644 (file)
--- a/src/cocoa/bitmap.mm
+++ b/src/cocoa/bitmap.mm
@@ -4,7 +4,6 @@
 // Author:      David Elliott
 // Modified by:
 // Created:     2003/07/19
 // Author:      David Elliott
 // Modified by:
 // Created:     2003/07/19

-// RCS-ID:      $Id$

 // Copyright:   (c) 2003 David Elliott
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) 2003 David Elliott
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////


@@ -166,7 +165,7 @@ WX_NSBitmapImageRep wxBitmap::GetNSBitmapImageRep()
 
 WX_NSImage wxBitmap::GetNSImage(bool useMask) const
 {
 
 WX_NSImage wxBitmap::GetNSImage(bool useMask) const
 {

-    if(!Ok())
+    if(!IsOk())

         return nil;
     NSImage *nsimage = [[[NSImage alloc]
             initWithSize:NSMakeSize(GetWidth(), GetHeight())] autorelease];
         return nil;
     NSImage *nsimage = [[[NSImage alloc]
             initWithSize:NSMakeSize(GetWidth(), GetHeight())] autorelease];


@@ -351,7 +350,7 @@ bool wxBitmap::LoadFile(const wxString& filename, wxBitmapType type)
     wxImage image;
     if(!image.LoadFile(filename,type))
         return false;
     wxImage image;
     if(!image.LoadFile(filename,type))
         return false;

-    if(!image.Ok())
+    if(!image.IsOk())

         return false;
     *this = wxBitmap(image);
     return true;
         return false;
     *this = wxBitmap(image);
     return true;


@@ -428,7 +427,7 @@ bool wxBitmap::CopyFromIcon(const wxIcon& icon)
 wxBitmap wxBitmap::GetSubBitmap(const wxRect& rect) const
 {
     wxAutoNSAutoreleasePool pool;
 wxBitmap wxBitmap::GetSubBitmap(const wxRect& rect) const
 {
     wxAutoNSAutoreleasePool pool;

-    if(!Ok())
+    if(!IsOk())

         return wxNullBitmap;
     NSImage *nsimage = GetNSImage(false);
 
         return wxNullBitmap;
     NSImage *nsimage = GetNSImage(false);
 


@@ -450,7 +449,7 @@ wxBitmap wxBitmap::GetSubBitmap(const wxRect& rect) const
 wxImage wxBitmap::ConvertToImage() const
 {
     wxAutoNSAutoreleasePool pool;
 wxImage wxBitmap::ConvertToImage() const
 {
     wxAutoNSAutoreleasePool pool;

-    if(!Ok())
+    if(!IsOk())

         return /*wxImage(5,5)*/wxNullImage;
     NSImage *nsimage = GetNSImage(false /* don't use mask */);
     wxImage newImage(M_BITMAPDATA->m_width,M_BITMAPDATA->m_height);
         return /*wxImage(5,5)*/wxNullImage;
     NSImage *nsimage = GetNSImage(false /* don't use mask */);
     wxImage newImage(M_BITMAPDATA->m_width,M_BITMAPDATA->m_height);


@@ -476,7 +475,7 @@ bool wxBitmap::CreateFromImage(const wxImage& image, int depth)
     wxAutoNSAutoreleasePool pool;
     UnRef();
 
     wxAutoNSAutoreleasePool pool;
     UnRef();
 

-    wxCHECK_MSG(image.Ok(), false, wxT("invalid image"));
+    wxCHECK_MSG(image.IsOk(), false, wxT("invalid image"));

     wxCHECK_MSG(depth == -1 || depth == 1, false, wxT("invalid bitmap depth"));
 
     m_refData = new wxBitmapRefData();
     wxCHECK_MSG(depth == -1 || depth == 1, false, wxT("invalid bitmap depth"));
 
     m_refData = new wxBitmapRefData();


@@ -511,7 +510,7 @@ bool wxBitmap::CreateFromImage(const wxImage& image, int depth)
 
 void *wxBitmap::GetRawData(wxPixelDataBase& data, int bpp)
 {
 
 void *wxBitmap::GetRawData(wxPixelDataBase& data, int bpp)
 {

-    if(!Ok())
+    if(!IsOk())

         return NULL;
 
     NSBitmapImageRep *bitmapRep = M_BITMAPDATA->m_cocoaNSBitmapImageRep;
         return NULL;
 
     NSBitmapImageRep *bitmapRep = M_BITMAPDATA->m_cocoaNSBitmapImageRep;


@@ -657,7 +656,7 @@ static bool wxMask_CreateFromBitmapData(PixelData srcData, const wxColour& colou
 bool wxMask::Create(const wxBitmap& bitmap, const wxColour& colour)
 {
     wxAutoNSAutoreleasePool pool;
 bool wxMask::Create(const wxBitmap& bitmap, const wxColour& colour)
 {
     wxAutoNSAutoreleasePool pool;

-    if(!bitmap.Ok())
+    if(!bitmap.IsOk())

         return false;
     int bmpWidth = bitmap.GetWidth();
     int bmpHeight = bitmap.GetHeight();
         return false;
     int bmpWidth = bitmap.GetWidth();
     int bmpHeight = bitmap.GetHeight();