X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/9dabade20bff6c661b7eccbc0e2b809cb670dc75..74a8f67d96591cec101def2a7d47c64072aff7fd:/src/msw/statbmp.cpp diff --git a/src/msw/statbmp.cpp b/src/msw/statbmp.cpp index f7c3e6e206..31c46938b8 100644 --- a/src/msw/statbmp.cpp +++ b/src/msw/statbmp.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: statbmp.cpp +// Name: src/msw/statbmp.cpp // Purpose: wxStaticBitmap // Author: Julian Smart // Modified by: @@ -17,10 +17,6 @@ // headers // --------------------------------------------------------------------------- -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) - #pragma implementation "statbmp.h" -#endif - // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" @@ -30,14 +26,17 @@ #if wxUSE_STATBMP -#include "wx/window.h" -#include "wx/msw/private.h" +#include "wx/statbmp.h" #ifndef WX_PRECOMP + #include "wx/app.h" + #include "wx/window.h" #include "wx/icon.h" - #include "wx/statbmp.h" + #include "wx/dcclient.h" #endif +#include "wx/msw/private.h" + #include "wx/sysopt.h" #include @@ -46,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 // =========================================================================== @@ -120,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(); @@ -159,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; @@ -169,14 +115,24 @@ bool wxStaticBitmap::Create(wxWindow *parent, SetImageNoCopy(image); // GetBestSize will work properly now, so set the best size if needed - SetBestSize(size); + SetInitialSize(size); - return true; -} + // 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__ -wxBorder wxStaticBitmap::GetDefaultBorder() const -{ - return wxBORDER_NONE; + return true; } WXDWORD wxStaticBitmap::MSWGetStyle(long style, WXDWORD *exstyle) const @@ -188,32 +144,90 @@ WXDWORD wxStaticBitmap::MSWGetStyle(long style, WXDWORD *exstyle) const // we use SS_CENTERIMAGE to prevent the control from resizing the bitmap to // fit to its size -- this is unexpected and doesn't happen in other ports - msStyle |= SS_CENTERIMAGE; + // + // and SS_NOTIFY is necessary to receive mouse events + msStyle |= SS_CENTERIMAGE | SS_NOTIFY; return msStyle; } bool wxStaticBitmap::ImageIsOk() const { - return m_image && m_image->Ok(); + return m_image && m_image->IsOk(); } -void wxStaticBitmap::Free() +wxIcon wxStaticBitmap::GetIcon() const +{ + 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(), wxT("no icon in this wxStaticBitmap") ); + + return *(wxIcon *)m_image; +} + +wxBitmap wxStaticBitmap::GetBitmap() const { - delete m_image; + if ( m_isIcon ) + { + // don't fail because we might have replaced the bitmap with icon + // ourselves internally in ConvertImage() to keep the transparency but + // the user code doesn't know about it so it still can use GetBitmap() + // to retrieve the bitmap + return wxBitmap(GetIcon()); + } + else // we have a bitmap + { + wxCHECK_MSG( m_image, wxBitmap(), wxT("no image in wxStaticBitmap") ); - m_image = NULL; + return *(wxBitmap *)m_image; + } +} + +void wxStaticBitmap::Free() +{ + wxDELETE(m_image); } wxSize wxStaticBitmap::DoGetBestSize() const { if ( ImageIsOk() ) - return wxSize(m_image->GetWidth(), m_image->GetHeight()); + { + wxSize best(m_image->GetWidth(), m_image->GetHeight()); + CacheBestSize(best); + return best; + } // this is completely arbitrary return wxSize(16, 16); } +#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 ); @@ -239,8 +253,16 @@ void wxStaticBitmap::SetImageNoCopy( wxGDIImage* image) LONG style = ::GetWindowLong( (HWND)GetHWND(), GWL_STYLE ) ; ::SetWindowLong( (HWND)GetHWND(), GWL_STYLE, ( style & ~( SS_BITMAP|SS_ICON ) ) | ( m_isIcon ? SS_ICON : SS_BITMAP ) ); - ::SendMessage(GetHwnd(), STM_SETIMAGE, + HGDIOBJ oldHandle = (HGDIOBJ)::SendMessage(GetHwnd(), STM_SETIMAGE, m_isIcon ? IMAGE_ICON : IMAGE_BITMAP, (LPARAM)handle); + // detect if this is still the handle we passed before or + // if the static-control made a copy of the bitmap! + if (m_currentHandle != 0 && oldHandle != (HGDIOBJ) m_currentHandle) + { + // the static control made a copy and we are responsible for deleting it + DeleteObject((HGDIOBJ) oldHandle); + } + m_currentHandle = (WXHANDLE)handle; #endif // Win32 if ( ImageIsOk() ) @@ -264,28 +286,4 @@ void wxStaticBitmap::SetImageNoCopy( wxGDIImage* image) ::InvalidateRect(GetHwndOf(GetParent()), &rect, TRUE); } -WXLRESULT wxStaticBitmap::MSWWindowProc(WXUINT nMsg, - WXWPARAM wParam, - WXLPARAM lParam) -{ -#ifndef __WXWINCE__ - static int s_useHTClient = -1; - if (s_useHTClient == -1) - s_useHTClient = wxSystemOptions::GetOptionInt(wxT("msw.staticbitmap.htclient")); - if (s_useHTClient == 1) - { - // Ensure that static items get messages. Some controls don't like this - // message to be intercepted (e.g. RichEdit), hence the tests. - // Also, this code breaks some other processing such as enter/leave tracking - // so it's off by default. - - if ( nMsg == WM_NCHITTEST ) - return (long)HTCLIENT; - } -#endif - - return wxWindow::MSWWindowProc(nMsg, wParam, lParam); -} - #endif // wxUSE_STATBMP -