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

diff --git a/include/wx/effects.h b/include/wx/effects.h
index c3e3fcc345743bfd38eaa3425c5741b071e00777..cf197f2e5a71495e78fc2fadd336cf4d9520c070 100644 (file)
--- 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
 //
 // 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
 
 /*
  * wxEffects: various 3D effects

diff --git a/include/wx/event.h b/include/wx/event.h
index 0f9ee90215d7745f56a74fed20fb28a947452047..9ca83416710469607bc74cdacaca940538a0a968 100644 (file)
--- 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; }
 
     // 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
 
     wxDEPRECATED( bool GetShow() const { return IsShown(); } )
 #endif
 


@@ -1397,7 +1397,7 @@ public:
         : wxEvent(event)
     { m_iconized = event.m_iconized; }
 
         : 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
     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 29a00000b5a7c8b569da7ed7c964a0de35d1808f..24ccb6b56e8b5f8602db36a60055ea08f2f78ad2 100644 (file)
--- 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; }
 
     // 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);
     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 a813e888409145a7d156e1203ca1932cb359aabf..b2edab0779438dfc9929bf50418b2882f2c3ccf6 100644 (file)
--- 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; }
 
     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); }
     )
     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);
 
     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)
         {
     wxDEPRECATED(
         wxImage(const wxString& name, long type, int index = -1)
         {

diff --git a/src/common/effects.cpp b/src/common/effects.cpp
index e1d93d144d73fcf4853f2813aca510343be30334..fe7a35e25ef6977db10eb5847e2af054be146925 100644 (file)
--- a/src/common/effects.cpp
+++ b/src/common/effects.cpp
@@ -25,6 +25,8 @@
     #include "wx/gdicmn.h"
 #endif //WX_PRECOMP
 
     #include "wx/gdicmn.h"
 #endif //WX_PRECOMP
 

+#if WXWIN_COMPATIBILITY_2_8
+

 /*
  * wxEffectsImpl: various 3D effects
  */
 /*
  * wxEffectsImpl: various 3D effects
  */


@@ -122,3 +124,6 @@ bool wxEffectsImpl::TileBitmap(const wxRect& rect, wxDC& dc, const wxBitmap& bit
 
     return true;
 }
 
     return true;
 }

+
+#endif // WXWIN_COMPATIBILITY_2_8
+