From a05e6efe6159571da1bcfeb2b98def2adc0e2078 Mon Sep 17 00:00:00 2001 From: Kevin Ollivier Date: Tue, 24 Feb 2009 22:19:10 +0000 Subject: [PATCH] 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. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@59120 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/defs.h | 2 +- include/wx/generic/grid.h | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/include/wx/defs.h b/include/wx/defs.h index 835eeae759..51c395bb7a 100644 --- a/include/wx/defs.h +++ b/include/wx/defs.h @@ -503,7 +503,7 @@ typedef short int WXTYPE; 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__) +#if wxCHECK_GCC_VERSION(3, 4) || defined( __DARWIN__ ) #define wxDEPRECATED_CONSTRUCTOR(x) x #else #define wxDEPRECATED_CONSTRUCTOR(x) wxDEPRECATED( inline x) diff --git a/include/wx/generic/grid.h b/include/wx/generic/grid.h index cc23938ef4..ab8e9e3ba2 100644 --- a/include/wx/generic/grid.h +++ b/include/wx/generic/grid.h @@ -2113,7 +2113,7 @@ public: // explicitly specifying inline allows gcc < 3.4 to // handle the deprecation attribute even in the constructor. - wxDEPRECATED( inline + wxDEPRECATED_CONSTRUCTOR( wxGridEvent(int id, wxEventType type, wxObject* obj, @@ -2174,7 +2174,7 @@ public: SetEventObject(obj); } - wxDEPRECATED( inline + wxDEPRECATED_CONSTRUCTOR( wxGridSizeEvent(int id, wxEventType type, wxObject* obj, @@ -2232,7 +2232,7 @@ public: SetEventObject(obj); } - wxDEPRECATED( inline + wxDEPRECATED_CONSTRUCTOR( wxGridRangeSelectEvent(int id, wxEventType type, wxObject* obj,