X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c8ec0b3d36f0fd9057440fea71afd366bfbb99f1..43f4e852a1b2ac37c3db6a2b87315192ac549191:/src/motif/statbmp.cpp

diff --git a/src/motif/statbmp.cpp b/src/motif/statbmp.cpp
index 72a813f396..eea9bd71b9 100644
--- 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"
 
@@ -29,8 +26,6 @@
 
 #include "wx/motif/private.h"
 
-IMPLEMENT_DYNAMIC_CLASS(wxStaticBitmap, wxControl)
-
 /*
  * wxStaticBitmap
  */
@@ -45,6 +40,7 @@ bool wxStaticBitmap::Create(wxWindow *parent, wxWindowID id,
     if( !CreateControl( parent, id, pos, size, style, wxDefaultValidator,
                         name ) )
         return false;
+    PreCreation();
 
     m_messageBitmap = bitmap;
     m_messageBitmapOriginal = bitmap;
@@ -52,7 +48,7 @@ bool wxStaticBitmap::Create(wxWindow *parent, wxWindowID id,
     Widget parentWidget = (Widget) parent->GetClientWidget();
 
     m_mainWidget = (WXWidget) XtVaCreateManagedWidget ("staticBitmap",
-#if USE_GADGETS
+#if wxUSE_GADGETS
                     xmLabelGadgetClass, parentWidget,
 #else
                     xmLabelWidgetClass, parentWidget,
@@ -60,18 +56,15 @@ bool wxStaticBitmap::Create(wxWindow *parent, wxWindowID id,
                     XmNalignment, XmALIGNMENT_BEGINNING,
                     NULL);
 
-    ChangeBackgroundColour ();
-
-    DoSetBitmap();
-
-    ChangeFont(FALSE);
-
     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;
+        actualSize.x = bitmap.IsOk() ? bitmap.GetWidth() : 1;
     if (actualSize.y == -1)
-        actualSize.y = bitmap.Ok() ? bitmap.GetHeight() : 1;
+        actualSize.y = bitmap.IsOk() ? bitmap.GetHeight() : 1;
+
+    PostCreation();
+    DoSetBitmap();
     AttachWidget (parent, m_mainWidget, (WXWidget) NULL,
                   pos.x, pos.y, actualSize.x, actualSize.y);
 
@@ -88,7 +81,7 @@ void wxStaticBitmap::DoSetBitmap()
     Widget widget = (Widget) m_mainWidget;
     int w2, h2;
 
-    if (m_messageBitmapOriginal.Ok())
+    if (m_messageBitmapOriginal.IsOk())
     {
         w2 = m_messageBitmapOriginal.GetWidth();
         h2 = m_messageBitmapOriginal.GetHeight();
@@ -99,7 +92,7 @@ void wxStaticBitmap::DoSetBitmap()
         // in the current widget background colour.
         if (m_messageBitmapOriginal.GetMask())
         {
-            int backgroundPixel;
+            WXPixel backgroundPixel;
             XtVaGetValues( widget, XmNbackground, &backgroundPixel,
                 NULL);
 
@@ -132,7 +125,7 @@ void wxStaticBitmap::DoSetBitmap()
             XmNlabelType, XmSTRING,
             XmNlabelPixmap, XmUNSPECIFIED_PIXMAP,
             NULL);
-    }    
+    }
 }
 
 void wxStaticBitmap::SetBitmap(const wxBitmap& bitmap)
@@ -157,4 +150,3 @@ void wxStaticBitmap::ChangeForegroundColour()
     m_bitmapCache.SetColoursChanged();
     wxWindow::ChangeForegroundColour();
 }
-