use wxFSVolume instead of duplicating its functionality in the (MSW branch of) wxGetA...

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

diff --git a/src/cocoa/bitmap.mm b/src/cocoa/bitmap.mm
index 08e8d435fef3d8f3acd48059580cb7f63f112483..452a92cbeedf9564a0464c5f915f4fef049794ed 100644 (file)
--- a/src/cocoa/bitmap.mm
+++ b/src/cocoa/bitmap.mm
@@ -19,9 +19,9 @@
     #include "wx/palette.h"
     #include "wx/icon.h"
     #include "wx/colour.h"
     #include "wx/palette.h"
     #include "wx/icon.h"
     #include "wx/colour.h"

+    #include "wx/image.h"

 #endif //WX_PRECOMP
 
 #endif //WX_PRECOMP
 

-#include "wx/image.h"

 #include "wx/xpmdecod.h"
 #include "wx/rawbmp.h"
 
 #include "wx/xpmdecod.h"
 #include "wx/rawbmp.h"
 


@@ -33,6 +33,8 @@
 #import <AppKit/NSImage.h>
 #import <AppKit/NSColor.h>
 
 #import <AppKit/NSImage.h>
 #import <AppKit/NSColor.h>
 

+IMPLEMENT_ABSTRACT_CLASS(wxBitmapHandler, wxBitmapHandlerBase)
+

 // ========================================================================
 // wxBitmapRefData
 // ========================================================================
 // ========================================================================
 // wxBitmapRefData
 // ========================================================================


@@ -123,7 +125,7 @@ wxBitmap::wxBitmap(int w, int h, int d)
     (void)Create(w, h, d);
 }
 
     (void)Create(w, h, d);
 }
 

-wxBitmap::wxBitmap(void *data, wxBitmapType type, int width, int height, int depth)
+wxBitmap::wxBitmap(const void* data, wxBitmapType type, int width, int height, int depth)

 {
     (void) Create(data, type, width, height, depth);
 }
 {
     (void) Create(data, type, width, height, depth);
 }


@@ -242,7 +244,7 @@ void wxBitmap::SetMask(wxMask *mask)
     M_BITMAPDATA->m_bitmapMask = mask ;
 }
 
     M_BITMAPDATA->m_bitmapMask = mask ;
 }
 

-bool wxBitmap::Ok() const
+bool wxBitmap::IsOk() const

 {
     return m_refData && M_BITMAPDATA->m_ok;
 }
 {
     return m_refData && M_BITMAPDATA->m_ok;
 }


@@ -346,7 +348,7 @@ bool wxBitmap::LoadFile(const wxString& filename, wxBitmapType type)
     return true;
 }
 
     return true;
 }
 

-bool wxBitmap::Create(void *data, wxBitmapType type, int width, int height, int depth)
+bool wxBitmap::Create(const void* data, wxBitmapType type, int width, int height, int depth)

 {
     UnRef();
 
 {
     UnRef();
 


@@ -413,24 +415,6 @@ wxImage wxBitmap::ConvertToImage() const
     return newImage;
 }
 
     return newImage;
 }
 

-bool wxBitmap::CreateFromXpm(const char **xpm)
-{
-#if wxUSE_IMAGE && wxUSE_XPM
-    UnRef();
-
-    wxCHECK_MSG( xpm, false, wxT("invalid XPM data") );
-
-    wxXPMDecoder decoder;
-    wxImage img = decoder.ReadData(xpm);
-    wxCHECK_MSG( img.Ok(), false, wxT("invalid XPM data") );
-
-    *this = wxBitmap(img);
-    return true;
-#else
-    return false;
-#endif
-}
-

 bool wxBitmap::CreateFromImage(const wxImage& image, int depth)
 {
     UnRef();
 bool wxBitmap::CreateFromImage(const wxImage& image, int depth)
 {
     UnRef();