X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a8680e3e0e5066d35a8f4fd43294ba4bfcaf4ba7..d16b634fa336d09050d01786fb420d32ef43d311:/src/motif/bmpbuttn.cpp diff --git a/src/motif/bmpbuttn.cpp b/src/motif/bmpbuttn.cpp index 721409d8a4..d684d7b77b 100644 --- a/src/motif/bmpbuttn.cpp +++ b/src/motif/bmpbuttn.cpp @@ -9,10 +9,13 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma implementation "bmpbuttn.h" #endif +// For compilers that support precompilation, includes "wx.h". +#include "wx/wxprec.h" + #ifdef __VMS #define XtScreen XTSCREEN #endif @@ -58,13 +61,6 @@ bool wxBitmapButton::Create(wxWindow *parent, wxWindowID id, m_bmpNormal = m_bmpNormalOriginal = bitmap; m_bmpSelected = m_bmpSelectedOriginal = bitmap; - /* - int x = pos.x; - int y = pos.y; - int width = size.x; - int height = size.y; - */ - Widget parentWidget = (Widget) parent->GetClientWidget(); /* @@ -232,16 +228,6 @@ void wxBitmapButton::DoSetBitmap() else armPixmap = (Pixmap) m_bitmapCache.GetArmPixmap(m_mainWidget); -#if 0 - // <- the Get...Pixmap()-functions return the same pixmap! - if (insensPixmap == pixmap) - { - insensPixmap = - XCreateInsensitivePixmap(DisplayOfScreen(XtScreen((Widget) m_mainWidget)), pixmap); - m_insensPixmap = (WXPixmap) insensPixmap; - } -#endif - XtVaSetValues ((Widget) m_mainWidget, XmNlabelPixmap, pixmap, XmNlabelInsensitivePixmap, insensPixmap,