#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"
// 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
// ===========================================================================
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();
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;
SetImageNoCopy(image);
// GetBestSize will work properly now, so set the best size if needed
- SetBestSize(size);
+ SetInitialSize(size);
+
+ // 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;
}
-wxBorder wxStaticBitmap::GetDefaultBorder() const
-{
- return wxBORDER_NONE;
-}
-
WXDWORD wxStaticBitmap::MSWGetStyle(long style, WXDWORD *exstyle) const
{
WXDWORD msStyle = wxControl::MSWGetStyle(style, exstyle);
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;
}
}
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;
}
void wxStaticBitmap::Free()
{
- delete m_image;
-
- m_image = NULL;
+ wxDELETE(m_image);
}
-wxSize wxStaticBitmap::DoGetBestSize() const
+wxSize wxStaticBitmap::DoGetBestClientSize() const
{
+ wxSize size;
if ( ImageIsOk() )
{
- wxSize best(m_image->GetWidth(), m_image->GetHeight());
- CacheBestSize(best);
- return best;
+ size = m_image->GetSize();
+ }
+ else // No image yet
+ {
+ // this is completely arbitrary
+ size.x =
+ size.y = 16;
}
- // this is completely arbitrary
- return wxSize(16, 16);
+ return size;
}
+#ifndef __WXWINCE__
+
+void wxStaticBitmap::DoPaintManually(wxPaintEvent& WXUNUSED(event))
+{
+ wxPaintDC dc(this);
+
+ const wxSize size(GetSize());
+ const wxBitmap bmp(GetBitmap());
+
+ // 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());
+
+ // Draw the image in the middle
+ dc.DrawBitmap(bmp,
+ (size.GetWidth() - bmp.GetWidth()) / 2,
+ (size.GetHeight() - bmp.GetHeight()) / 2,
+ true /* use mask */);
+}
+
+#endif // !__WXWINCE__
+
void wxStaticBitmap::SetImage( const wxGDIImage* image )
{
wxGDIImage* convertedImage = ConvertImage( *image );
SetImageNoCopy( convertedImage );
- InvalidateBestSize();
}
void wxStaticBitmap::SetImageNoCopy( wxGDIImage* image)
{
Free();
+ InvalidateBestSize();
m_isIcon = image->IsKindOf( CLASSINFO(wxIcon) );
// the image has already been copied
projects / wxWidgets.git / blobdiff