X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/fda7962d029672a5f4c718a3c6b2559856f4cd95..749bb9f1291c3c967a25cbbd9aed98a89f7e1511:/include/wx/image.h diff --git a/include/wx/image.h b/include/wx/image.h index 0d8f947e3c..1789d526c8 100644 --- a/include/wx/image.h +++ b/include/wx/image.h @@ -10,7 +10,7 @@ #ifndef _WX_IMAGE_H_ #define _WX_IMAGE_H_ -#if defined(__GNUG__) && !defined(__APPLE__) +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma interface "image.h" #endif @@ -18,9 +18,6 @@ #include "wx/object.h" #include "wx/string.h" #include "wx/gdicmn.h" -#if WXWIN_COMPATIBILITY_2_2 -# include "wx/bitmap.h" -#endif #include "wx/hashmap.h" #if wxUSE_STREAMS @@ -198,7 +195,7 @@ public: unsigned char GetBlue( int x, int y ) const; void SetAlpha(int x, int y, unsigned char alpha); - unsigned char GetAlpha(int x, int y); + unsigned char GetAlpha(int x, int y) const; // find first colour that is not used in the image and has higher // RGB values than