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

Avoid warnings about deprecated wxPG_XXX when building wx itself

Browse Source 
Getting the warnings about deprecated macros when building the library
itself is not useful, as it must continue to use them as long as
WXWIN_COMPATIBILITY_3_0 exists.

Closes https://github.com/wxWidgets/wxWidgets/pull/1510
This commit is contained in:
Vadim Zeitlin
2019-08-27 13:24:10 +02:00
parent 1bce1a1d4c
commit 20b9964007
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
include/wx/propgrid/property.h
View File

@@ -452,7 +452,7 @@ wxPG_PROP_CLASS_SPECIFIC_3 = 0x00400000
// ----------------------------------------------------------------------- // -----------------------------------------------------------------------
// Helpers to mark macros as deprecated // Helpers to mark macros as deprecated
#if defined(__clang__) || wxCHECK_GCC_VERSION(4, 5) #if (defined(__clang__) || wxCHECK_GCC_VERSION(4, 5)) && !defined(WXBUILDING)
#define wxPG_STRINGIFY(X) #X #define wxPG_STRINGIFY(X) #X
#define wxPG_DEPRECATED_MACRO_VALUE(value, msg) \ #define wxPG_DEPRECATED_MACRO_VALUE(value, msg) \
_Pragma(wxPG_STRINGIFY(GCC warning msg)) value _Pragma(wxPG_STRINGIFY(GCC warning msg)) value
@@ -460,6 +460,10 @@ wxPG_PROP_CLASS_SPECIFIC_3 = 0x00400000
#define wxPG_DEPRECATED_MACRO_VALUE(value, msg) value #define wxPG_DEPRECATED_MACRO_VALUE(value, msg) value
#endif // clang || GCC #endif // clang || GCC
#if wxCHECK_VISUALC_VERSION(10) && !defined(WXBUILDING)
#define wxPG_MUST_DEPRECATE_MACRO_NAME
#endif
// wxPGProperty::SetAttribute() and // wxPGProperty::SetAttribute() and
// wxPropertyGridInterface::SetPropertyAttribute() accept one of these as // wxPropertyGridInterface::SetPropertyAttribute() accept one of these as
// attribute name argument. // attribute name argument.
@@ -553,7 +557,7 @@ wxPG_PROP_CLASS_SPECIFIC_3 = 0x00400000
#define wxPG_FILE_INITIAL_PATH wxS("InitialPath") #define wxPG_FILE_INITIAL_PATH wxS("InitialPath")
#if WXWIN_COMPATIBILITY_3_0 #if WXWIN_COMPATIBILITY_3_0
#if wxCHECK_VISUALC_VERSION(10) #ifdef wxPG_MUST_DEPRECATE_MACRO_NAME
#pragma deprecated(wxPG_FILE_DIALOG_TITLE) #pragma deprecated(wxPG_FILE_DIALOG_TITLE)
#endif #endif
// Specific to wxFileProperty and derivatives, wxString, default is empty. // Specific to wxFileProperty and derivatives, wxString, default is empty.
@@ -567,7 +571,7 @@ wxPG_PROP_CLASS_SPECIFIC_3 = 0x00400000
#define wxPG_FILE_DIALOG_STYLE wxS("DialogStyle") #define wxPG_FILE_DIALOG_STYLE wxS("DialogStyle")
#if WXWIN_COMPATIBILITY_3_0 #if WXWIN_COMPATIBILITY_3_0
#if wxCHECK_VISUALC_VERSION(10) #ifdef wxPG_MUST_DEPRECATE_MACRO_NAME
#pragma deprecated(wxPG_DIR_DIALOG_MESSAGE) #pragma deprecated(wxPG_DIR_DIALOG_MESSAGE)
#endif #endif
// Specific to wxDirProperty, wxString, default is empty. // Specific to wxDirProperty, wxString, default is empty.