Add wxDataViewCtrl::GTKPathToItem() function and use it.

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

diff --git a/src/msw/statbmp.cpp b/src/msw/statbmp.cpp
index 511fb26ff7125b554a300d882590edc2e679a49f..fbaf004ad1f5b429abc0ba5092dd1ab4b719bf7c 100644 (file)
--- a/src/msw/statbmp.cpp
+++ b/src/msw/statbmp.cpp
@@ -29,8 +29,10 @@
 #include "wx/statbmp.h"
 
 #ifndef WX_PRECOMP
 #include "wx/statbmp.h"
 
 #ifndef WX_PRECOMP

+    #include "wx/app.h"

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

+    #include "wx/dcclient.h"

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


@@ -117,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();


@@ -156,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;


@@ -168,13 +170,20 @@ bool wxStaticBitmap::Create(wxWindow *parent,
     // GetBestSize will work properly now, so set the best size if needed
     SetInitialSize(size);
 
     // GetBestSize will work properly now, so set the best size if needed
     SetInitialSize(size);
 

-    // Win9x and 2000 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 ( wxGetWinVersion() <= wxWinVersion_2000 )
+    // 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));
     }
     {
         Connect(wxEVT_PAINT, wxPaintEventHandler(wxStaticBitmap::DoPaintManually));
     }

+#endif // !__WXWINCE__

 
     return true;
 }
 
     return true;
 }


@@ -202,10 +211,10 @@ bool wxStaticBitmap::ImageIsOk() const
 
 wxIcon wxStaticBitmap::GetIcon() const
 {
 
 wxIcon wxStaticBitmap::GetIcon() const
 {

-    wxCHECK_MSG( m_image, wxIcon(), _T("no image in wxStaticBitmap") );
+    wxCHECK_MSG( m_image, wxIcon(), wxT("no image in wxStaticBitmap") );

 
     // we can't ask for an icon if all we have is a bitmap
 
     // 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") );
+    wxCHECK_MSG( m_isIcon, wxIcon(), wxT("no icon in this wxStaticBitmap") );

 
     return *(wxIcon *)m_image;
 }
 
     return *(wxIcon *)m_image;
 }


@@ -222,7 +231,7 @@ wxBitmap wxStaticBitmap::GetBitmap() const
     }
     else // we have a bitmap
     {
     }
     else // we have a bitmap
     {

-        wxCHECK_MSG( m_image, wxBitmap(), _T("no image in wxStaticBitmap") );
+        wxCHECK_MSG( m_image, wxBitmap(), wxT("no image in wxStaticBitmap") );

 
         return *(wxBitmap *)m_image;
     }
 
         return *(wxBitmap *)m_image;
     }


@@ -230,9 +239,7 @@ wxBitmap wxStaticBitmap::GetBitmap() const
 
 void wxStaticBitmap::Free()
 {
 
 void wxStaticBitmap::Free()
 {

-    delete m_image;
-
-    m_image = NULL;
+    wxDELETE(m_image);

 }
 
 wxSize wxStaticBitmap::DoGetBestSize() const
 }
 
 wxSize wxStaticBitmap::DoGetBestSize() const


@@ -248,6 +255,8 @@ wxSize wxStaticBitmap::DoGetBestSize() const
     return wxSize(16, 16);
 }
 
     return wxSize(16, 16);
 }
 

+#ifndef __WXWINCE__
+

 void wxStaticBitmap::DoPaintManually(wxPaintEvent& WXUNUSED(event))
 {
     wxPaintDC dc(this);
 void wxStaticBitmap::DoPaintManually(wxPaintEvent& WXUNUSED(event))
 {
     wxPaintDC dc(this);


@@ -255,8 +264,11 @@ void wxStaticBitmap::DoPaintManually(wxPaintEvent& WXUNUSED(event))
     const wxSize size(GetSize());
     const wxBitmap bmp(GetBitmap());
 
     const wxSize size(GetSize());
     const wxBitmap bmp(GetBitmap());
 

-    // Clear the background
-    dc.SetBrush(GetBackgroundColour());
+    // 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());
 
     dc.SetPen(*wxTRANSPARENT_PEN);
     dc.DrawRectangle(0, 0, size.GetWidth(), size.GetHeight());
 


@@ -267,6 +279,8 @@ void wxStaticBitmap::DoPaintManually(wxPaintEvent& WXUNUSED(event))
                   true /* use mask */);
 }
 
                   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 );