freeze whole window for TLW

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

diff --git a/src/msw/statbmp.cpp b/src/msw/statbmp.cpp
index fbdba6ccc56cb263ac907cc5ec178aed90b7dcd1..4a460f8816a0ecb69bf7c316d1680ed64d3ad4da 100644 (file)
--- 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:
 // Purpose:     wxStaticBitmap
 // Author:      Julian Smart
 // Modified by:


@@ -26,14 +26,17 @@
 
 #if wxUSE_STATBMP
 
 
 #if wxUSE_STATBMP
 

-#include "wx/window.h"
-#include "wx/msw/private.h"
+#include "wx/statbmp.h"

 
 #ifndef WX_PRECOMP
 
 #ifndef WX_PRECOMP

+    #include "wx/app.h"
+    #include "wx/window.h"

     #include "wx/icon.h"
     #include "wx/icon.h"

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

 #endif
 
 #endif
 

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

 #include "wx/sysopt.h"
 
 #include <stdio.h>
 #include "wx/sysopt.h"
 
 #include <stdio.h>


@@ -116,7 +119,7 @@ static wxGDIImage* ConvertImage( const wxGDIImage& bitmap )
     if( !isIcon )
     {
         wxASSERT_MSG( wxDynamicCast(&bitmap, wxBitmap),
     if( !isIcon )
     {
         wxASSERT_MSG( wxDynamicCast(&bitmap, wxBitmap),

-                      _T("not an icon and not a bitmap?") );
+                      wxT("not an icon and not a bitmap?") );

 
         const wxBitmap& bmp = (const wxBitmap&)bitmap;
         wxMask *mask = bmp.GetMask();
 
         const wxBitmap& bmp = (const wxBitmap&)bitmap;
         wxMask *mask = bmp.GetMask();


@@ -155,7 +158,7 @@ bool wxStaticBitmap::Create(wxWindow *parent,
     m_isIcon = image->IsKindOf( CLASSINFO(wxIcon) );
 
     // create the native control
     m_isIcon = image->IsKindOf( CLASSINFO(wxIcon) );
 
     // create the native control

-    if ( !MSWCreateControl(_T("STATIC"), wxEmptyString, pos, size) )
+    if ( !MSWCreateControl(wxT("STATIC"), wxEmptyString, pos, size) )

     {
         // control creation failed
         return false;
     {
         // control creation failed
         return false;


@@ -165,16 +168,26 @@ bool wxStaticBitmap::Create(wxWindow *parent,
     SetImageNoCopy(image);
 
     // GetBestSize will work properly now, so set the best size if needed
     SetImageNoCopy(image);
 
     // GetBestSize will work properly now, so set the best size if needed

-    SetBestSize(size);
+    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__

 
     return true;
 }
 
 
     return true;
 }
 

-wxBorder wxStaticBitmap::GetDefaultBorder() const
-{
-    return wxBORDER_NONE;
-}
-

 WXDWORD wxStaticBitmap::MSWGetStyle(long style, WXDWORD *exstyle) const
 {
     WXDWORD msStyle = wxControl::MSWGetStyle(style, exstyle);
 WXDWORD wxStaticBitmap::MSWGetStyle(long style, WXDWORD *exstyle) const
 {
     WXDWORD msStyle = wxControl::MSWGetStyle(style, exstyle);


@@ -196,6 +209,34 @@ bool wxStaticBitmap::ImageIsOk() const
     return m_image && m_image->Ok();
 }
 
     return m_image && m_image->Ok();
 }
 

+wxIcon wxStaticBitmap::GetIcon() const
+{
+    wxCHECK_MSG( m_image, wxIcon(), wxT("no image in wxStaticBitmap") );
+
+    // we can't ask for an icon if all we have is a bitmap
+    wxCHECK_MSG( m_isIcon, wxIcon(), wxT("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(), wxT("no image in wxStaticBitmap") );
+
+        return *(wxBitmap *)m_image;
+    }
+}
+

 void wxStaticBitmap::Free()
 {
     delete m_image;
 void wxStaticBitmap::Free()
 {
     delete m_image;


@@ -216,6 +257,32 @@ wxSize wxStaticBitmap::DoGetBestSize() const
     return wxSize(16, 16);
 }
 
     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 );
 void wxStaticBitmap::SetImage( const wxGDIImage* image )
 {
     wxGDIImage* convertedImage = ConvertImage( *image );


@@ -241,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 ) );
     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);
                   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() )
 #endif // Win32
 
     if ( ImageIsOk() )


@@ -267,4 +342,3 @@ void wxStaticBitmap::SetImageNoCopy( wxGDIImage* image)
 }
 
 #endif // wxUSE_STATBMP
 }
 
 #endif // wxUSE_STATBMP

-