X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/fd94e8aa4563b22e7c66c379625a8373d20720aa..a8eff06059e7758474a7eca0d800c113eefd876f:/include/wx/imagbmp.h diff --git a/include/wx/imagbmp.h b/include/wx/imagbmp.h index 0ba6c31e9f..8865193d9d 100644 --- a/include/wx/imagbmp.h +++ b/include/wx/imagbmp.h @@ -10,7 +10,7 @@ #ifndef _WX_IMAGBMP_H_ #define _WX_IMAGBMP_H_ -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma interface "imagbmp.h" #endif @@ -25,10 +25,12 @@ #define wxIMAGE_OPTION_CUR_HOTSPOT_X wxT("HotSpotX") #define wxIMAGE_OPTION_CUR_HOTSPOT_Y wxT("HotSpotY") -// Do not use these macros, they are deprecated!! : -#define wxBMP_FORMAT wxIMAGE_OPTION_BMP_FORMAT -#define wxCUR_HOTSPOT_X wxIMAGE_OPTION_CUR_HOTSPOT_X -#define wxCUR_HOTSPOT_Y wxIMAGE_OPTION_CUR_HOTSPOT_Y +#if WXWIN_COMPATIBILITY_2_4 + // Do not use these macros, they are deprecated + #define wxBMP_FORMAT wxIMAGE_OPTION_BMP_FORMAT + #define wxCUR_HOTSPOT_X wxIMAGE_OPTION_CUR_HOTSPOT_X + #define wxCUR_HOTSPOT_Y wxIMAGE_OPTION_CUR_HOTSPOT_Y +#endif enum