background drawing uncommented again

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

diff --git a/src/motif/statbmp.cpp b/src/motif/statbmp.cpp
index ba3ae76b292ca0bd249f41062b64f4e370403f12..1226a83f61c5c002bf7a51f54373c4ea7e3a9429 100644 (file)
--- a/src/motif/statbmp.cpp
+++ b/src/motif/statbmp.cpp
@@ -6,25 +6,30 @@
 // Created:     17/09/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
 // Created:     17/09/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart

-// Licence:    wxWindows licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 /////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

 #pragma implementation "statbmp.h"
 #endif
 
 #pragma implementation "statbmp.h"
 #endif
 

+#include "wx/defs.h"
+

 #include "wx/statbmp.h"
 
 #include "wx/statbmp.h"
 

+#ifdef __VMS__
+#pragma message disable nosimpint
+#endif

 #include <Xm/Xm.h>
 #include <Xm/Label.h>
 #include <Xm/LabelG.h>
 #include <Xm/Xm.h>
 #include <Xm/Label.h>
 #include <Xm/LabelG.h>

-#include <Xm/RowColumn.h>
+#ifdef __VMS__
+#pragma message enable nosimpint
+#endif

 
 

-#include <wx/motif/private.h>
+#include "wx/motif/private.h"

 
 

-#if !USE_SHARED_LIBRARY

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

-#endif

 
 /*
  * wxStaticBitmap
 
 /*
  * wxStaticBitmap


@@ -37,18 +42,12 @@ bool wxStaticBitmap::Create(wxWindow *parent, wxWindowID id,
            long style,
            const wxString& name)
 {
            long style,
            const wxString& name)
 {

-    m_messageBitmap = bitmap;
-    SetName(name);
-    m_backgroundColour = parent->GetBackgroundColour();
-    m_foregroundColour = parent->GetForegroundColour();
-    if (parent) parent->AddChild(this);
-
-    if ( id == -1 )
-           m_windowId = (int)NewControlId();
-    else
-           m_windowId = id;
+    if( !CreateControl( parent, id, pos, size, style, wxDefaultValidator,
+                        name ) )
+        return false;

 
 

-    m_windowStyle = style;
+    m_messageBitmap = bitmap;
+    m_messageBitmapOriginal = bitmap;

 
     Widget parentWidget = (Widget) parent->GetClientWidget();
 
 
     Widget parentWidget = (Widget) parent->GetClientWidget();
 


@@ -61,20 +60,22 @@ bool wxStaticBitmap::Create(wxWindow *parent, wxWindowID id,
                     XmNalignment, XmALIGNMENT_BEGINNING,
                     NULL);
 
                     XmNalignment, XmALIGNMENT_BEGINNING,
                     NULL);
 

-    XtVaSetValues ((Widget) m_mainWidget,
-                    XmNlabelPixmap, (Pixmap) ((wxBitmap&)bitmap).GetLabelPixmap (m_mainWidget),
-                    XmNlabelType, XmPIXMAP,
-                    NULL);
+    ChangeBackgroundColour ();
+
+    DoSetBitmap();

 
 

-    m_windowFont = parent->GetFont();

     ChangeFont(FALSE);
 
     ChangeFont(FALSE);
 

-    SetCanAddEventHandler(TRUE);
-    AttachWidget (parent, m_mainWidget, (WXWidget) NULL, pos.x, pos.y, size.x, size.y);
+    wxSize actualSize(size);
+    // work around the cases where the bitmap is a wxNull(Icon/Bitmap)
+    if (actualSize.x == -1)
+        actualSize.x = bitmap.Ok() ? bitmap.GetWidth() : 1;
+    if (actualSize.y == -1)
+        actualSize.y = bitmap.Ok() ? bitmap.GetHeight() : 1;
+    AttachWidget (parent, m_mainWidget, (WXWidget) NULL,
+                  pos.x, pos.y, actualSize.x, actualSize.y);

 
 

-    ChangeBackgroundColour ();
-
-    return TRUE;
+    return true;

 }
 
 wxStaticBitmap::~wxStaticBitmap()
 }
 
 wxStaticBitmap::~wxStaticBitmap()


@@ -82,27 +83,46 @@ wxStaticBitmap::~wxStaticBitmap()
     SetBitmap(wxNullBitmap);
 }
 
     SetBitmap(wxNullBitmap);
 }
 

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

 {
 {

-    m_messageBitmap = bitmap;
-

     Widget widget = (Widget) m_mainWidget;
     Widget widget = (Widget) m_mainWidget;

-    int x, y, w1, h1, w2, h2;
-
-    GetPosition(&x, &y);
+    int w2, h2;

 
 

-    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,
         XtVaSetValues (widget,

-            XmNlabelPixmap, ((wxBitmap&)bitmap).GetLabelPixmap (widget),
+            XmNlabelPixmap, pixmap,

             XmNlabelType, XmPIXMAP,
             XmNlabelType, XmPIXMAP,

-                    NULL);
-        GetSize(&w1, &h1);
+            NULL);

 
 

-        if (! (w1 == w2) && (h1 == h2))
-            SetSize(x, y, w2, h2);
+        SetSize(w2, h2);

     }
     else
     {
     }
     else
     {


@@ -112,21 +132,29 @@ void wxStaticBitmap::SetBitmap(const wxBitmap& bitmap)
             XmNlabelType, XmSTRING,
             XmNlabelPixmap, XmUNSPECIFIED_PIXMAP,
             NULL);
             XmNlabelType, XmSTRING,
             XmNlabelPixmap, XmUNSPECIFIED_PIXMAP,
             NULL);

-    }
+    }    

 }
 
 }
 

-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();
 }
 
 void wxStaticBitmap::ChangeBackgroundColour()
 {
     wxWindow::ChangeBackgroundColour();

+
+    // must recalculate the background colour
+    m_bitmapCache.SetColoursChanged();
+    DoSetBitmap();

 }
 
 void wxStaticBitmap::ChangeForegroundColour()
 {
 }
 
 void wxStaticBitmap::ChangeForegroundColour()
 {

+    m_bitmapCache.SetColoursChanged();

     wxWindow::ChangeForegroundColour();
 }
 
     wxWindow::ChangeForegroundColour();
 }