Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixing deprecated constructors for osx

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@55696 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor
2008-09-18 09:12:32 +00:00
parent 326b62161d
commit 70bf329592
3 changed files with 17 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
include/wx/defs.h
View File

@@ -582,6 +582,17 @@ typedef short int WXTYPE;
#define wxDEPRECATED(x) x
#endif
/*
explicitly specifying inline allows gcc < 3.4 to
handle the deprecation attribute even in the constructor.
doesn't seem to work on Apple's gcc 4.0.1 unless using -O0
*/
#if defined( __DARWIN__ ) && !defined(__WXDEBUG__)
#define wxDEPRECATED_CONSTRUCTOR(x) x
#else
#define wxDEPRECATED_CONSTRUCTOR(x) wxDEPRECATED( inline x)
#endif
/*
Macro which marks the function as being deprecated but also defines it
inline.

5
include/wx/iconbndl.h
View File

@@ -79,9 +79,8 @@ public:
AddIcon(file, (wxBitmapType)type);
}
)
// explicitly specifying inline allows gcc < 3.4 to
// handle the deprecation attribute even in the constructor.
wxDEPRECATED( inline wxIconBundle (const wxString& file, long type)
wxDEPRECATED_CONSTRUCTOR( wxIconBundle (const wxString& file, long type)
{
AddIcon(file, (wxBitmapType)type);
}

10
include/wx/image.h
View File

@@ -440,18 +440,16 @@ public:
static RGBValue HSVtoRGB(const HSVValue& hsv);
#if WXWIN_COMPATIBILITY_2_8
// explicitly specifying inline allows gcc < 3.4 to
// handle the deprecation attribute even in the constructor.
wxDEPRECATED(
inline wxImage(const wxString& name, long type, int index = -1)
wxDEPRECATED_CONSTRUCTOR(
wxImage(const wxString& name, long type, int index = -1)
{
LoadFile(name, (wxBitmapType)type, index);
}
)
#if wxUSE_STREAMS
wxDEPRECATED(
inline wxImage(wxInputStream& stream, long type, int index = -1)
wxDEPRECATED_CONSTRUCTOR(
wxImage(wxInputStream& stream, long type, int index = -1)
{
LoadFile(stream, (wxBitmapType)type, index);
}