2 warnings from Solaris build log fixed

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

diff --git a/src/motif/statbmp.cpp b/src/motif/statbmp.cpp
index 05acdc7411769e44dcc6dddcc4549ad57715d914..9d8c27fd0030838097ea83740b8a6a27b589967c 100644 (file)
--- a/src/motif/statbmp.cpp
+++ b/src/motif/statbmp.cpp
@@ -6,7 +6,7 @@
 // Created:     17/09/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:    wxWindows licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
@@ -15,10 +15,21 @@
 
 #include "wx/statbmp.h"
 
-#if !USE_SHARED_LIBRARY
-IMPLEMENT_DYNAMIC_CLASS(wxStaticBitmap, wxControl)
+#ifdef __VMS__
+#pragma message disable nosimpint
+#endif
+#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"
+
+IMPLEMENT_DYNAMIC_CLASS(wxStaticBitmap, wxControl)
+
 /*
  * wxStaticBitmap
  */
@@ -32,28 +43,94 @@ bool wxStaticBitmap::Create(wxWindow *parent, wxWindowID id,
 {
     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();
+        m_windowId = (int)NewControlId();
     else
-           m_windowId = id;
+        m_windowId = id;
 
     m_windowStyle = style;
 
-    // TODO: create static bitmap control
-    return FALSE;
+    Widget parentWidget = (Widget) parent->GetClientWidget();
+
+    m_mainWidget = (WXWidget) XtVaCreateManagedWidget ("staticBitmap",
+#if USE_GADGETS
+                    xmLabelGadgetClass, parentWidget,
+#else
+                    xmLabelWidgetClass, parentWidget,
+#endif
+                    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);
+    AttachWidget (parent, m_mainWidget, (WXWidget) NULL, pos.x, pos.y, size.x, size.y);
+
+    ChangeBackgroundColour ();
+
+    return TRUE;
 }
 
-void wxStaticBitmap::SetSize(int x, int y, int width, int height, int sizeFlags)
+wxStaticBitmap::~wxStaticBitmap()
 {
-    // TODO
+    SetBitmap(wxNullBitmap);
 }
 
 void wxStaticBitmap::SetBitmap(const wxBitmap& bitmap)
 {
     m_messageBitmap = bitmap;
 
-    // TODO: redraw bitmap
+    Widget widget = (Widget) m_mainWidget;
+    int x, y, w1, h1, w2, h2;
+
+    GetPosition(&x, &y);
+
+    if (bitmap.Ok())
+    {
+        w2 = bitmap.GetWidth();
+        h2 = bitmap.GetHeight();
+        XtVaSetValues (widget,
+            XmNlabelPixmap, ((wxBitmap&)bitmap).GetLabelPixmap (widget),
+            XmNlabelType, XmPIXMAP,
+            NULL);
+        GetSize(&w1, &h1);
+
+        if (! (w1 == w2) && (h1 == h2))
+            SetSize(x, y, w2, h2);
+    }
+    else
+    {
+        // Null bitmap: must not use current pixmap
+        // since it is no longer valid.
+        XtVaSetValues (widget,
+            XmNlabelType, XmSTRING,
+            XmNlabelPixmap, XmUNSPECIFIED_PIXMAP,
+            NULL);
+    }
+}
+
+void wxStaticBitmap::ChangeFont(bool keepOriginalSize)
+{
+    wxWindow::ChangeFont(keepOriginalSize);
+}
+
+void wxStaticBitmap::ChangeBackgroundColour()
+{
+    wxWindow::ChangeBackgroundColour();
+}
+
+void wxStaticBitmap::ChangeForegroundColour()
+{
+    wxWindow::ChangeForegroundColour();
 }