X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8c624a14ad2e1c8cef5e382e715324b4f1f090e3..6fef2483d9dc1a7c006d2f5967791e0f4c0cf518:/src/motif/statbmp.cpp diff --git a/src/motif/statbmp.cpp b/src/motif/statbmp.cpp index f576c57c84..13dd72ae88 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__ @@ -102,7 +96,7 @@ void wxStaticBitmap::DoSetBitmap() // in the current widget background colour. if (m_messageBitmapOriginal.GetMask()) { - int backgroundPixel; + WXPixel backgroundPixel; XtVaGetValues( widget, XmNbackground, &backgroundPixel, NULL); @@ -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(); } -