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

Workaround for bug in gcc-3.1 through gcc-3.3 in handling deprecation.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@55382 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Neis
2008-08-30 21:21:49 +00:00
parent a8be206acc
commit d3b9a3fd36
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
include/wx/iconbndl.h
View File

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

6
include/wx/image.h
View File

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