X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a73a4ab75eca4329d88093ad143121e0b96a8006..51ec29ea5d1d1093bafbae27a8483211a90d9659:/src/msw/statbmp.cpp diff --git a/src/msw/statbmp.cpp b/src/msw/statbmp.cpp index 511fb26ff7..31c46938b8 100644 --- a/src/msw/statbmp.cpp +++ b/src/msw/statbmp.cpp @@ -29,8 +29,10 @@ #include "wx/statbmp.h" #ifndef WX_PRECOMP + #include "wx/app.h" #include "wx/window.h" #include "wx/icon.h" + #include "wx/dcclient.h" #endif #include "wx/msw/private.h" @@ -43,59 +45,6 @@ // macors // --------------------------------------------------------------------------- -#if wxUSE_EXTENDED_RTTI -WX_DEFINE_FLAGS( wxStaticBitmapStyle ) - -wxBEGIN_FLAGS( wxStaticBitmapStyle ) - // new style border flags, we put them first to - // use them for streaming out - wxFLAGS_MEMBER(wxBORDER_SIMPLE) - wxFLAGS_MEMBER(wxBORDER_SUNKEN) - wxFLAGS_MEMBER(wxBORDER_DOUBLE) - wxFLAGS_MEMBER(wxBORDER_RAISED) - wxFLAGS_MEMBER(wxBORDER_STATIC) - wxFLAGS_MEMBER(wxBORDER_NONE) - - // old style border flags - wxFLAGS_MEMBER(wxSIMPLE_BORDER) - wxFLAGS_MEMBER(wxSUNKEN_BORDER) - wxFLAGS_MEMBER(wxDOUBLE_BORDER) - wxFLAGS_MEMBER(wxRAISED_BORDER) - wxFLAGS_MEMBER(wxSTATIC_BORDER) - wxFLAGS_MEMBER(wxBORDER) - - // standard window styles - wxFLAGS_MEMBER(wxTAB_TRAVERSAL) - wxFLAGS_MEMBER(wxCLIP_CHILDREN) - wxFLAGS_MEMBER(wxTRANSPARENT_WINDOW) - wxFLAGS_MEMBER(wxWANTS_CHARS) - wxFLAGS_MEMBER(wxFULL_REPAINT_ON_RESIZE) - wxFLAGS_MEMBER(wxALWAYS_SHOW_SB ) - wxFLAGS_MEMBER(wxVSCROLL) - wxFLAGS_MEMBER(wxHSCROLL) - -wxEND_FLAGS( wxStaticBitmapStyle ) - -IMPLEMENT_DYNAMIC_CLASS_XTI(wxStaticBitmap, wxControl,"wx/statbmp.h") - -wxBEGIN_PROPERTIES_TABLE(wxStaticBitmap) - wxPROPERTY_FLAGS( WindowStyle , wxStaticBitmapStyle , long , SetWindowStyleFlag , GetWindowStyleFlag , EMPTY_MACROVALUE, 0 /*flags*/ , wxT("Helpstring") , wxT("group")) // style -wxEND_PROPERTIES_TABLE() - -wxBEGIN_HANDLERS_TABLE(wxStaticBitmap) -wxEND_HANDLERS_TABLE() - -wxCONSTRUCTOR_5( wxStaticBitmap, wxWindow* , Parent , wxWindowID , Id , wxBitmap, Bitmap, wxPoint , Position , wxSize , Size ) - -#else -IMPLEMENT_DYNAMIC_CLASS(wxStaticBitmap, wxControl) -#endif - -/* - TODO PROPERTIES : - bitmap -*/ - // =========================================================================== // implementation // =========================================================================== @@ -117,7 +66,7 @@ static wxGDIImage* ConvertImage( const wxGDIImage& bitmap ) if( !isIcon ) { wxASSERT_MSG( wxDynamicCast(&bitmap, wxBitmap), - _T("not an icon and not a bitmap?") ); + wxT("not an icon and not a bitmap?") ); const wxBitmap& bmp = (const wxBitmap&)bitmap; wxMask *mask = bmp.GetMask(); @@ -156,7 +105,7 @@ bool wxStaticBitmap::Create(wxWindow *parent, m_isIcon = image->IsKindOf( CLASSINFO(wxIcon) ); // create the native control - if ( !MSWCreateControl(_T("STATIC"), wxEmptyString, pos, size) ) + if ( !MSWCreateControl(wxT("STATIC"), wxEmptyString, pos, size) ) { // control creation failed return false; @@ -168,13 +117,20 @@ bool wxStaticBitmap::Create(wxWindow *parent, // GetBestSize will work properly now, so set the best size if needed 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 ) + // painting manually is reported not to work under Windows CE (see #10093), + // so don't do it there even if this probably means that alpha is not + // supported there -- but at least bitmaps without alpha appear correctly +#ifndef __WXWINCE__ + // Windows versions before XP (and even XP if the application has no + // manifest and so the old comctl32.dll is used) 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 ( wxTheApp->GetComCtl32Version() < 600 ) { Connect(wxEVT_PAINT, wxPaintEventHandler(wxStaticBitmap::DoPaintManually)); } +#endif // !__WXWINCE__ return true; } @@ -197,15 +153,15 @@ WXDWORD wxStaticBitmap::MSWGetStyle(long style, WXDWORD *exstyle) const bool wxStaticBitmap::ImageIsOk() const { - return m_image && m_image->Ok(); + return m_image && m_image->IsOk(); } wxIcon wxStaticBitmap::GetIcon() const { - wxCHECK_MSG( m_image, wxIcon(), _T("no image in wxStaticBitmap") ); + wxCHECK_MSG( m_image, wxIcon(), wxT("no image in wxStaticBitmap") ); // we can't ask for an icon if all we have is a bitmap - wxCHECK_MSG( m_isIcon, wxIcon(), _T("no icon in this wxStaticBitmap") ); + wxCHECK_MSG( m_isIcon, wxIcon(), wxT("no icon in this wxStaticBitmap") ); return *(wxIcon *)m_image; } @@ -222,7 +178,7 @@ wxBitmap wxStaticBitmap::GetBitmap() const } else // we have a bitmap { - wxCHECK_MSG( m_image, wxBitmap(), _T("no image in wxStaticBitmap") ); + wxCHECK_MSG( m_image, wxBitmap(), wxT("no image in wxStaticBitmap") ); return *(wxBitmap *)m_image; } @@ -230,9 +186,7 @@ wxBitmap wxStaticBitmap::GetBitmap() const void wxStaticBitmap::Free() { - delete m_image; - - m_image = NULL; + wxDELETE(m_image); } wxSize wxStaticBitmap::DoGetBestSize() const @@ -248,6 +202,8 @@ wxSize wxStaticBitmap::DoGetBestSize() const return wxSize(16, 16); } +#ifndef __WXWINCE__ + void wxStaticBitmap::DoPaintManually(wxPaintEvent& WXUNUSED(event)) { wxPaintDC dc(this); @@ -255,8 +211,11 @@ void wxStaticBitmap::DoPaintManually(wxPaintEvent& WXUNUSED(event)) const wxSize size(GetSize()); const wxBitmap bmp(GetBitmap()); - // Clear the background - dc.SetBrush(GetBackgroundColour()); + // Clear the background: notice that we're supposed to be transparent, so + // use the parent background colour if we don't have our own instead of + // falling back to the default + const wxWindow *win = UseBgCol() ? this : GetParent(); + dc.SetBrush(win->GetBackgroundColour()); dc.SetPen(*wxTRANSPARENT_PEN); dc.DrawRectangle(0, 0, size.GetWidth(), size.GetHeight()); @@ -267,6 +226,8 @@ void wxStaticBitmap::DoPaintManually(wxPaintEvent& WXUNUSED(event)) true /* use mask */); } +#endif // !__WXWINCE__ + void wxStaticBitmap::SetImage( const wxGDIImage* image ) { wxGDIImage* convertedImage = ConvertImage( *image );