handle NULL BSTRs as empty ones per Microsoft convention

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

diff --git a/src/cocoa/bitmap.mm b/src/cocoa/bitmap.mm
index 6152fa12e8abcdbd8f6b5cad5080ff7e4aa6b306..cddc8c192f545a6c9c5e6903a1262b300e74c5ae 100644 (file)
--- a/src/cocoa/bitmap.mm
+++ b/src/cocoa/bitmap.mm
@@ -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,17 @@ 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(NSImage* cocoaNSImage)
+{
+    (void) Create(cocoaNSImage);
+}
+
+wxBitmap::wxBitmap(NSBitmapImageRep* cocoaNSBitmapImageRep)
+{
+    (void) Create(cocoaNSBitmapImageRep);
+}
+
+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 +254,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 +358,34 @@ 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(NSImage* cocoaNSImage)
+{
+    wxAutoNSAutoreleasePool pool;
+    NSBitmapImageRep *bitmapImageRep = [NSBitmapImageRep imageRepWithData:[cocoaNSImage TIFFRepresentation]];
+    return Create(bitmapImageRep);
+}
+
+bool wxBitmap::Create(NSBitmapImageRep *imageRep)
+{
+    UnRef();
+    m_refData = new wxBitmapRefData;
+    if(imageRep != nil)
+    {
+        M_BITMAPDATA->m_width = [imageRep pixelsWide];
+        M_BITMAPDATA->m_height = [imageRep pixelsHigh];
+        M_BITMAPDATA->m_depth = [imageRep bitsPerPixel];
+        M_BITMAPDATA->m_ok = true;
+        M_BITMAPDATA->m_numColors = 0;
+        M_BITMAPDATA->m_quality = 0;
+        M_BITMAPDATA->m_cocoaNSBitmapImageRep = [imageRep retain];
+        M_BITMAPDATA->m_bitmapMask = NULL;
+        return true;
+    }
+    else
+        return false;
+}
+
+bool wxBitmap::Create(const void* data, wxBitmapType type, int width, int height, int depth)

 {
     UnRef();
 
 {
     UnRef();
 


@@ -362,6 +401,9 @@ bool wxBitmap::SaveFile(const wxString& filename, wxBitmapType type, const wxPal
 
 bool wxBitmap::CopyFromIcon(const wxIcon& icon)
 {
 
 bool wxBitmap::CopyFromIcon(const wxIcon& icon)
 {

+    // Pool here due to lack of one during wx init phase
+    wxAutoNSAutoreleasePool pool;
+

     UnRef();
     if(!icon.GetNSImage());
     [icon.GetNSImage() lockFocus];
     UnRef();
     if(!icon.GetNSImage());
     [icon.GetNSImage() lockFocus];


@@ -413,24 +455,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();


@@ -499,10 +523,6 @@ void wxBitmap::UngetRawData(wxPixelDataBase& data)
 {   // TODO
 }
 
 {   // TODO
 }
 

-void wxBitmap::UseAlpha()
-{   // TODO
-}
-

 // ========================================================================
 // wxMask
 // ========================================================================
 // ========================================================================
 // wxMask
 // ========================================================================


@@ -539,6 +559,13 @@ wxMask::wxMask(const wxBitmap& bitmap)
     Create(bitmap);
 }
 
     Create(bitmap);
 }
 

+// Copy constructor
+wxMask::wxMask(const wxMask& src)
+:   wxObject(src)
+,   m_cocoaNSBitmapImageRep([src.m_cocoaNSBitmapImageRep retain])
+{
+}
+

 wxMask::~wxMask()
 {
     [m_cocoaNSBitmapImageRep release];
 wxMask::~wxMask()
 {
     [m_cocoaNSBitmapImageRep release];


@@ -548,6 +575,7 @@ wxMask::~wxMask()
 bool wxMask::Create(const wxBitmap& bitmap)
 {
 // TODO
 bool wxMask::Create(const wxBitmap& bitmap)
 {
 // TODO

+    wxLogDebug(wxT("Cannot yet create a mask from a mono bitmap"));

     return FALSE;
 }
 
     return FALSE;
 }
 


@@ -556,6 +584,7 @@ bool wxMask::Create(const wxBitmap& bitmap)
 bool wxMask::Create(const wxBitmap& bitmap, int paletteIndex)
 {
 // TODO
 bool wxMask::Create(const wxBitmap& bitmap, int paletteIndex)
 {
 // TODO

+    wxLogDebug(wxT("Cannot yet create a mask from a palette bitmap"));

     return FALSE;
 }
 
     return FALSE;
 }
 


@@ -662,6 +691,14 @@ bool wxMask::Create(const wxBitmap& bitmap, const wxColour& colour)
         wxCHECK_MSG(wxMask_CreateFromBitmapData(pixelData, colour, dstData),
             false, wxT("Unable to access raw data"));
     }
         wxCHECK_MSG(wxMask_CreateFromBitmapData(pixelData, colour, dstData),
             false, wxT("Unable to access raw data"));
     }

+    else if([srcBitmapRep bitsPerPixel]==8 && [srcBitmapRep bitsPerSample]==8 && [srcBitmapRep samplesPerPixel]==1 && [srcBitmapRep hasAlpha]==NO)
+    // 8-bpp Grayscale, no alpha
+    {   // Force all RGB to access the same grayscale component
+        typedef wxPixelFormat<unsigned char,8,0,0,0> PixelFormat;
+        wxPixelData<wxBitmap,PixelFormat> pixelData(const_cast<wxBitmap&>(bitmap));
+        wxCHECK_MSG(wxMask_CreateFromBitmapData(pixelData, colour, dstData),
+            false, wxT("Unable to access raw data"));
+    }

     else
     {   wxCHECK_MSG(false,false,wxT("Unimplemented pixel format")); }
 
     else
     {   wxCHECK_MSG(false,false,wxT("Unimplemented pixel format")); }