added wxDEPRECATED_INLINE, use it for wxPixelData<wxBitmap>::UseAlpha() to fix Sun CC compilation
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@48866 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -517,10 +517,13 @@ typedef int wxWindowID;
|
||||
/* Macro to issue warning when using deprecated functions with gcc3 or MSVC7: */
|
||||
#if wxCHECK_GCC_VERSION(3, 1)
|
||||
#define wxDEPRECATED(x) x __attribute__ ((deprecated))
|
||||
#define wxDEPRECATED_INLINE(func, body) x { body } __attribute__ ((deprecated))
|
||||
#elif defined(__VISUALC__) && (__VISUALC__ >= 1300)
|
||||
#define wxDEPRECATED(x) __declspec(deprecated) x
|
||||
#define wxDEPRECATED_INLINE(func, body) __declspec(deprecated) x { body }
|
||||
#else
|
||||
#define wxDEPRECATED(x) x
|
||||
#define wxDEPRECATED_INLINE(func, body) func { body }
|
||||
#endif
|
||||
|
||||
/*
|
||||
|
||||
@@ -650,7 +650,7 @@ struct wxPixelDataOut<wxBitmap>
|
||||
|
||||
#if WXWIN_COMPATIBILITY_2_8
|
||||
// not needed anymore, calls to it should be simply removed
|
||||
wxDEPRECATED( inline void UseAlpha() );
|
||||
wxDEPRECATED_INLINE( void UseAlpha(), wxEMPTY_PARAMETER_VALUE );
|
||||
#endif
|
||||
|
||||
// private: -- see comment in the beginning of the file
|
||||
@@ -694,12 +694,6 @@ public:
|
||||
}
|
||||
};
|
||||
|
||||
#if WXWIN_COMPATIBILITY_2_8
|
||||
template <class Format>
|
||||
inline void wxPixelDataOut<wxBitmap>::wxPixelDataIn<Format>::UseAlpha() {}
|
||||
#endif
|
||||
|
||||
|
||||
// some "predefined" pixel data classes
|
||||
#if wxUSE_IMAGE
|
||||
typedef wxPixelData<wxImage> wxImagePixelData;
|
||||
|
||||
Reference in New Issue
Block a user