X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/9a595736d07382f41ab09bacdd692fe9a4cad894..f5698096606b5a3d399018a20135f41d5ba05215:/src/motif/statbmp.cpp

diff --git a/src/motif/statbmp.cpp b/src/motif/statbmp.cpp
index a226685b38..215a77c3d3 100644
--- a/src/motif/statbmp.cpp
+++ b/src/motif/statbmp.cpp
@@ -9,10 +9,13 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #pragma implementation "statbmp.h"
 #endif
 
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
 #include "wx/defs.h"
 
 #include "wx/statbmp.h"
@@ -69,9 +72,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 +89,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 +124,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
     {