X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/655719367ac5e131d9642e5783f3ecf64d1a3385..ba8ac2c7c30f6a18ac1fae70162be008c3fc378d:/src/msw/statbmp.cpp diff --git a/src/msw/statbmp.cpp b/src/msw/statbmp.cpp index b437dcf26a..418541bfd9 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,19 @@ #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 // --------------------------------------------------------------------------- @@ -56,7 +57,7 @@ wxBEGIN_FLAGS( wxStaticBitmapStyle ) wxFLAGS_MEMBER(wxBORDER_RAISED) wxFLAGS_MEMBER(wxBORDER_STATIC) wxFLAGS_MEMBER(wxBORDER_NONE) - + // old style border flags wxFLAGS_MEMBER(wxSIMPLE_BORDER) wxFLAGS_MEMBER(wxSUNKEN_BORDER) @@ -93,8 +94,8 @@ IMPLEMENT_DYNAMIC_CLASS(wxStaticBitmap, wxControl) #endif /* - TODO PROPERTIES : - bitmap + TODO PROPERTIES : + bitmap */ // =========================================================================== @@ -146,15 +147,14 @@ bool wxStaticBitmap::Create(wxWindow *parent, const wxString& name) { if ( !CreateControl(parent, id, pos, size, style, wxDefaultValidator, name) ) - return FALSE; + return false; // we may have either bitmap or icon: if a bitmap with mask is passed, we // will transform it to an icon ourselves because otherwise the mask will // be ignored by Windows - wxGDIImage *image = (wxGDIImage *)NULL; m_isIcon = bitmap.IsKindOf(CLASSINFO(wxIcon)); - image = ConvertImage( bitmap ); + wxGDIImage *image = ConvertImage( bitmap ); m_isIcon = image->IsKindOf( CLASSINFO(wxIcon) ); // create the native control @@ -168,14 +168,24 @@ bool wxStaticBitmap::Create(wxWindow *parent, SetImageNoCopy(image); // GetBestSize will work properly now, so set the best size if needed - SetBestSize(size); - - return TRUE; -} + SetInitialSize(size); -wxBorder wxStaticBitmap::GetDefaultBorder() const -{ - return wxBORDER_NONE; + // 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; } WXDWORD wxStaticBitmap::MSWGetStyle(long style, WXDWORD *exstyle) const @@ -187,7 +197,9 @@ 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; } @@ -197,6 +209,34 @@ bool wxStaticBitmap::ImageIsOk() const return m_image && m_image->Ok(); } +wxIcon wxStaticBitmap::GetIcon() const +{ + wxCHECK_MSG( m_image, wxIcon(), _T("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") ); + + return *(wxIcon *)m_image; +} + +wxBitmap wxStaticBitmap::GetBitmap() const +{ + 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(), _T("no image in wxStaticBitmap") ); + + return *(wxBitmap *)m_image; + } +} + void wxStaticBitmap::Free() { delete m_image; @@ -207,16 +247,47 @@ void wxStaticBitmap::Free() 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 ); SetImageNoCopy( convertedImage ); + InvalidateBestSize(); } void wxStaticBitmap::SetImageNoCopy( wxGDIImage* image) @@ -237,8 +308,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() ) @@ -259,22 +338,7 @@ void wxStaticBitmap::SetImageNoCopy( wxGDIImage* image) rect.top = y; rect.right = x + w; rect.bottom = y + h; - InvalidateRect(GetHwndOf(GetParent()), &rect, TRUE); -} - -// We need this or the control can never be moved e.g. in Dialog Editor. -WXLRESULT wxStaticBitmap::MSWWindowProc(WXUINT nMsg, - WXWPARAM wParam, - WXLPARAM lParam) -{ -#ifndef __WXWINCE__ - // Ensure that static items get messages. Some controls don't like this - // message to be intercepted (e.g. RichEdit), hence the tests. - if ( nMsg == WM_NCHITTEST ) - return (long)HTCLIENT; -#endif - - return wxWindow::MSWWindowProc(nMsg, wParam, lParam); + ::InvalidateRect(GetHwndOf(GetParent()), &rect, TRUE); } #endif // wxUSE_STATBMP