From 831b64f32f204d1424e248d100c109974aa4238c Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Thu, 26 Jun 2008 11:16:40 +0000
Subject: [PATCH] fix the wrong #ifdef WXWIN_COMPATIBILITY_2_8 checks, #if
 should be used (#9644)

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@54372 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 include/wx/effects.h   | 2 +-
 include/wx/event.h     | 4 ++--
 include/wx/iconbndl.h  | 2 +-
 include/wx/image.h     | 4 ++--
 src/common/effects.cpp | 5 +++++
 5 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/include/wx/effects.h b/include/wx/effects.h
index c3e3fcc345..cf197f2e5a 100644
--- a/include/wx/effects.h
+++ b/include/wx/effects.h
@@ -17,7 +17,7 @@
 //
 // please use wxRenderer::DrawBorder() instead of DrawSunkenEdge(); there is no
 // replacement for TileBitmap() but it doesn't seem to be very useful anyhow
-#ifdef WXWIN_COMPATIBILITY_2_8
+#if WXWIN_COMPATIBILITY_2_8
 
 /*
  * wxEffects: various 3D effects
diff --git a/include/wx/event.h b/include/wx/event.h
index 0f9ee90215..9ca8341671 100644
--- a/include/wx/event.h
+++ b/include/wx/event.h
@@ -1370,7 +1370,7 @@ public:
     // return true if the window was shown, false if hidden
     bool IsShown() const { return m_show; }
 
-#ifdef WXWIN_COMPATIBILITY_2_8
+#if WXWIN_COMPATIBILITY_2_8
     wxDEPRECATED( bool GetShow() const { return IsShown(); } )
 #endif
 
@@ -1397,7 +1397,7 @@ public:
         : wxEvent(event)
     { m_iconized = event.m_iconized; }
 
-#ifdef WXWIN_COMPATIBILITY_2_8
+#if WXWIN_COMPATIBILITY_2_8
     wxDEPRECATED( bool Iconized() const { return IsIconized(); } )
 #endif
     // return true if the frame was iconized, false if restored
diff --git a/include/wx/iconbndl.h b/include/wx/iconbndl.h
index 29a00000b5..24ccb6b56e 100644
--- a/include/wx/iconbndl.h
+++ b/include/wx/iconbndl.h
@@ -84,7 +84,7 @@ public:
     // check if we have any icons at all
     bool IsEmpty() const { return GetIconCount() == 0; }
 
-#ifdef WXWIN_COMPATIBILITY_2_8
+#if WXWIN_COMPATIBILITY_2_8
     wxDEPRECATED( void AddIcon(const wxString& file, long type)
         {
             AddIcon(file, (long)type);
diff --git a/include/wx/image.h b/include/wx/image.h
index a813e88840..b2edab0779 100644
--- a/include/wx/image.h
+++ b/include/wx/image.h
@@ -112,7 +112,7 @@ public:
     wxBitmapType GetType() const { return m_type; }
     const wxString& GetMimeType() const { return m_mime; }
 
-#ifdef WXWIN_COMPATIBILITY_2_8
+#if WXWIN_COMPATIBILITY_2_8
     wxDEPRECATED(
         void SetType(long type) { SetType((wxBitmapType)type); }
     )
@@ -434,7 +434,7 @@ public:
     static HSVValue RGBtoHSV(const RGBValue& rgb);
     static RGBValue HSVtoRGB(const HSVValue& hsv);
 
-#ifdef WXWIN_COMPATIBILITY_2_8
+#if WXWIN_COMPATIBILITY_2_8
     wxDEPRECATED(
         wxImage(const wxString& name, long type, int index = -1)
         {
diff --git a/src/common/effects.cpp b/src/common/effects.cpp
index e1d93d144d..fe7a35e25e 100644
--- a/src/common/effects.cpp
+++ b/src/common/effects.cpp
@@ -25,6 +25,8 @@
     #include "wx/gdicmn.h"
 #endif //WX_PRECOMP
 
+#if WXWIN_COMPATIBILITY_2_8
+
 /*
  * wxEffectsImpl: various 3D effects
  */
@@ -122,3 +124,6 @@ bool wxEffectsImpl::TileBitmap(const wxRect& rect, wxDC& dc, const wxBitmap& bit
 
     return true;
 }
+
+#endif // WXWIN_COMPATIBILITY_2_8
+
-- 
2.45.2