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

Fix using WXWIN_COMPATIBILITY_3_0 in conditional blocks in wxPG code.

Browse Source 
Check the value of WXWIN_COMPATIBILITY_3_0 instead of checking whether it is defined.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@78369 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Artur Wieczorek
2015-01-13 16:41:33 +00:00
parent 630b7fd5d7
commit 7a9ae4aecf
5 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/wx/propgrid/manager.h
View File

@@ -157,7 +157,7 @@ public:
*/ */
void SetSplitterPosition( int splitterPos, int col = 0 ); void SetSplitterPosition( int splitterPos, int col = 0 );
#ifdef WXWIN_COMPATIBILITY_3_0 #if WXWIN_COMPATIBILITY_3_0
// To avoid ambiguity between functions inherited // To avoid ambiguity between functions inherited
// from both wxPropertyGridInterface and wxPropertyGridPageState // from both wxPropertyGridInterface and wxPropertyGridPageState
using wxPropertyGridInterface::GetPropertyByLabel; using wxPropertyGridInterface::GetPropertyByLabel;

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

@@ -2295,7 +2295,7 @@ public:
wxPGProperty* GetPropertyByName( const wxString& name ) const; wxPGProperty* GetPropertyByName( const wxString& name ) const;
// Returns various display-related information for given column // Returns various display-related information for given column
#ifdef WXWIN_COMPATIBILITY_3_0 #if WXWIN_COMPATIBILITY_3_0
wxDEPRECATED_MSG("don't use GetDisplayInfo function with argument of 'const wxPGCell**' type. Use 'wxPGCell*' argument instead") wxDEPRECATED_MSG("don't use GetDisplayInfo function with argument of 'const wxPGCell**' type. Use 'wxPGCell*' argument instead")
void GetDisplayInfo( unsigned int column, void GetDisplayInfo( unsigned int column,
int choiceIndex, int choiceIndex,

2
include/wx/propgrid/propgridpagestate.h
View File

@@ -556,7 +556,7 @@ public:
wxPropertyCategory* GetPropertyCategory( const wxPGProperty* p ) const; wxPropertyCategory* GetPropertyCategory( const wxPGProperty* p ) const;
#ifdef WXWIN_COMPATIBILITY_3_0 #if WXWIN_COMPATIBILITY_3_0
wxDEPRECATED_MSG("don't refer directly to wxPropertyGridPageState::GetPropertyByLabel") wxDEPRECATED_MSG("don't refer directly to wxPropertyGridPageState::GetPropertyByLabel")
wxPGProperty* GetPropertyByLabel( const wxString& name, wxPGProperty* GetPropertyByLabel( const wxString& name,
wxPGProperty* parent = NULL ) const; wxPGProperty* parent = NULL ) const;

2
src/propgrid/property.cpp
View File

@@ -754,7 +754,7 @@ void wxPGProperty::OnValidationFailure( wxVariant& WXUNUSED(pendingValue) )
{ {
} }
#ifdef WXWIN_COMPATIBILITY_3_0 #if WXWIN_COMPATIBILITY_3_0
void wxPGProperty::GetDisplayInfo( unsigned int column, void wxPGProperty::GetDisplayInfo( unsigned int column,
int choiceIndex, int choiceIndex,
int flags, int flags,

2
src/propgrid/propgridpagestate.cpp
View File

@@ -459,7 +459,7 @@ wxPropertyCategory* wxPropertyGridPageState::GetPropertyCategory( const wxPGProp
// wxPropertyGridPageState GetPropertyXXX methods // wxPropertyGridPageState GetPropertyXXX methods
// ----------------------------------------------------------------------- // -----------------------------------------------------------------------
#ifdef WXWIN_COMPATIBILITY_3_0 #if WXWIN_COMPATIBILITY_3_0
wxPGProperty* wxPropertyGridPageState::GetPropertyByLabel wxPGProperty* wxPropertyGridPageState::GetPropertyByLabel
( const wxString& label, wxPGProperty* parent ) const ( const wxString& label, wxPGProperty* parent ) const
{ {