Avoid core dumps when SetImageList is used.

[wxWidgets.git] / src / msw / statbmp.cpp

diff --git a/src/msw/statbmp.cpp b/src/msw/statbmp.cpp
index 2f54f08674ce4c368af38db30a08d7cc6600838d..1d6bfd0c7ccd566f0fba52da4b5f4d3253fa7a82 100644 (file)
--- a/src/msw/statbmp.cpp
+++ b/src/msw/statbmp.cpp
@@ -5,8 +5,8 @@
 // Modified by:
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // 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
 // ---------------------------------------------------------------------------
 
 // headers
 // ---------------------------------------------------------------------------
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

     #pragma implementation "statbmp.h"
 #endif
 
     #pragma implementation "statbmp.h"
 #endif
 


@@ -28,6 +28,8 @@
     #pragma hdrstop
 #endif
 
     #pragma hdrstop
 #endif
 

+#if wxUSE_STATBMP
+

 #include "wx/window.h"
 #include "wx/msw/private.h"
 
 #include "wx/window.h"
 #include "wx/msw/private.h"
 


@@ -42,7 +44,58 @@
 // macors
 // ---------------------------------------------------------------------------
 
 // 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 , , 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)
 IMPLEMENT_DYNAMIC_CLASS(wxStaticBitmap, wxControl)

+#endif
+
+/*
+       TODO PROPERTIES :
+               bitmap
+*/

 
 // ===========================================================================
 // implementation
 
 // ===========================================================================
 // implementation


@@ -52,88 +105,88 @@ IMPLEMENT_DYNAMIC_CLASS(wxStaticBitmap, wxControl)
 // wxStaticBitmap
 // ---------------------------------------------------------------------------
 
 // wxStaticBitmap
 // ---------------------------------------------------------------------------
 

-bool wxStaticBitmap::Create(wxWindow *parent, wxWindowID id,
-                            const wxGDIImage& bitmap,
-                            const wxPoint& pos,
-                            const wxSize& size,
-                            long style,
-                            const wxString& name)
+// 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 )

 {
 {

-    Init();
+    bool isIcon = bitmap.IsKindOf( CLASSINFO(wxIcon) );

 
 

-    SetName(name);
-    if (parent)
-        parent->AddChild(this);
+    if( !isIcon )
+    {
+        wxASSERT_MSG( wxDynamicCast(&bitmap, wxBitmap),
+                      _T("not an icon and not a bitmap?") );

 
 

-    m_backgroundColour = parent->GetBackgroundColour() ;
-    m_foregroundColour = parent->GetForegroundColour() ;
+        const wxBitmap& bmp = (const wxBitmap&)bitmap;
+        wxMask *mask = bmp.GetMask();
+        if ( mask && mask->GetMaskBitmap() )
+        {
+            wxIcon* icon = new wxIcon;
+            icon->CopyFromBitmap(bmp);

 
 

-    if ( id == -1 )
-        m_windowId = (int)NewControlId();
-    else
-        m_windowId = id;
+            return icon;
+        }

 
 

-    int x = pos.x;
-    int y = pos.y;
-    int width = size.x;
-    int height = size.y;
+        return new wxBitmap( bmp );
+    }

 
 

-    m_windowStyle = style;
+    // 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)
+{
+    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
 
     // 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

-    wxIcon *icon = (wxIcon *)NULL;
+    wxGDIImage *image = (wxGDIImage *)NULL;

     m_isIcon = bitmap.IsKindOf(CLASSINFO(wxIcon));
     m_isIcon = bitmap.IsKindOf(CLASSINFO(wxIcon));

-    if ( !m_isIcon )
-    {
-        const wxBitmap& bmp = (const wxBitmap&)bitmap;
-        wxMask *mask = bmp.GetMask();
-        if ( mask && mask->GetMaskBitmap() )
-        {
-            icon = new wxIcon;
-            icon->CopyFromBitmap(bmp);

 
 

-            m_isIcon = TRUE;
-        }
-    }
+    image = ConvertImage( bitmap );
+    m_isIcon = image->IsKindOf( CLASSINFO(wxIcon) );

 
 

-#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;
+    }

 
 

-    m_hWnd = (WXHWND)::CreateWindow
-                       (
-                        classname,
-                        wxT(""),
-                        // NOT DISABLED!!! We want to move it in Dialog Editor.
-                        winstyle | WS_CHILD | WS_VISIBLE, // | WS_DISABLED,
-                        0, 0, 0, 0,
-                        (HWND)parent->GetHWND(),
-                        (HMENU)m_windowId,
-                        wxGetInstance(),
-                        NULL
-                       );
+    // no need to delete the new image
+    SetImageNoCopy(image);

 
 

-    wxCHECK_MSG( m_hWnd, FALSE, wxT("Failed to create static bitmap") );
+    return TRUE;
+}

 
 

-    SetImage(icon ? icon : &bitmap);
-    delete icon; // may be NULL, ok
+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
 }
 
 bool wxStaticBitmap::ImageIsOk() const


@@ -155,25 +208,19 @@ wxSize wxStaticBitmap::DoGetBestSize() const
     return wxWindow::DoGetBestSize();
 }
 
     return wxWindow::DoGetBestSize();
 }
 

-void wxStaticBitmap::SetImage(const wxGDIImage* image)
+void wxStaticBitmap::SetImage( const wxGDIImage* image )

 {
 {

-    Free();
-
-    const wxIcon *icon = wxDynamicCast(image, wxIcon);
-    m_isIcon = icon != NULL;
-    if ( m_isIcon )
-    {
-        m_image = new wxIcon(*icon);
-    }
-    else
-    {
-        wxASSERT_MSG( wxDynamicCast(image, wxBitmap),
-                      _T("not an icon and not a bitmap?") );
+    wxGDIImage* convertedImage = ConvertImage( *image );
+    SetImageNoCopy( convertedImage );
+}

 
 

-        const wxBitmap *bitmap = (wxBitmap *)image;
+void wxStaticBitmap::SetImageNoCopy( wxGDIImage* image)
+{
+    Free();

 
 

-        m_image = new wxBitmap(*bitmap);
-    }
+    m_isIcon = image->IsKindOf( CLASSINFO(wxIcon) );
+    // the image has already been copied
+    m_image = image;

 
     int x, y;
     int w, h;
 
     int x, y;
     int w, h;


@@ -182,6 +229,9 @@ void wxStaticBitmap::SetImage(const wxGDIImage* image)
 
 #ifdef __WIN32__
     HANDLE handle = (HANDLE)m_image->GetHandle();
 
 #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
     ::SendMessage(GetHwnd(), STM_SETIMAGE,
                   m_isIcon ? IMAGE_ICON : IMAGE_BITMAP, (LPARAM)handle);
 #endif // Win32


@@ -207,55 +257,19 @@ void wxStaticBitmap::SetImage(const wxGDIImage* image)
     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;
-}
-#endif // Win16
-

 // We need this or the control can never be moved e.g. in Dialog Editor.
 // We need this or the control can never be moved e.g. in Dialog Editor.

-long wxStaticBitmap::MSWWindowProc(WXUINT nMsg,
+WXLRESULT wxStaticBitmap::MSWWindowProc(WXUINT nMsg,

                                    WXWPARAM wParam,
                                    WXLPARAM lParam)
 {
                                    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;
     // 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);
 }
 
 
     return wxWindow::MSWWindowProc(nMsg, wParam, lParam);
 }
 

+#endif // wxUSE_STATBMP