fix tests for WXWIN_COMPATIBILITY_2_8, closes #13800

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70098 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/containr.h b/include/wx/containr.h
index a0ce88484f6dd4abb96e67c8dab8060d1149a64e..db2956ca4eb20a7a745cd28f6138990da596614f 100644 (file)
--- a/include/wx/containr.h
+++ b/include/wx/containr.h
@@ -258,7 +258,7 @@ protected:
 // look at them.
 // ----------------------------------------------------------------------------
 
 // look at them.
 // ----------------------------------------------------------------------------
 

-#ifdef WXWIN_COMPATIBILITY_2_8
+#if WXWIN_COMPATIBILITY_2_8

 
 // common part of WX_DECLARE_CONTROL_CONTAINER in the native and generic cases,
 // it should be used in the wxWindow-derived class declaration
 
 // common part of WX_DECLARE_CONTROL_CONTAINER in the native and generic cases,
 // it should be used in the wxWindow-derived class declaration

diff --git a/include/wx/docview.h b/include/wx/docview.h
index 502a714446f69cbdb7626b1039303d218f366381..9b8cfa73544e10e9987090bd03d14270f7371cad 100644 (file)
--- a/include/wx/docview.h
+++ b/include/wx/docview.h
@@ -986,7 +986,7 @@ wxTransferStreamToFile(wxInputStream& stream, const wxString& filename);
 
 // these flags are not used anywhere by wxWidgets and kept only for an unlikely
 // case of existing user code using them for its own purposes
 
 // these flags are not used anywhere by wxWidgets and kept only for an unlikely
 // case of existing user code using them for its own purposes

-#ifdef WXWIN_COMPATIBILITY_2_8
+#if WXWIN_COMPATIBILITY_2_8

 enum
 {
     wxDOC_SDI = 1,
 enum
 {
     wxDOC_SDI = 1,

diff --git a/include/wx/event.h b/include/wx/event.h
index fb45b71c550ed95a88ba8d8e2d3c782bf240f748..0c074e6bae861a2ad6b5fc98e608ed5ec91fbe48 100644 (file)
--- a/include/wx/event.h
+++ b/include/wx/event.h
@@ -3349,7 +3349,7 @@ protected:
     // base class implementation passes the event to wxTheApp
     virtual bool TryAfter(wxEvent& event);
 
     // base class implementation passes the event to wxTheApp
     virtual bool TryAfter(wxEvent& event);
 

-#ifdef WXWIN_COMPATIBILITY_2_8
+#if WXWIN_COMPATIBILITY_2_8

     // deprecated method: override TryBefore() instead of this one
     wxDEPRECATED_BUT_USED_INTERNALLY_INLINE(
         virtual bool TryValidator(wxEvent& WXUNUSED(event)), return false; )
     // deprecated method: override TryBefore() instead of this one
     wxDEPRECATED_BUT_USED_INTERNALLY_INLINE(
         virtual bool TryValidator(wxEvent& WXUNUSED(event)), return false; )

diff --git a/include/wx/font.h b/include/wx/font.h
index 43968049b38eeb2779a50fc9138c78745d2f554c..b50949b7c65224cdc0b5cfec53d35dd05f39b53d 100644 (file)
--- a/include/wx/font.h
+++ b/include/wx/font.h
@@ -277,7 +277,7 @@ public:
     static void SetDefaultEncoding(wxFontEncoding encoding);
 
     // this doesn't do anything and is kept for compatibility only
     static void SetDefaultEncoding(wxFontEncoding encoding);
 
     // this doesn't do anything and is kept for compatibility only

-#ifdef WXWIN_COMPATIBILITY_2_8
+#if WXWIN_COMPATIBILITY_2_8

     wxDEPRECATED_INLINE(void SetNoAntiAliasing(bool no = true), wxUnusedVar(no););
     wxDEPRECATED_INLINE(bool GetNoAntiAliasing() const, return false;)
 #endif // WXWIN_COMPATIBILITY_2_8
     wxDEPRECATED_INLINE(void SetNoAntiAliasing(bool no = true), wxUnusedVar(no););
     wxDEPRECATED_INLINE(bool GetNoAntiAliasing() const, return false;)
 #endif // WXWIN_COMPATIBILITY_2_8

diff --git a/include/wx/generic/grid.h b/include/wx/generic/grid.h
index c65d2e2f507548910c20c091d1272bb8e3be9624..c4eab88bebfa10c5e2b5f289586495c47afa3db7 100644 (file)
--- a/include/wx/generic/grid.h
+++ b/include/wx/generic/grid.h
@@ -1637,7 +1637,7 @@ public:
     // unset any existing sorting column
     void UnsetSortingColumn() { SetSortingColumn(wxNOT_FOUND); }
 
     // unset any existing sorting column
     void UnsetSortingColumn() { SetSortingColumn(wxNOT_FOUND); }
 

-#ifdef WXWIN_COMPATIBILITY_2_8
+#if WXWIN_COMPATIBILITY_2_8

     // ------ For compatibility with previous wxGrid only...
     //
     //  ************************************************
     // ------ For compatibility with previous wxGrid only...
     //
     //  ************************************************

diff --git a/include/wx/generic/panelg.h b/include/wx/generic/panelg.h
index a23d64786e67ed7101184dd26d0db81479e1ba72..6bd2ad6073c67ce8f2370818260ae7dcb5b2a568 100644 (file)
--- a/include/wx/generic/panelg.h
+++ b/include/wx/generic/panelg.h
@@ -30,7 +30,7 @@ public:
         Create(parent, winid, pos, size, style, name);
     }
 
         Create(parent, winid, pos, size, style, name);
     }
 

-#ifdef WXWIN_COMPATIBILITY_2_8
+#if WXWIN_COMPATIBILITY_2_8

     wxDEPRECATED_CONSTRUCTOR(
     wxPanel(wxWindow *parent,
             int x, int y, int width, int height,
     wxDEPRECATED_CONSTRUCTOR(
     wxPanel(wxWindow *parent,
             int x, int y, int width, int height,

diff --git a/include/wx/mousestate.h b/include/wx/mousestate.h
index f338ea55d9dae0ac84f1f5f03f7d0931b0511bb4..98ab291baf72cece641d8e233fe33c7de677b55a 100644 (file)
--- a/include/wx/mousestate.h
+++ b/include/wx/mousestate.h
@@ -128,7 +128,7 @@ public:
     // version of wxMouseState but their names are confusing as wxMouseEvent
     // has methods with the same names which do something quite different so
     // don't use them any more
     // version of wxMouseState but their names are confusing as wxMouseEvent
     // has methods with the same names which do something quite different so
     // don't use them any more

-#ifdef WXWIN_COMPATIBILITY_2_8
+#if WXWIN_COMPATIBILITY_2_8

     wxDEPRECATED_INLINE(bool LeftDown() const, return LeftIsDown(); )
     wxDEPRECATED_INLINE(bool MiddleDown() const, return MiddleIsDown(); )
     wxDEPRECATED_INLINE(bool RightDown() const, return RightIsDown(); )
     wxDEPRECATED_INLINE(bool LeftDown() const, return LeftIsDown(); )
     wxDEPRECATED_INLINE(bool MiddleDown() const, return MiddleIsDown(); )
     wxDEPRECATED_INLINE(bool RightDown() const, return RightIsDown(); )

diff --git a/include/wx/msw/panel.h b/include/wx/msw/panel.h
index 690f54438e9d938a220cbb52217fcd83f7fc987c..7789a31d7719aea5e6671a4e54ffd8de9635b864 100644 (file)
--- a/include/wx/msw/panel.h
+++ b/include/wx/msw/panel.h
@@ -3,7 +3,7 @@
 // Purpose:     wxMSW-specific wxPanel class.
 // Author:      Vadim Zeitlin
 // Created:     2011-03-18
 // Purpose:     wxMSW-specific wxPanel class.
 // Author:      Vadim Zeitlin
 // Created:     2011-03-18

-// RCS-ID:      $Id: wxhead.h,v 1.12 2010-04-22 12:44:51 zeitlin Exp $
+// RCS-ID:      $Id$

 // Copyright:   (c) 2011 Vadim Zeitlin <vadim@wxwidgets.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) 2011 Vadim Zeitlin <vadim@wxwidgets.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////


@@ -38,7 +38,7 @@ public:
     virtual bool HasTransparentBackground();
 
 
     virtual bool HasTransparentBackground();
 
 

-#ifdef WXWIN_COMPATIBILITY_2_8
+#if WXWIN_COMPATIBILITY_2_8

     wxDEPRECATED_CONSTRUCTOR(
     wxPanel(wxWindow *parent,
             int x, int y, int width, int height,
     wxDEPRECATED_CONSTRUCTOR(
     wxPanel(wxWindow *parent,
             int x, int y, int width, int height,

diff --git a/include/wx/slider.h b/include/wx/slider.h
index 2bb796236e484f1273fb9d20f032b5c71c7453bc..caf37117a81500bf307d96d3e00707ead4ad8255 100644 (file)
--- a/include/wx/slider.h
+++ b/include/wx/slider.h
@@ -105,7 +105,7 @@ public:
     virtual int GetSelStart() const { return GetMax(); }
     virtual void SetSelection(int WXUNUSED(min), int WXUNUSED(max)) { }
 
     virtual int GetSelStart() const { return GetMax(); }
     virtual void SetSelection(int WXUNUSED(min), int WXUNUSED(max)) { }
 

-#ifdef WXWIN_COMPATIBILITY_2_8
+#if WXWIN_COMPATIBILITY_2_8

     wxDEPRECATED_INLINE( void SetTickFreq(int freq, int), DoSetTickFreq(freq); )
 #endif
 
     wxDEPRECATED_INLINE( void SetTickFreq(int freq, int), DoSetTickFreq(freq); )
 #endif
 

diff --git a/include/wx/univ/panel.h b/include/wx/univ/panel.h
index 19f0d52dc051ee0989222aef828cf7acc62df92c..29537e48ddad55de18d73f13fd5b84c52677f95f 100644 (file)
--- a/include/wx/univ/panel.h
+++ b/include/wx/univ/panel.h
@@ -3,7 +3,7 @@
 // Purpose:     wxUniversal-specific wxPanel class.
 // Author:      Vadim Zeitlin
 // Created:     2011-03-18
 // Purpose:     wxUniversal-specific wxPanel class.
 // Author:      Vadim Zeitlin
 // Created:     2011-03-18

-// RCS-ID:      $Id: wxhead.h,v 1.12 2010-04-22 12:44:51 zeitlin Exp $
+// RCS-ID:      $Id$

 // Copyright:   (c) 2011 Vadim Zeitlin <vadim@wxwidgets.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) 2011 Vadim Zeitlin <vadim@wxwidgets.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////


@@ -32,7 +32,7 @@ public:
 
     virtual bool IsCanvasWindow() const { return true; }
 
 
     virtual bool IsCanvasWindow() const { return true; }
 

-#ifdef WXWIN_COMPATIBILITY_2_8
+#if WXWIN_COMPATIBILITY_2_8

     wxDEPRECATED_CONSTRUCTOR(
     wxPanel(wxWindow *parent,
             int x, int y, int width, int height,
     wxDEPRECATED_CONSTRUCTOR(
     wxPanel(wxWindow *parent,
             int x, int y, int width, int height,

diff --git a/include/wx/utils.h b/include/wx/utils.h
index 1ee4f2fbcbf8a227938f123c6328406a181e8800..45ae16eea5f14d82a34857836131da3205da71ae 100644 (file)
--- a/include/wx/utils.h
+++ b/include/wx/utils.h
@@ -113,7 +113,7 @@ wxClip(T1 a, T2 b, T3 c)
 // String functions (deprecated, use wxString)
 // ----------------------------------------------------------------------------
 
 // String functions (deprecated, use wxString)
 // ----------------------------------------------------------------------------
 

-#ifdef WXWIN_COMPATIBILITY_2_8
+#if WXWIN_COMPATIBILITY_2_8

 // A shorter way of using strcmp
 wxDEPRECATED_INLINE(inline bool wxStringEq(const char *s1, const char *s2),
     return wxCRT_StrcmpA(s1, s2) == 0; )
 // A shorter way of using strcmp
 wxDEPRECATED_INLINE(inline bool wxStringEq(const char *s1, const char *s2),
     return wxCRT_StrcmpA(s1, s2) == 0; )

diff --git a/src/generic/grid.cpp b/src/generic/grid.cpp
index a6042898add389b5cbbd21265c8ca1ce931e6546..a1393a091780bff8d38dfb3ececf410063aafdd0 100644 (file)
--- a/src/generic/grid.cpp
+++ b/src/generic/grid.cpp
@@ -8151,10 +8151,12 @@ void wxGrid::Fit()
     AutoSize();
 }
 
     AutoSize();
 }
 

+#if WXWIN_COMPATIBILITY_2_8

 wxPen& wxGrid::GetDividerPen() const
 {
     return wxNullPen;
 }
 wxPen& wxGrid::GetDividerPen() const
 {
     return wxNullPen;
 }

+#endif // WXWIN_COMPATIBILITY_2_8

 
 // ----------------------------------------------------------------------------
 // cell value accessor functions
 
 // ----------------------------------------------------------------------------
 // cell value accessor functions