use GetFont() instead of (possibly not initialized) m_font in GetCharWidth/Height()

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

diff --git a/src/motif/statbmp.cpp b/src/motif/statbmp.cpp
index c10ac0d74ae47a2031cf7c5cd5a2cfec71f5017f..1226a83f61c5c002bf7a51f54373c4ea7e3a9429 100644 (file)
--- a/src/motif/statbmp.cpp
+++ b/src/motif/statbmp.cpp
@@ -9,7 +9,7 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #pragma implementation "statbmp.h"
 #endif
 
@@ -23,7 +23,6 @@
 #include <Xm/Xm.h>
 #include <Xm/Label.h>
 #include <Xm/LabelG.h>
-#include <Xm/RowColumn.h>
 #ifdef __VMS__
 #pragma message enable nosimpint
 #endif
@@ -43,19 +42,12 @@ bool wxStaticBitmap::Create(wxWindow *parent, wxWindowID id,
            long style,
            const wxString& name)
 {
+    if( !CreateControl( parent, id, pos, size, style, wxDefaultValidator,
+                        name ) )
+        return false;
+
     m_messageBitmap = bitmap;
     m_messageBitmapOriginal = 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;
-
-    m_windowStyle = style;
 
     Widget parentWidget = (Widget) parent->GetClientWidget();
 
@@ -72,18 +64,18 @@ bool wxStaticBitmap::Create(wxWindow *parent, wxWindowID id,
 
     DoSetBitmap();
 
-    m_font = parent->GetFont();
     ChangeFont(FALSE);
 
     wxSize actualSize(size);
     // work around the cases where the bitmap is a wxNull(Icon/Bitmap)
     if (actualSize.x == -1)
-        actualSize.x = bitmap.GetWidth() ? bitmap.GetWidth() : 1;
+        actualSize.x = bitmap.Ok() ? bitmap.GetWidth() : 1;
     if (actualSize.y == -1)
-        actualSize.y = bitmap.GetHeight() ? bitmap.GetHeight() : 1;
-    AttachWidget (parent, m_mainWidget, (WXWidget) NULL, pos.x, pos.y, actualSize.x, actualSize.y);
+        actualSize.y = bitmap.Ok() ? bitmap.GetHeight() : 1;
+    AttachWidget (parent, m_mainWidget, (WXWidget) NULL,
+                  pos.x, pos.y, actualSize.x, actualSize.y);
 
-    return TRUE;
+    return true;
 }
 
 wxStaticBitmap::~wxStaticBitmap()
@@ -94,9 +86,7 @@ wxStaticBitmap::~wxStaticBitmap()
 void wxStaticBitmap::DoSetBitmap()
 {
     Widget widget = (Widget) m_mainWidget;
-    int x, y, w1, h1, w2, h2;
-
-    GetPosition(&x, &y);
+    int w2, h2;
 
     if (m_messageBitmapOriginal.Ok())
     {
@@ -131,10 +121,8 @@ void wxStaticBitmap::DoSetBitmap()
             XmNlabelPixmap, pixmap,
             XmNlabelType, XmPIXMAP,
             NULL);
-        GetSize(&w1, &h1);
 
-        if (! (w1 == w2) && (h1 == h2))
-            SetSize(x, y, w2, h2);
+        SetSize(w2, h2);
     }
     else
     {
@@ -155,11 +143,6 @@ void wxStaticBitmap::SetBitmap(const wxBitmap& bitmap)
     DoSetBitmap();
 }
 
-void wxStaticBitmap::ChangeFont(bool keepOriginalSize)
-{
-    wxWindow::ChangeFont(keepOriginalSize);
-}
-
 void wxStaticBitmap::ChangeBackgroundColour()
 {
     wxWindow::ChangeBackgroundColour();