X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d8bffc1335b021848d2947530213e4ef119226fc..1a27a87d531c408a4ccd9bf871bab32384a7d617:/src/msw/statbmp.cpp?ds=sidebyside diff --git a/src/msw/statbmp.cpp b/src/msw/statbmp.cpp index a93d50a7a5..418541bfd9 100644 --- a/src/msw/statbmp.cpp +++ b/src/msw/statbmp.cpp @@ -1,12 +1,12 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: statbmp.cpp +// Name: src/msw/statbmp.cpp // Purpose: wxStaticBitmap // Author: Julian Smart // Modified by: // Created: 04/01/98 // RCS-ID: $Id$ -// Copyright: (c) Julian Smart and Markus Holzem -// Licence: wxWindows license +// Copyright: (c) Julian Smart +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// // =========================================================================== @@ -17,10 +17,6 @@ // headers // --------------------------------------------------------------------------- -#ifdef __GNUG__ - #pragma implementation "statbmp.h" -#endif - // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" @@ -30,21 +26,77 @@ #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 // --------------------------------------------------------------------------- // 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 @@ -60,8 +112,6 @@ IMPLEMENT_DYNAMIC_CLASS(wxStaticBitmap, wxControl) // note that this function will create a new object every time // it is called even if the image needs no conversion -#ifndef __WIN16__ - static wxGDIImage* ConvertImage( const wxGDIImage& bitmap ) { bool isIcon = bitmap.IsKindOf( CLASSINFO(wxIcon) ); @@ -88,97 +138,103 @@ static wxGDIImage* ConvertImage( const wxGDIImage& bitmap ) return new wxIcon( (const wxIcon&)bitmap ); } -#endif - -bool wxStaticBitmap::Create(wxWindow *parent, wxWindowID id, +bool wxStaticBitmap::Create(wxWindow *parent, + wxWindowID id, const wxGDIImage& bitmap, const wxPoint& pos, const wxSize& size, long style, const wxString& name) { - Init(); - - SetName(name); - if (parent) - parent->AddChild(this); - - m_backgroundColour = parent->GetBackgroundColour() ; - m_foregroundColour = parent->GetForegroundColour() ; - - if ( id == -1 ) - m_windowId = (int)NewControlId(); - else - m_windowId = id; - - int x = pos.x; - int y = pos.y; - int width = size.x; - int height = size.y; - - m_windowStyle = style; + if ( !CreateControl(parent, id, pos, size, style, wxDefaultValidator, name) ) + 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)); -#ifdef __WIN16__ - wxASSERT_MSG( !m_isIcon, "Icons are not supported in wxStaticBitmap under WIN16." ); - image = &bitmap; -#endif - -#ifndef __WIN16__ - image = ConvertImage( bitmap ); + wxGDIImage *image = ConvertImage( bitmap ); m_isIcon = image->IsKindOf( CLASSINFO(wxIcon) ); -#endif -#ifdef __WIN32__ - // create a static control with either SS_BITMAP or SS_ICON style depending - // on what we have here - const wxChar *classname = wxT("STATIC"); - int winstyle = m_isIcon ? SS_ICON : SS_BITMAP; -#else // Win16 - const wxChar *classname = wxT("BUTTON"); - int winstyle = BS_OWNERDRAW; -#endif // Win32 + // create the native control + if ( !MSWCreateControl(_T("STATIC"), wxEmptyString, pos, size) ) + { + // control creation failed + return false; + } + + // no need to delete the new image + SetImageNoCopy(image); + + // GetBestSize will work properly now, so set the best size if needed + 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__ - if ( m_windowStyle & wxCLIP_SIBLINGS ) - winstyle |= WS_CLIPSIBLINGS; + return true; +} +WXDWORD wxStaticBitmap::MSWGetStyle(long style, WXDWORD *exstyle) const +{ + WXDWORD msStyle = wxControl::MSWGetStyle(style, exstyle); - m_hWnd = (WXHWND)::CreateWindow - ( - classname, - wxT(""), - // NOT DISABLED!!! We want to move it in Dialog Editor. - winstyle | WS_CHILD | WS_VISIBLE /* | WS_CLIPSIBLINGS */ , // | WS_DISABLED, - 0, 0, 0, 0, - (HWND)parent->GetHWND(), - (HMENU)m_windowId, - wxGetInstance(), - NULL - ); + // what kind of control are we? + msStyle |= m_isIcon ? SS_ICON : SS_BITMAP; - wxCHECK_MSG( m_hWnd, FALSE, wxT("Failed to create static bitmap") ); + // 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 + // + // and SS_NOTIFY is necessary to receive mouse events + msStyle |= SS_CENTERIMAGE | SS_NOTIFY; - // no need to delete the new image - SetImageNoCopy( image ); + return msStyle; +} - // Subclass again for purposes of dialog editing mode - SubclassWin(m_hWnd); +bool wxStaticBitmap::ImageIsOk() const +{ + return m_image && m_image->Ok(); +} - SetFont(GetParent()->GetFont()); +wxIcon wxStaticBitmap::GetIcon() const +{ + wxCHECK_MSG( m_image, wxIcon(), _T("no image in wxStaticBitmap") ); - SetSize(x, y, width, height); + // 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 TRUE; + return *(wxIcon *)m_image; } -bool wxStaticBitmap::ImageIsOk() const +wxBitmap wxStaticBitmap::GetBitmap() const { - return m_image && m_image->Ok(); + 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() @@ -190,15 +246,48 @@ void wxStaticBitmap::Free() wxSize wxStaticBitmap::DoGetBestSize() const { - // reuse the current size (as wxWindow does) instead of using some - // arbitrary default size (as wxControl, our immediate base class, does) - return wxWindow::DoGetBestSize(); + if ( ImageIsOk() ) + { + 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) @@ -219,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() ) @@ -241,59 +338,7 @@ void wxStaticBitmap::SetImageNoCopy( wxGDIImage* image) rect.top = y; rect.right = x + w; rect.bottom = y + h; - InvalidateRect(GetHwndOf(GetParent()), &rect, TRUE); -} - -// under Win32 we use the standard static control style for this -#ifdef __WIN16__ -bool wxStaticBitmap::MSWOnDraw(WXDRAWITEMSTRUCT *item) -{ - LPDRAWITEMSTRUCT lpDIS = (LPDRAWITEMSTRUCT) item; - - wxCHECK_MSG( !m_isIcon, FALSE, _T("icons not supported in wxStaticBitmap") ); - - wxBitmap* bitmap = (wxBitmap *)m_image; - if ( !bitmap->Ok() ) - return FALSE; - - HDC hDC = lpDIS->hDC; - HDC memDC = ::CreateCompatibleDC(hDC); - - HBITMAP old = (HBITMAP) ::SelectObject(memDC, (HBITMAP) bitmap->GetHBITMAP()); - - if (!old) - return FALSE; - - int x = lpDIS->rcItem.left; - int y = lpDIS->rcItem.top; - int width = lpDIS->rcItem.right - x; - int height = lpDIS->rcItem.bottom - y; - - // Centre the bitmap in the control area - int x1 = (int) (x + ((width - bitmap->GetWidth()) / 2)); - int y1 = (int) (y + ((height - bitmap->GetHeight()) / 2)); - - ::BitBlt(hDC, x1, y1, bitmap->GetWidth(), bitmap->GetHeight(), memDC, 0, 0, SRCCOPY); - - ::SelectObject(memDC, old); - - ::DeleteDC(memDC); - - return TRUE; -} -#endif // Win16 - -// We need this or the control can never be moved e.g. in Dialog Editor. -long wxStaticBitmap::MSWWindowProc(WXUINT nMsg, - WXWPARAM wParam, - WXLPARAM lParam) -{ - // 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; - - return wxWindow::MSWWindowProc(nMsg, wParam, lParam); + ::InvalidateRect(GetHwndOf(GetParent()), &rect, TRUE); } #endif // wxUSE_STATBMP