X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/7520f3da332d64a676b6f7d27a56004fabf2db36..9d5cfd0e64a2c09d957517405758de680806e674:/src/motif/statbmp.cpp diff --git a/src/motif/statbmp.cpp b/src/motif/statbmp.cpp index b22d663095..89a74c3792 100644 --- a/src/motif/statbmp.cpp +++ b/src/motif/statbmp.cpp @@ -42,6 +42,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; @@ -57,18 +58,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; if (actualSize.y == -1) actualSize.y = bitmap.Ok() ? bitmap.GetHeight() : 1; + + PostCreation(); + DoSetBitmap(); AttachWidget (parent, m_mainWidget, (WXWidget) NULL, pos.x, pos.y, actualSize.x, actualSize.y); @@ -96,7 +94,7 @@ void wxStaticBitmap::DoSetBitmap() // in the current widget background colour. if (m_messageBitmapOriginal.GetMask()) { - int backgroundPixel; + WXPixel backgroundPixel; XtVaGetValues( widget, XmNbackground, &backgroundPixel, NULL);