correct bitmap construction (including mask) from image

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10332 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/mac/bitmap.cpp b/src/mac/bitmap.cpp
index d049af15efb8cca8bf3c16218ba695cb5ee5bcc4..9e47fe6728743bb64979844460917be6bcc1d4ca 100644 (file)
--- a/src/mac/bitmap.cpp
+++ b/src/mac/bitmap.cpp
@@ -592,7 +592,7 @@ wxBitmap::wxBitmap(const wxImage& image, int depth)
 
     // Create mask
     if ( image.HasMask() ) {
 
     // Create mask
     if ( image.HasMask() ) {

-//        SetMask(new wxMask( maskBitmap ));
+        SetMask(new wxMask( maskBitmap ));

     }
     
     UnlockPixels( GetGWorldPixMap(GetHBITMAP()) );
     }
     
     UnlockPixels( GetGWorldPixMap(GetHBITMAP()) );

diff --git a/src/mac/carbon/bitmap.cpp b/src/mac/carbon/bitmap.cpp
index d049af15efb8cca8bf3c16218ba695cb5ee5bcc4..9e47fe6728743bb64979844460917be6bcc1d4ca 100644 (file)
--- a/src/mac/carbon/bitmap.cpp
+++ b/src/mac/carbon/bitmap.cpp
@@ -592,7 +592,7 @@ wxBitmap::wxBitmap(const wxImage& image, int depth)
 
     // Create mask
     if ( image.HasMask() ) {
 
     // Create mask
     if ( image.HasMask() ) {

-//        SetMask(new wxMask( maskBitmap ));
+        SetMask(new wxMask( maskBitmap ));

     }
     
     UnlockPixels( GetGWorldPixMap(GetHBITMAP()) );
     }
     
     UnlockPixels( GetGWorldPixMap(GetHBITMAP()) );

diff --git a/src/mac/carbon/stattext.cpp b/src/mac/carbon/stattext.cpp
index 3ad2b159b51276a67c16fd2550f33333906b105b..26f16be64248b34d6bdc7434da57249b9c8a3824 100644 (file)
--- a/src/mac/carbon/stattext.cpp
+++ b/src/mac/carbon/stattext.cpp
@@ -84,8 +84,10 @@ void wxStaticText::OnDraw( wxDC &dc )
                                        if ( ((wxControl*)parent)->GetMacControl() ) {
                                                Rect rect = { -32767 , -32767 , 32767 , 32767 } ;
                                                if ( DrawThemeTabPane != (void*)kUnresolvedCFragSymbolAddress )
                                        if ( ((wxControl*)parent)->GetMacControl() ) {
                                                Rect rect = { -32767 , -32767 , 32767 , 32767 } ;
                                                if ( DrawThemeTabPane != (void*)kUnresolvedCFragSymbolAddress )

+                                               {

                                                  DrawThemeTabPane ( &rect, kThemeStateActive);
                                                  DrawThemeTabPane ( &rect, kThemeStateActive);

-                                               doClear = false ;
+                                                 doClear = false ;
+                                               }

                                        }
                                        break ;
                                }
                                        }
                                        break ;
                                }

diff --git a/src/mac/stattext.cpp b/src/mac/stattext.cpp
index 3ad2b159b51276a67c16fd2550f33333906b105b..26f16be64248b34d6bdc7434da57249b9c8a3824 100644 (file)
--- a/src/mac/stattext.cpp
+++ b/src/mac/stattext.cpp
@@ -84,8 +84,10 @@ void wxStaticText::OnDraw( wxDC &dc )
                                        if ( ((wxControl*)parent)->GetMacControl() ) {
                                                Rect rect = { -32767 , -32767 , 32767 , 32767 } ;
                                                if ( DrawThemeTabPane != (void*)kUnresolvedCFragSymbolAddress )
                                        if ( ((wxControl*)parent)->GetMacControl() ) {
                                                Rect rect = { -32767 , -32767 , 32767 , 32767 } ;
                                                if ( DrawThemeTabPane != (void*)kUnresolvedCFragSymbolAddress )

+                                               {

                                                  DrawThemeTabPane ( &rect, kThemeStateActive);
                                                  DrawThemeTabPane ( &rect, kThemeStateActive);

-                                               doClear = false ;
+                                                 doClear = false ;
+                                               }

                                        }
                                        break ;
                                }
                                        }
                                        break ;
                                }