added xpm

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

diff --git a/src/motif/statbmp.cpp b/src/motif/statbmp.cpp
index d4a8308d1acd2c5bb9f3149f8b9c7ca34b423ff0..3d35638883dc897a87809c70093988a292661f2e 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,16 +15,20 @@
 
 #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/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)
-#endif
 
 /*
  * wxStaticBitmap
@@ -44,9 +48,9 @@ bool wxStaticBitmap::Create(wxWindow *parent, wxWindowID id,
     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;
 
@@ -70,7 +74,13 @@ bool wxStaticBitmap::Create(wxWindow *parent, wxWindowID id,
     ChangeFont(FALSE);
 
     SetCanAddEventHandler(TRUE);
-    AttachWidget (parent, m_mainWidget, (WXWidget) NULL, pos.x, pos.y, size.x, size.y);
+
+    wxSize actualSize(size);
+    if (actualSize.x == -1)
+      actualSize.x = bitmap.GetWidth();
+    if (actualSize.y == -1)
+      actualSize.y = bitmap.GetHeight();
+    AttachWidget (parent, m_mainWidget, (WXWidget) NULL, pos.x, pos.y, actualSize.x, actualSize.y);
 
     ChangeBackgroundColour ();
 
@@ -98,7 +108,7 @@ void wxStaticBitmap::SetBitmap(const wxBitmap& bitmap)
         XtVaSetValues (widget,
             XmNlabelPixmap, ((wxBitmap&)bitmap).GetLabelPixmap (widget),
             XmNlabelType, XmPIXMAP,
-                    NULL);
+            NULL);
         GetSize(&w1, &h1);
 
         if (! (w1 == w2) && (h1 == h2))