X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8f177c8e7309c8cf3ece1563870d135cc8f0e6a1..2b9a7d4cc2f5f55df3d83f7cf2160cf9a509a4f2:/src/msw/statbmp.cpp?ds=sidebyside diff --git a/src/msw/statbmp.cpp b/src/msw/statbmp.cpp index da32aead68..f7c3e6e206 100644 --- a/src/msw/statbmp.cpp +++ b/src/msw/statbmp.cpp @@ -5,8 +5,8 @@ // 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,7 +17,7 @@ // headers // --------------------------------------------------------------------------- -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma implementation "statbmp.h" #endif @@ -28,6 +28,8 @@ #pragma hdrstop #endif +#if wxUSE_STATBMP + #include "wx/window.h" #include "wx/msw/private.h" @@ -36,13 +38,66 @@ #include "wx/statbmp.h" #endif +#include "wx/sysopt.h" + #include // --------------------------------------------------------------------------- // macors // --------------------------------------------------------------------------- - IMPLEMENT_DYNAMIC_CLASS(wxStaticBitmap, wxControl) +#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 @@ -52,70 +107,90 @@ // wxStaticBitmap // --------------------------------------------------------------------------- -bool wxStaticBitmap::Create(wxWindow *parent, wxWindowID id, +// 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 +// note that this function will create a new object every time +// it is called even if the image needs no conversion + +static wxGDIImage* ConvertImage( const wxGDIImage& bitmap ) +{ + bool isIcon = bitmap.IsKindOf( CLASSINFO(wxIcon) ); + + if( !isIcon ) + { + wxASSERT_MSG( wxDynamicCast(&bitmap, wxBitmap), + _T("not an icon and not a bitmap?") ); + + const wxBitmap& bmp = (const wxBitmap&)bitmap; + wxMask *mask = bmp.GetMask(); + if ( mask && mask->GetMaskBitmap() ) + { + wxIcon* icon = new wxIcon; + icon->CopyFromBitmap(bmp); + + return icon; + } + + return new wxBitmap( bmp ); + } + + // copying a bitmap is a cheap operation + return new wxIcon( (const wxIcon&)bitmap ); +} + +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); + if ( !CreateControl(parent, id, pos, size, style, wxDefaultValidator, name) ) + return false; - 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; + // 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 + m_isIcon = bitmap.IsKindOf(CLASSINFO(wxIcon)); - m_windowStyle = style; + wxGDIImage *image = ConvertImage( bitmap ); + m_isIcon = image->IsKindOf( CLASSINFO(wxIcon) ); - m_isIcon = bitmap.IsKindOf(CLASSINFO(wxIcon)); + // create the native control + if ( !MSWCreateControl(_T("STATIC"), wxEmptyString, pos, size) ) + { + // control creation failed + return false; + } -#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 + // no need to delete the new image + SetImageNoCopy(image); - m_hWnd = (WXHWND)::CreateWindow - ( - classname, - wxT(""), - winstyle | WS_CHILD | WS_VISIBLE, - 0, 0, 0, 0, - (HWND)parent->GetHWND(), - (HMENU)m_windowId, - wxGetInstance(), - NULL - ); + // GetBestSize will work properly now, so set the best size if needed + SetBestSize(size); - wxCHECK_MSG( m_hWnd, FALSE, wxT("Failed to create static bitmap") ); + return true; +} - SetImage(bitmap); +wxBorder wxStaticBitmap::GetDefaultBorder() const +{ + return wxBORDER_NONE; +} - // Subclass again for purposes of dialog editing mode - SubclassWin(m_hWnd); +WXDWORD wxStaticBitmap::MSWGetStyle(long style, WXDWORD *exstyle) const +{ + WXDWORD msStyle = wxControl::MSWGetStyle(style, exstyle); - SetFont(GetParent()->GetFont()); + // what kind of control are we? + msStyle |= m_isIcon ? SS_ICON : SS_BITMAP; - SetSize(x, y, width, height); + // 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; - return TRUE; + return msStyle; } bool wxStaticBitmap::ImageIsOk() const @@ -132,20 +207,27 @@ 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() ) + return wxSize(m_image->GetWidth(), m_image->GetHeight()); + + // this is completely arbitrary + return wxSize(16, 16); +} + +void wxStaticBitmap::SetImage( const wxGDIImage* image ) +{ + wxGDIImage* convertedImage = ConvertImage( *image ); + SetImageNoCopy( convertedImage ); + InvalidateBestSize(); } -void wxStaticBitmap::SetImage(const wxGDIImage& bitmap) +void wxStaticBitmap::SetImageNoCopy( wxGDIImage* image) { Free(); - m_isIcon = bitmap.IsKindOf(CLASSINFO(wxIcon)); - if ( m_isIcon ) - m_image = new wxIcon((const wxIcon&)bitmap); - else - m_image = new wxBitmap((const wxBitmap &)bitmap); + m_isIcon = image->IsKindOf( CLASSINFO(wxIcon) ); + // the image has already been copied + m_image = image; int x, y; int w, h; @@ -154,14 +236,17 @@ void wxStaticBitmap::SetImage(const wxGDIImage& bitmap) #ifdef __WIN32__ HANDLE handle = (HANDLE)m_image->GetHandle(); + 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, m_isIcon ? IMAGE_ICON : IMAGE_BITMAP, (LPARAM)handle); #endif // Win32 if ( ImageIsOk() ) { - int width = bitmap.GetWidth(), - height = bitmap.GetHeight(); + int width = image->GetWidth(), + height = image->GetHeight(); if ( width && height ) { w = width; @@ -176,56 +261,31 @@ void wxStaticBitmap::SetImage(const wxGDIImage& bitmap) rect.top = y; rect.right = x + w; rect.bottom = y + h; - InvalidateRect(GetHwndOf(GetParent()), &rect, TRUE); + ::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; -} - -long wxStaticBitmap::MSWWindowProc(WXUINT nMsg, +WXLRESULT 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; +#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 // Win16 + +#endif // wxUSE_STATBMP +