X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/db0aec831d38f2937e6a595d9fa40c84e6499fdd..a800dc50d47f5ecd1bcba7601f33843c01db9a57:/include/wx/gtk/bitmap.h diff --git a/include/wx/gtk/bitmap.h b/include/wx/gtk/bitmap.h index 3de0323615..51cc2fed09 100644 --- a/include/wx/gtk/bitmap.h +++ b/include/wx/gtk/bitmap.h @@ -11,7 +11,7 @@ #ifndef __GTKBITMAPH__ #define __GTKBITMAPH__ -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma interface #endif @@ -96,8 +96,10 @@ public: bool LoadFile( const wxString &name, int type = wxBITMAP_TYPE_XPM ); wxPalette *GetPalette() const; - wxPalette *GetColourMap() const - { return GetPalette(); }; + wxPalette *GetColourMap() const { return GetPalette(); }; + + static void InitStandardHandlers() { } + static void CleanUpHandlers() { } // implementation // -------------- @@ -111,6 +113,8 @@ public: GdkPixmap *GetPixmap() const; GdkBitmap *GetBitmap() const; + // Basically, this corresponds to Win32 StretchBlt() + wxBitmap Rescale( int clipx, int clipy, int clipwidth, int clipheight, int width, int height ); protected: bool CreateFromXpm(const char **bits); bool CreateFromImage(const wxImage& image, int depth);