Fixed toolbar crash for MinGW/Cygwin

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

diff --git a/src/msw/statbmp.cpp b/src/msw/statbmp.cpp
index 89f992643f7c6f35e48f55400d92e326efee4d92..a93d50a7a5077e4e815e3327b83f08ecf15e64e7 100644 (file)
--- a/src/msw/statbmp.cpp
+++ b/src/msw/statbmp.cpp
@@ -9,156 +9,250 @@
 // Licence:     wxWindows license
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows license
 /////////////////////////////////////////////////////////////////////////////
 

+// ===========================================================================
+// declarations
+// ===========================================================================
+
+// ---------------------------------------------------------------------------
+// headers
+// ---------------------------------------------------------------------------
+

 #ifdef __GNUG__
 #ifdef __GNUG__

-#pragma implementation "statbmp.h"
+    #pragma implementation "statbmp.h"

 #endif
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
 #endif
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__

-#pragma hdrstop
+    #pragma hdrstop

 #endif
 
 #endif
 

+#if wxUSE_STATBMP
+
+#include "wx/window.h"
+#include "wx/msw/private.h"
+

 #ifndef WX_PRECOMP
 #ifndef WX_PRECOMP

-#include "wx/statbmp.h"
+    #include "wx/icon.h"
+    #include "wx/statbmp.h"

 #endif
 
 #include <stdio.h>
 #endif
 
 #include <stdio.h>

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

 
 

-#if !USE_SHARED_LIBRARY
+// ---------------------------------------------------------------------------
+// macors
+// ---------------------------------------------------------------------------
+

 IMPLEMENT_DYNAMIC_CLASS(wxStaticBitmap, wxControl)
 IMPLEMENT_DYNAMIC_CLASS(wxStaticBitmap, wxControl)

-#endif

 
 

-/*
- * wxStaticBitmap
- */
+// ===========================================================================
+// implementation
+// ===========================================================================

 
 

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

 {
 {

-  m_messageBitmap = bitmap;
-  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;
-
-  if ( width < 0 && bitmap.Ok() )
-    width = bitmap.GetWidth();
-  if ( height < 0 && bitmap.Ok() )
-    height = bitmap.GetHeight();
-
-  m_windowStyle = style;
-
-  // Use an ownerdraw button to produce a static bitmap, since there's
-  // no ownerdraw static.
-  // TODO: perhaps this should be a static item, with style SS_BITMAP.
-  m_hWnd = (WXHWND)CreateWindow
-           (
-            "BUTTON",
-            "",
-            BS_OWNERDRAW | WS_TABSTOP | WS_CHILD | WS_VISIBLE,
-            0, 0, 0, 0,
-            (HWND)parent->GetHWND(),
-            (HMENU)m_windowId,
-            wxGetInstance(),
-            NULL
-           );
-
-  // Subclass again for purposes of dialog editing mode
-  SubclassWin(m_hWnd);
-
-  SetFont(GetParent()->GetFont());
-
-  SetSize(x, y, width, height);
-  return TRUE;
+    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 );

 }
 
 }
 

-void wxStaticBitmap::SetSize(int x, int y, int width, int height, int sizeFlags)
+#endif
+
+bool wxStaticBitmap::Create(wxWindow *parent, wxWindowID id,
+                            const wxGDIImage& bitmap,
+                            const wxPoint& pos,
+                            const wxSize& size,
+                            long style,
+                            const wxString& name)

 {
 {

-  int currentX, currentY;
-  GetPosition(&currentX, &currentY);
-  int x1 = x;
-  int y1 = y;
+    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;

 
 

-  if (x == -1 || (sizeFlags & wxSIZE_ALLOW_MINUS_ONE))
-    x1 = currentX;
-  if (y == -1 || (sizeFlags & wxSIZE_ALLOW_MINUS_ONE))
-    y1 = currentY;
+    int x = pos.x;
+    int y = pos.y;
+    int width = size.x;
+    int height = size.y;

 
 

-  AdjustForParentClientOrigin(x1, y1, sizeFlags);
+    m_windowStyle = style;

 
 

-  int actualWidth = width;
-  int actualHeight = height;
+    // 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));

 
 

-  int ww, hh;
-  GetSize(&ww, &hh);
+#ifdef __WIN16__
+    wxASSERT_MSG( !m_isIcon, "Icons are not supported in wxStaticBitmap under WIN16." );
+    image = &bitmap;
+#endif
+
+#ifndef __WIN16__
+    image = ConvertImage( bitmap );
+    m_isIcon = image->IsKindOf( CLASSINFO(wxIcon) );
+#endif

 
 

-  // If we're prepared to use the existing width, then...
-  if (width == -1 && ((sizeFlags & wxSIZE_AUTO_WIDTH) != wxSIZE_AUTO_WIDTH))
-    actualWidth = ww;
-  else actualWidth = width;
+#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

 
 

-  // If we're prepared to use the existing height, then...
-  if (height == -1 && ((sizeFlags & wxSIZE_AUTO_HEIGHT) != wxSIZE_AUTO_HEIGHT))
-    actualHeight = hh;
-  else actualHeight = height;
+    if ( m_windowStyle & wxCLIP_SIBLINGS )
+        winstyle |= WS_CLIPSIBLINGS;

 
 

-  MoveWindow((HWND) GetHWND(), x1, y1, actualWidth, actualHeight, TRUE);
+
+    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
+                       );
+
+    wxCHECK_MSG( m_hWnd, FALSE, wxT("Failed to create static bitmap") );
+
+    // no need to delete the new image
+    SetImageNoCopy( image );
+
+    // Subclass again for purposes of dialog editing mode
+    SubclassWin(m_hWnd);
+
+    SetFont(GetParent()->GetFont());
+
+    SetSize(x, y, width, height);
+
+    return TRUE;

 }
 
 }
 

-void wxStaticBitmap::SetBitmap(const wxBitmap& bitmap)
+bool wxStaticBitmap::ImageIsOk() const

 {
 {

-  m_messageBitmap = bitmap;
-
-  int x, y;
-  int w, h;
-  GetPosition(&x, &y);
-  GetSize(&w, &h);
-  RECT rect;
-  rect.left = x; rect.top = y; rect.right = x + w; rect.bottom = y + h;
-
-  if ( bitmap.Ok() )
-    MoveWindow((HWND) GetHWND(), x, y, bitmap.GetWidth(), bitmap.GetHeight(),
-             FALSE);
-  
-  InvalidateRect((HWND) GetParent()->GetHWND(), &rect, TRUE);
+    return m_image && m_image->Ok();

 }
 
 }
 

-bool wxStaticBitmap::MSWOnDraw(WXDRAWITEMSTRUCT *item)
+void wxStaticBitmap::Free()

 {
 {

-    long style = GetWindowLong((HWND) GetHWND(), GWL_STYLE);
-#if defined(__WIN32__) && defined(SS_BITMAP)
-    if ((style & 0xFF) == SS_BITMAP)
-    {
-        // Should we call Default() here?
-//      Default();
+    delete m_image;

 
 

-        // Let default procedure draw the bitmap, which is defined
-        // in the Windows resource.
-        return FALSE;
+    m_image = NULL;
+}
+
+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();
+}
+
+void wxStaticBitmap::SetImage( const wxGDIImage* image )
+{
+    wxGDIImage* convertedImage = ConvertImage( *image );
+    SetImageNoCopy( convertedImage );
+}
+
+void wxStaticBitmap::SetImageNoCopy( wxGDIImage* image)
+{
+    Free();
+
+    m_isIcon = image->IsKindOf( CLASSINFO(wxIcon) );
+    // the image has already been copied
+    m_image = image;
+
+    int x, y;
+    int w, h;
+    GetPosition(&x, &y);
+    GetSize(&w, &h);
+
+#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 = image->GetWidth(),
+            height = image->GetHeight();
+        if ( width && height )
+        {
+            w = width;
+            h = height;
+
+            ::MoveWindow(GetHwnd(), x, y, width, height, FALSE);
+        }

     }
     }

-#endif

 
 

+    RECT rect;
+    rect.left   = x;
+    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;
 
     LPDRAWITEMSTRUCT lpDIS = (LPDRAWITEMSTRUCT) item;
 

-    wxBitmap* bitmap = &m_messageBitmap;
+    wxCHECK_MSG( !m_isIcon, FALSE, _T("icons not supported in wxStaticBitmap") );
+
+    wxBitmap* bitmap = (wxBitmap *)m_image;

     if ( !bitmap->Ok() )
         return FALSE;
 
     if ( !bitmap->Ok() )
         return FALSE;
 


@@ -170,10 +264,10 @@ bool wxStaticBitmap::MSWOnDraw(WXDRAWITEMSTRUCT *item)
     if (!old)
         return FALSE;
 
     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;
+    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));
 
     // Centre the bitmap in the control area
     int x1 = (int) (x + ((width - bitmap->GetWidth()) / 2));


@@ -187,14 +281,19 @@ bool wxStaticBitmap::MSWOnDraw(WXDRAWITEMSTRUCT *item)
 
     return TRUE;
 }
 
     return TRUE;
 }

+#endif // Win16

 
 

-long wxStaticBitmap::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam)
+// 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;
+    // 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);
+    return wxWindow::MSWWindowProc(nMsg, wParam, lParam);

 }
 
 }
 

+#endif // wxUSE_STATBMP