X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/086b3a5b02f91b0553970b7c68c3bbde7c047ecc..dda36afd4abc7fb609ec97171dbae3f890d6ec71:/include/wx/msw/bitmap.h diff --git a/include/wx/msw/bitmap.h b/include/wx/msw/bitmap.h index 0daef6ee89..d31371c891 100644 --- a/include/wx/msw/bitmap.h +++ b/include/wx/msw/bitmap.h @@ -12,7 +12,7 @@ #ifndef _WX_BITMAP_H_ #define _WX_BITMAP_H_ -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma interface "bitmap.h" #endif @@ -162,17 +162,6 @@ public: wxDEPRECATED( void SetQuality(int quality) ); #endif // WXWIN_COMPATIBILITY_2_4 -#if WXWIN_COMPATIBILITY_2 - void SetOk(bool isOk); -#endif // WXWIN_COMPATIBILITY_2 - -#if WXWIN_COMPATIBILITY -#if wxUSE_PALETTE - wxPalette *GetColourMap() const { return GetPalette(); } - void SetColourMap(wxPalette *cmap) { SetPalette(*cmap); }; -#endif // wxUSE_PALETTE -#endif // WXWIN_COMPATIBILITY - // implementation only from now on // -------------------------------