made GetColourFromGTKWidget() more general, it is now used for all colours

[wxWidgets.git] / src / mac / carbon / bitmap.cpp

diff --git a/src/mac/carbon/bitmap.cpp b/src/mac/carbon/bitmap.cpp
index 300609dd86cfeea3d46cb1d0710acec796b47160..a37654c059027ebdfbc16151a1b6b7e8cd71adf7 100644 (file)
--- a/src/mac/carbon/bitmap.cpp
+++ b/src/mac/carbon/bitmap.cpp
@@ -246,6 +246,7 @@ wxList wxBitmapBase::sm_handlers;
 bool wxBitmap::CopyFromIcon(const wxIcon& icon)
 {
     Ref(icon) ;
 bool wxBitmap::CopyFromIcon(const wxIcon& icon)
 {
     Ref(icon) ;

+    return true;

 }
 
 wxBitmap::wxBitmap()
 }
 
 wxBitmap::wxBitmap()


@@ -593,7 +594,7 @@ wxBitmap::wxBitmap(const wxImage& image, int depth)
       {
           for (int x = 0; x < width; x++)
           {
       {
           for (int x = 0; x < width; x++)
           {

-              if ( data[0] == image.GetMaskRed() && data[1] == image.GetMaskRed() && data[2] == image.GetMaskRed() )
+              if ( data[0] == image.GetMaskRed() && data[1] == image.GetMaskGreen() && data[2] == image.GetMaskBlue() )

               {
                 SetCPixel(x,y, &white);
               }
               {
                 SetCPixel(x,y, &white);
               }