X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/3399051ee9fa4dfa5fa7ac2dd9034062f4414d64..0a7ee6e0f400f0d10b158bc0396be22f59d6ad8f:/include/wx/motif/bmpmotif.h diff --git a/include/wx/motif/bmpmotif.h b/include/wx/motif/bmpmotif.h index 99e570c26d..a176e90fc0 100644 --- a/include/wx/motif/bmpmotif.h +++ b/include/wx/motif/bmpmotif.h @@ -1,25 +1,21 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: bmpmotif.h +// Name: wx/motif/bmpmotif.h // Purpose: Motif-specific bitmap routines // Author: Julian Smart, originally in bitmap.h // Modified by: // Created: 25/03/2003 // RCS-ID: $Id$ // Copyright: (c) Julian Smart -// Licence: wxWindows licence +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// #ifndef _WX_BMPMOTIF_H_ #define _WX_BMPMOTIF_H_ -#if defined(__GNUG__) && !defined(__APPLE__) -#pragma interface "bmpmotif.h" -#endif - #include "wx/defs.h" #include "wx/bitmap.h" -class WXDLLEXPORT wxBitmapCache +class WXDLLIMPEXP_CORE wxBitmapCache { public: wxBitmapCache() @@ -28,7 +24,7 @@ public: m_armPixmap = (WXPixmap)NULL; m_insensPixmap = (WXPixmap)NULL; m_image = (WXImage)NULL; - m_display = (WXDisplay*)NULL; + m_display = NULL; SetColoursChanged(); } @@ -44,6 +40,8 @@ private: void InvalidateCache(); void CreateImageIfNeeded( WXWidget w ); + WXPixmap GetPixmapFromCache(WXWidget w); + struct { bool label : 1;