include "wx/toolbar.h" instead of tbar(base|smpl).h

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

diff --git a/src/motif/statbmp.cpp b/src/motif/statbmp.cpp
index a226685b38fcb57425393d26ea69114cce43e885..72a813f39628fb8f21cabf75a31a4dd30911afe9 100644 (file)
--- a/src/motif/statbmp.cpp
+++ b/src/motif/statbmp.cpp
@@ -69,9 +69,9 @@ bool wxStaticBitmap::Create(wxWindow *parent, wxWindowID id,
     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;
+        actualSize.y = bitmap.Ok() ? bitmap.GetHeight() : 1;
     AttachWidget (parent, m_mainWidget, (WXWidget) NULL,
                   pos.x, pos.y, actualSize.x, actualSize.y);
 
@@ -86,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())
     {
@@ -123,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
     {