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

Fix for deprecated constructor issues, setting a function without a body as inline doesn't work for Mac whether debug is set or not. Since it's a workaround for old versions of gcc, limit its use to those cases to avoid future problems.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@59120 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Kevin Ollivier
2009-02-24 22:19:10 +00:00
parent ea34484ca3
commit a05e6efe61
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/wx/defs.h
View File

@@ -503,7 +503,7 @@ typedef short int WXTYPE;
handle the deprecation attribute even in the constructor. handle the deprecation attribute even in the constructor.
doesn't seem to work on Apple's gcc 4.0.1 unless using -O0 doesn't seem to work on Apple's gcc 4.0.1 unless using -O0
*/ */
#if defined( __DARWIN__ ) && !defined(__WXDEBUG__) #if wxCHECK_GCC_VERSION(3, 4) || defined( __DARWIN__ )
#define wxDEPRECATED_CONSTRUCTOR(x) x #define wxDEPRECATED_CONSTRUCTOR(x) x
#else #else
#define wxDEPRECATED_CONSTRUCTOR(x) wxDEPRECATED( inline x) #define wxDEPRECATED_CONSTRUCTOR(x) wxDEPRECATED( inline x)

6
include/wx/generic/grid.h
View File

@@ -2113,7 +2113,7 @@ public:
// explicitly specifying inline allows gcc < 3.4 to // explicitly specifying inline allows gcc < 3.4 to
// handle the deprecation attribute even in the constructor. // handle the deprecation attribute even in the constructor.
wxDEPRECATED( inline wxDEPRECATED_CONSTRUCTOR(
wxGridEvent(int id, wxGridEvent(int id,
wxEventType type, wxEventType type,
wxObject* obj, wxObject* obj,
@@ -2174,7 +2174,7 @@ public:
SetEventObject(obj); SetEventObject(obj);
} }
wxDEPRECATED( inline wxDEPRECATED_CONSTRUCTOR(
wxGridSizeEvent(int id, wxGridSizeEvent(int id,
wxEventType type, wxEventType type,
wxObject* obj, wxObject* obj,
@@ -2232,7 +2232,7 @@ public:
SetEventObject(obj); SetEventObject(obj);
} }
wxDEPRECATED( inline wxDEPRECATED_CONSTRUCTOR(
wxGridRangeSelectEvent(int id, wxGridRangeSelectEvent(int id,
wxEventType type, wxEventType type,
wxObject* obj, wxObject* obj,