draw the bitmap manually under Win9x and 2000 because they don't support alpha transparency (but wxDC::DrawBitmap() does) (modified patch 1761598)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@51031 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -70,6 +70,11 @@ protected:
|
|||||||
void SetImage(const wxGDIImage* image);
|
void SetImage(const wxGDIImage* image);
|
||||||
void SetImageNoCopy( wxGDIImage* image );
|
void SetImageNoCopy( wxGDIImage* image );
|
||||||
|
|
||||||
|
// draw the bitmap ourselves here if the OS can't do it correctly (if it
|
||||||
|
// can we leave it to it)
|
||||||
|
void DoPaintManually(wxPaintEvent& event);
|
||||||
|
|
||||||
|
|
||||||
// we can have either an icon or a bitmap
|
// we can have either an icon or a bitmap
|
||||||
bool m_isIcon;
|
bool m_isIcon;
|
||||||
wxGDIImage *m_image;
|
wxGDIImage *m_image;
|
||||||
|
@@ -168,6 +168,14 @@ bool wxStaticBitmap::Create(wxWindow *parent,
|
|||||||
// GetBestSize will work properly now, so set the best size if needed
|
// GetBestSize will work properly now, so set the best size if needed
|
||||||
SetInitialSize(size);
|
SetInitialSize(size);
|
||||||
|
|
||||||
|
// Win9x and 2000 don't draw correctly the images with alpha channel so we
|
||||||
|
// need to draw them ourselves and it's easier to just always do it rather
|
||||||
|
// than check if we have an image with alpha or not
|
||||||
|
if ( wxGetWinVersion() <= wxWinVersion_2000 )
|
||||||
|
{
|
||||||
|
Connect(wxEVT_PAINT, wxPaintEventHandler(wxStaticBitmap::DoPaintManually));
|
||||||
|
}
|
||||||
|
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -240,6 +248,25 @@ wxSize wxStaticBitmap::DoGetBestSize() const
|
|||||||
return wxSize(16, 16);
|
return wxSize(16, 16);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void wxStaticBitmap::DoPaintManually(wxPaintEvent& WXUNUSED(event))
|
||||||
|
{
|
||||||
|
wxPaintDC dc(this);
|
||||||
|
|
||||||
|
const wxSize size(GetSize());
|
||||||
|
const wxBitmap bmp(GetBitmap());
|
||||||
|
|
||||||
|
// Clear the background
|
||||||
|
dc.SetBrush(GetBackgroundColour());
|
||||||
|
dc.SetPen(*wxTRANSPARENT_PEN);
|
||||||
|
dc.DrawRectangle(0, 0, size.GetWidth(), size.GetHeight());
|
||||||
|
|
||||||
|
// Draw the image in the middle
|
||||||
|
dc.DrawBitmap(bmp,
|
||||||
|
(size.GetWidth() - bmp.GetWidth()) / 2,
|
||||||
|
(size.GetHeight() - bmp.GetHeight()) / 2,
|
||||||
|
true /* use mask */);
|
||||||
|
}
|
||||||
|
|
||||||
void wxStaticBitmap::SetImage( const wxGDIImage* image )
|
void wxStaticBitmap::SetImage( const wxGDIImage* image )
|
||||||
{
|
{
|
||||||
wxGDIImage* convertedImage = ConvertImage( *image );
|
wxGDIImage* convertedImage = ConvertImage( *image );
|
||||||
|
Reference in New Issue
Block a user