X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1248b41f9f71110347659db8c54c75786eba23c6..1cd9779fce63b081d875de7a901c8eb6120d0b8a:/src/motif/statbmp.cpp diff --git a/src/motif/statbmp.cpp b/src/motif/statbmp.cpp index 215a77c3d3..b22d663095 100644 --- a/src/motif/statbmp.cpp +++ b/src/motif/statbmp.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: statbmp.cpp +// Name: src/motif/statbmp.cpp // Purpose: wxStaticBitmap // Author: Julian Smart // Modified by: @@ -9,15 +9,9 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#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" #ifdef __VMS__ @@ -55,7 +49,7 @@ bool wxStaticBitmap::Create(wxWindow *parent, wxWindowID id, Widget parentWidget = (Widget) parent->GetClientWidget(); m_mainWidget = (WXWidget) XtVaCreateManagedWidget ("staticBitmap", -#if USE_GADGETS +#if wxUSE_GADGETS xmLabelGadgetClass, parentWidget, #else xmLabelWidgetClass, parentWidget, @@ -67,7 +61,7 @@ bool wxStaticBitmap::Create(wxWindow *parent, wxWindowID id, DoSetBitmap(); - ChangeFont(FALSE); + ChangeFont(false); wxSize actualSize(size); // work around the cases where the bitmap is a wxNull(Icon/Bitmap) @@ -135,7 +129,7 @@ void wxStaticBitmap::DoSetBitmap() XmNlabelType, XmSTRING, XmNlabelPixmap, XmUNSPECIFIED_PIXMAP, NULL); - } + } } void wxStaticBitmap::SetBitmap(const wxBitmap& bitmap) @@ -160,4 +154,3 @@ void wxStaticBitmap::ChangeForegroundColour() m_bitmapCache.SetColoursChanged(); wxWindow::ChangeForegroundColour(); } -