Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

correct bitmap construction (including mask) from image

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10332 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor
2001-05-26 07:52:12 +00:00
parent 008089f632
commit 4ce431b02b
4 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/mac/bitmap.cpp
View File

@@ -592,7 +592,7 @@ wxBitmap::wxBitmap(const wxImage& image, int depth)
// Create mask // Create mask
if ( image.HasMask() ) { if ( image.HasMask() ) {
// SetMask(new wxMask( maskBitmap )); SetMask(new wxMask( maskBitmap ));
} }
UnlockPixels( GetGWorldPixMap(GetHBITMAP()) ); UnlockPixels( GetGWorldPixMap(GetHBITMAP()) );

2
src/mac/carbon/bitmap.cpp
View File

@@ -592,7 +592,7 @@ wxBitmap::wxBitmap(const wxImage& image, int depth)
// Create mask // Create mask
if ( image.HasMask() ) { if ( image.HasMask() ) {
// SetMask(new wxMask( maskBitmap )); SetMask(new wxMask( maskBitmap ));
} }
UnlockPixels( GetGWorldPixMap(GetHBITMAP()) ); UnlockPixels( GetGWorldPixMap(GetHBITMAP()) );

4
src/mac/carbon/stattext.cpp
View File

@@ -84,8 +84,10 @@ void wxStaticText::OnDraw( wxDC &dc )
if ( ((wxControl*)parent)->GetMacControl() ) { if ( ((wxControl*)parent)->GetMacControl() ) {
Rect rect = { -32767 , -32767 , 32767 , 32767 } ; Rect rect = { -32767 , -32767 , 32767 , 32767 } ;
if ( DrawThemeTabPane != (void*)kUnresolvedCFragSymbolAddress ) if ( DrawThemeTabPane != (void*)kUnresolvedCFragSymbolAddress )
{
DrawThemeTabPane ( &rect, kThemeStateActive); DrawThemeTabPane ( &rect, kThemeStateActive);
doClear = false ; doClear = false ;
}
} }
break ; break ;
} }

4
src/mac/stattext.cpp
View File

@@ -84,8 +84,10 @@ void wxStaticText::OnDraw( wxDC &dc )
if ( ((wxControl*)parent)->GetMacControl() ) { if ( ((wxControl*)parent)->GetMacControl() ) {
Rect rect = { -32767 , -32767 , 32767 , 32767 } ; Rect rect = { -32767 , -32767 , 32767 , 32767 } ;
if ( DrawThemeTabPane != (void*)kUnresolvedCFragSymbolAddress ) if ( DrawThemeTabPane != (void*)kUnresolvedCFragSymbolAddress )
{
DrawThemeTabPane ( &rect, kThemeStateActive); DrawThemeTabPane ( &rect, kThemeStateActive);
doClear = false ; doClear = false ;
}
} }
break ; break ;
} }