From: Stefan Csomor <csomor@advancedconcepts.ch>
Date: Sat, 26 May 2001 07:52:12 +0000 (+0000)
Subject: correct bitmap construction  (including mask) from image
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/4ce431b02b6ea07b90254fcdc21e6dda377ea565?ds=inline

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 d049af15ef..9e47fe6728 100644
--- 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() ) {
-//        SetMask(new wxMask( maskBitmap ));
+        SetMask(new wxMask( maskBitmap ));
     }
     
     UnlockPixels( GetGWorldPixMap(GetHBITMAP()) );
diff --git a/src/mac/carbon/bitmap.cpp b/src/mac/carbon/bitmap.cpp
index d049af15ef..9e47fe6728 100644
--- 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() ) {
-//        SetMask(new wxMask( maskBitmap ));
+        SetMask(new wxMask( maskBitmap ));
     }
     
     UnlockPixels( GetGWorldPixMap(GetHBITMAP()) );
diff --git a/src/mac/carbon/stattext.cpp b/src/mac/carbon/stattext.cpp
index 3ad2b159b5..26f16be642 100644
--- 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 )
+						{
 						  DrawThemeTabPane ( &rect, kThemeStateActive);
-						doClear = false ;
+						  doClear = false ;
+						}
 					}
 					break ;
 				}
diff --git a/src/mac/stattext.cpp b/src/mac/stattext.cpp
index 3ad2b159b5..26f16be642 100644
--- 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 )
+						{
 						  DrawThemeTabPane ( &rect, kThemeStateActive);
-						doClear = false ;
+						  doClear = false ;
+						}
 					}
 					break ;
 				}