X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ad81651f00edc6f489d9b6a0839d316a964fd521..b0feedc5dbfedd81a749f452adee3147916b973a:/src/motif/statbmp.cpp?ds=sidebyside

diff --git a/src/motif/statbmp.cpp b/src/motif/statbmp.cpp
index 9d8c27fd00..c10ac0d74a 100644
--- a/src/motif/statbmp.cpp
+++ b/src/motif/statbmp.cpp
@@ -13,6 +13,8 @@
 #pragma implementation "statbmp.h"
 #endif
 
+#include "wx/defs.h"
+
 #include "wx/statbmp.h"
 
 #ifdef __VMS__
@@ -42,6 +44,7 @@ bool wxStaticBitmap::Create(wxWindow *parent, wxWindowID id,
            const wxString& name)
 {
     m_messageBitmap = bitmap;
+    m_messageBitmapOriginal = bitmap;
     SetName(name);
     m_backgroundColour = parent->GetBackgroundColour();
     m_foregroundColour = parent->GetForegroundColour();
@@ -65,18 +68,20 @@ bool wxStaticBitmap::Create(wxWindow *parent, wxWindowID id,
                     XmNalignment, XmALIGNMENT_BEGINNING,
                     NULL);
 
-    XtVaSetValues ((Widget) m_mainWidget,
-                    XmNlabelPixmap, (Pixmap) ((wxBitmap&)bitmap).GetLabelPixmap (m_mainWidget),
-                    XmNlabelType, XmPIXMAP,
-                    NULL);
+    ChangeBackgroundColour ();
+
+    DoSetBitmap();
 
     m_font = parent->GetFont();
     ChangeFont(FALSE);
 
-    SetCanAddEventHandler(TRUE);
-    AttachWidget (parent, m_mainWidget, (WXWidget) NULL, pos.x, pos.y, size.x, size.y);
-
-    ChangeBackgroundColour ();
+    wxSize actualSize(size);
+    // work around the cases where the bitmap is a wxNull(Icon/Bitmap)
+    if (actualSize.x == -1)
+        actualSize.x = bitmap.GetWidth() ? bitmap.GetWidth() : 1;
+    if (actualSize.y == -1)
+        actualSize.y = bitmap.GetHeight() ? bitmap.GetHeight() : 1;
+    AttachWidget (parent, m_mainWidget, (WXWidget) NULL, pos.x, pos.y, actualSize.x, actualSize.y);
 
     return TRUE;
 }
@@ -86,21 +91,44 @@ wxStaticBitmap::~wxStaticBitmap()
     SetBitmap(wxNullBitmap);
 }
 
-void wxStaticBitmap::SetBitmap(const wxBitmap& bitmap)
+void wxStaticBitmap::DoSetBitmap()
 {
-    m_messageBitmap = bitmap;
-
     Widget widget = (Widget) m_mainWidget;
     int x, y, w1, h1, w2, h2;
 
     GetPosition(&x, &y);
 
-    if (bitmap.Ok())
+    if (m_messageBitmapOriginal.Ok())
     {
-        w2 = bitmap.GetWidth();
-        h2 = bitmap.GetHeight();
+        w2 = m_messageBitmapOriginal.GetWidth();
+        h2 = m_messageBitmapOriginal.GetHeight();
+
+        Pixmap pixmap;
+
+        // Must re-make the bitmap to have its transparent areas drawn
+        // in the current widget background colour.
+        if (m_messageBitmapOriginal.GetMask())
+        {
+            int backgroundPixel;
+            XtVaGetValues( widget, XmNbackground, &backgroundPixel,
+                NULL);
+
+            wxColour col;
+            col.SetPixel(backgroundPixel);
+
+            wxBitmap newBitmap = wxCreateMaskedBitmap(m_messageBitmapOriginal, col);
+            m_messageBitmap = newBitmap;
+
+            pixmap = (Pixmap) m_messageBitmap.GetDrawable();
+        }
+        else
+        {
+            m_bitmapCache.SetBitmap( m_messageBitmap );
+            pixmap = (Pixmap)m_bitmapCache.GetLabelPixmap(widget);
+        }
+
         XtVaSetValues (widget,
-            XmNlabelPixmap, ((wxBitmap&)bitmap).GetLabelPixmap (widget),
+            XmNlabelPixmap, pixmap,
             XmNlabelType, XmPIXMAP,
             NULL);
         GetSize(&w1, &h1);
@@ -116,7 +144,15 @@ void wxStaticBitmap::SetBitmap(const wxBitmap& bitmap)
             XmNlabelType, XmSTRING,
             XmNlabelPixmap, XmUNSPECIFIED_PIXMAP,
             NULL);
-    }
+    }    
+}
+
+void wxStaticBitmap::SetBitmap(const wxBitmap& bitmap)
+{
+    m_messageBitmap = bitmap;
+    m_messageBitmapOriginal = bitmap;
+
+    DoSetBitmap();
 }
 
 void wxStaticBitmap::ChangeFont(bool keepOriginalSize)
@@ -127,10 +163,15 @@ void wxStaticBitmap::ChangeFont(bool keepOriginalSize)
 void wxStaticBitmap::ChangeBackgroundColour()
 {
     wxWindow::ChangeBackgroundColour();
+
+    // must recalculate the background colour
+    m_bitmapCache.SetColoursChanged();
+    DoSetBitmap();
 }
 
 void wxStaticBitmap::ChangeForegroundColour()
 {
+    m_bitmapCache.SetColoursChanged();
     wxWindow::ChangeForegroundColour();
 }