X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/4b5f3fe655deeb91d5d3abe8fad30c4a1cae63dc..d54598dd855e64cf2086b73cb3b8e3b99c513bbc:/src/motif/statbmp.cpp diff --git a/src/motif/statbmp.cpp b/src/motif/statbmp.cpp index 20d46299d5..fa4d5eb5de 100644 --- a/src/motif/statbmp.cpp +++ b/src/motif/statbmp.cpp @@ -6,7 +6,7 @@ // Created: 17/09/98 // RCS-ID: $Id$ // Copyright: (c) Julian Smart -// Licence: wxWindows licence +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// #ifdef __GNUG__ @@ -44,9 +44,9 @@ bool wxStaticBitmap::Create(wxWindow *parent, wxWindowID id, if (parent) parent->AddChild(this); if ( id == -1 ) - m_windowId = (int)NewControlId(); + m_windowId = (int)NewControlId(); else - m_windowId = id; + m_windowId = id; m_windowStyle = style; @@ -66,7 +66,7 @@ bool wxStaticBitmap::Create(wxWindow *parent, wxWindowID id, XmNlabelType, XmPIXMAP, NULL); - m_windowFont = parent->GetFont(); + m_font = parent->GetFont(); ChangeFont(FALSE); SetCanAddEventHandler(TRUE); @@ -82,11 +82,6 @@ wxStaticBitmap::~wxStaticBitmap() SetBitmap(wxNullBitmap); } -void wxStaticBitmap::SetSize(int x, int y, int width, int height, int sizeFlags) -{ - wxControl::SetSize(x, y, width, height, sizeFlags); -} - void wxStaticBitmap::SetBitmap(const wxBitmap& bitmap) { m_messageBitmap = bitmap; @@ -103,7 +98,7 @@ void wxStaticBitmap::SetBitmap(const wxBitmap& bitmap) XtVaSetValues (widget, XmNlabelPixmap, ((wxBitmap&)bitmap).GetLabelPixmap (widget), XmNlabelType, XmPIXMAP, - NULL); + NULL); GetSize(&w1, &h1); if (! (w1 == w2) && (h1 == h2))