From 7a9ae4aecfb6499fc5383778b75b1c4f8cf1d0c6 Mon Sep 17 00:00:00 2001
From: Artur Wieczorek <artwik@wp.pl>
Date: Tue, 13 Jan 2015 16:41:33 +0000
Subject: [PATCH] Fix using WXWIN_COMPATIBILITY_3_0 in conditional blocks in
 wxPG code.

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
---
 include/wx/propgrid/manager.h           | 2 +-
 include/wx/propgrid/property.h          | 2 +-
 include/wx/propgrid/propgridpagestate.h | 2 +-
 src/propgrid/property.cpp               | 2 +-
 src/propgrid/propgridpagestate.cpp      | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/include/wx/propgrid/manager.h b/include/wx/propgrid/manager.h
index 6a3d4f7958..2404e70508 100644
--- a/include/wx/propgrid/manager.h
+++ b/include/wx/propgrid/manager.h
@@ -157,7 +157,7 @@ public:
     */
     void SetSplitterPosition( int splitterPos, int col = 0 );
 
-#ifdef WXWIN_COMPATIBILITY_3_0
+#if WXWIN_COMPATIBILITY_3_0
     // To avoid ambiguity between functions inherited
     // from both wxPropertyGridInterface and wxPropertyGridPageState
     using wxPropertyGridInterface::GetPropertyByLabel;
diff --git a/include/wx/propgrid/property.h b/include/wx/propgrid/property.h
index 81b0e60ce8..6b4290a149 100644
--- a/include/wx/propgrid/property.h
+++ b/include/wx/propgrid/property.h
@@ -2295,7 +2295,7 @@ public:
     wxPGProperty* GetPropertyByName( const wxString& name ) const;
 
     // 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")
     void GetDisplayInfo( unsigned int column,
                          int choiceIndex,
diff --git a/include/wx/propgrid/propgridpagestate.h b/include/wx/propgrid/propgridpagestate.h
index 717982bf1c..03f7ea2aef 100644
--- a/include/wx/propgrid/propgridpagestate.h
+++ b/include/wx/propgrid/propgridpagestate.h
@@ -556,7 +556,7 @@ public:
 
     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")
     wxPGProperty* GetPropertyByLabel( const wxString& name,
                                       wxPGProperty* parent = NULL ) const;
diff --git a/src/propgrid/property.cpp b/src/propgrid/property.cpp
index 6d5d8edc9a..a46e7a5aea 100644
--- a/src/propgrid/property.cpp
+++ b/src/propgrid/property.cpp
@@ -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,
                                    int choiceIndex,
                                    int flags,
diff --git a/src/propgrid/propgridpagestate.cpp b/src/propgrid/propgridpagestate.cpp
index 1d071a6bb3..cec59c2a4f 100644
--- a/src/propgrid/propgridpagestate.cpp
+++ b/src/propgrid/propgridpagestate.cpp
@@ -459,7 +459,7 @@ wxPropertyCategory* wxPropertyGridPageState::GetPropertyCategory( const wxPGProp
 // wxPropertyGridPageState GetPropertyXXX methods
 // -----------------------------------------------------------------------
 
-#ifdef WXWIN_COMPATIBILITY_3_0
+#if WXWIN_COMPATIBILITY_3_0
 wxPGProperty* wxPropertyGridPageState::GetPropertyByLabel
                         ( const wxString& label, wxPGProperty* parent ) const
 {