some more build fix for wxPen/wxBrush style changes

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

diff --git a/src/motif/statbmp.cpp b/src/motif/statbmp.cpp
index 49fe6c600a0382751105c0c7f31b732b4510214b..89a74c3792d27dfcc38404b36048635dffad6f55 100644 (file)
--- a/src/motif/statbmp.cpp
+++ b/src/motif/statbmp.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        statbmp.cpp
+// Name:        src/motif/statbmp.cpp
 // Purpose:     wxStaticBitmap
 // Author:      Julian Smart
 // Modified by:
@@ -9,11 +9,8 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
-#pragma implementation "statbmp.h"
-#endif
-
-#include "wx/defs.h"
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
 
 #include "wx/statbmp.h"
 
@@ -23,7 +20,6 @@
 #include <Xm/Xm.h>
 #include <Xm/Label.h>
 #include <Xm/LabelG.h>
-#include <Xm/RowColumn.h>
 #ifdef __VMS__
 #pragma message enable nosimpint
 #endif
@@ -43,23 +39,18 @@ bool wxStaticBitmap::Create(wxWindow *parent, wxWindowID id,
            long style,
            const wxString& name)
 {
-    m_messageBitmap = bitmap;
-    SetName(name);
-    m_backgroundColour = parent->GetBackgroundColour();
-    m_foregroundColour = parent->GetForegroundColour();
-    if (parent) parent->AddChild(this);
+    if( !CreateControl( parent, id, pos, size, style, wxDefaultValidator,
+                        name ) )
+        return false;
+    PreCreation();
 
-    if ( id == -1 )
-        m_windowId = (int)NewControlId();
-    else
-        m_windowId = id;
-
-    m_windowStyle = style;
+    m_messageBitmap = bitmap;
+    m_messageBitmapOriginal = bitmap;
 
     Widget parentWidget = (Widget) parent->GetClientWidget();
 
     m_mainWidget = (WXWidget) XtVaCreateManagedWidget ("staticBitmap",
-#if USE_GADGETS
+#if wxUSE_GADGETS
                     xmLabelGadgetClass, parentWidget,
 #else
                     xmLabelWidgetClass, parentWidget,
@@ -67,26 +58,19 @@ 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);
-
-    m_font = parent->GetFont();
-    ChangeFont(FALSE);
-
-    SetCanAddEventHandler(TRUE);
-
     wxSize actualSize(size);
+    // work around the cases where the bitmap is a wxNull(Icon/Bitmap)
     if (actualSize.x == -1)
-      actualSize.x = bitmap.GetWidth();
+        actualSize.x = bitmap.Ok() ? bitmap.GetWidth() : 1;
     if (actualSize.y == -1)
-      actualSize.y = bitmap.GetHeight();
-    AttachWidget (parent, m_mainWidget, (WXWidget) NULL, pos.x, pos.y, actualSize.x, actualSize.y);
+        actualSize.y = bitmap.Ok() ? bitmap.GetHeight() : 1;
 
-    ChangeBackgroundColour ();
+    PostCreation();
+    DoSetBitmap();
+    AttachWidget (parent, m_mainWidget, (WXWidget) NULL,
+                  pos.x, pos.y, actualSize.x, actualSize.y);
 
-    return TRUE;
+    return true;
 }
 
 wxStaticBitmap::~wxStaticBitmap()
@@ -94,27 +78,46 @@ 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;
+    int 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())
+        {
+            WXPixel 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);
 
-        if (! (w1 == w2) && (h1 == h2))
-            SetSize(x, y, w2, h2);
+        SetSize(w2, h2);
     }
     else
     {
@@ -127,18 +130,25 @@ void wxStaticBitmap::SetBitmap(const wxBitmap& bitmap)
     }
 }
 
-void wxStaticBitmap::ChangeFont(bool keepOriginalSize)
+void wxStaticBitmap::SetBitmap(const wxBitmap& bitmap)
 {
-    wxWindow::ChangeFont(keepOriginalSize);
+    m_messageBitmap = bitmap;
+    m_messageBitmapOriginal = bitmap;
+
+    DoSetBitmap();
 }
 
 void wxStaticBitmap::ChangeBackgroundColour()
 {
     wxWindow::ChangeBackgroundColour();
+
+    // must recalculate the background colour
+    m_bitmapCache.SetColoursChanged();
+    DoSetBitmap();
 }
 
 void wxStaticBitmap::ChangeForegroundColour()
 {
+    m_bitmapCache.SetColoursChanged();
     wxWindow::ChangeForegroundColour();
 }
-