Applied patch [ 1196679 ] wxIMPLEMENT_CLASS_COMMON2 bad parameter count compil fix.

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

diff --git a/src/mac/carbon/bitmap.cpp b/src/mac/carbon/bitmap.cpp
index 8ae71b1ca0f151c72ab63186cbce6754b95221ab..4339cf4b57c3d2c304d8786a25a1c4525643efaa 100644 (file)
--- a/src/mac/carbon/bitmap.cpp
+++ b/src/mac/carbon/bitmap.cpp
@@ -706,6 +706,7 @@ bool wxBitmap::CopyFromIcon(const wxIcon& icon)
             EndRawAccess() ;
             DisposeHandle( imagehandle ) ;
             DisposeHandle( maskhandle ) ;
+            created = true ;
         }
         DisposeHandle( (Handle) iconFamily ) ;
         
@@ -1076,15 +1077,12 @@ wxImage wxBitmap::ConvertToImage() const
             {
                 if ( *maskp++ == 0 )
                 {
-                    if ( r == MASK_RED && g == MASK_GREEN && b == MASK_BLUE )
-                        b = MASK_BLUE_REPLACEMENT ;
-                    else
-                    {
-                        r = MASK_RED ;
-                        g = MASK_GREEN ;
-                        b = MASK_BLUE ;
-                    }
+                    r = MASK_RED ;
+                    g = MASK_GREEN ;
+                    b = MASK_BLUE ;
                 }
+                else if ( r == MASK_RED && g == MASK_GREEN && b == MASK_BLUE )
+                    b = MASK_BLUE_REPLACEMENT ;
             }
             else if ( hasAlpha )
                 *alpha++ = a ;