1. wxStaticBitmap now uses mask even for bitmaps (and not only icons)

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

diff --git a/src/motif/statbmp.cpp b/src/motif/statbmp.cpp
index ba3ae76b292ca0bd249f41062b64f4e370403f12..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,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;
 
@@ -66,7 +70,7 @@ bool wxStaticBitmap::Create(wxWindow *parent, wxWindowID id,
                     XmNlabelType, XmPIXMAP,
                     NULL);
 
-    m_windowFont = parent->GetFont();
+    m_font = parent->GetFont();
     ChangeFont(FALSE);
 
     SetCanAddEventHandler(TRUE);
@@ -98,7 +102,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))