From 7bc57fd972ddf7621bc6d4716e6dbda1cf09312e Mon Sep 17 00:00:00 2001 From: Paul Cornett Date: Fri, 23 Dec 2011 05:59:59 +0000 Subject: [PATCH] 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 --- include/wx/containr.h | 2 +- include/wx/docview.h | 2 +- include/wx/event.h | 2 +- include/wx/font.h | 2 +- include/wx/generic/grid.h | 2 +- include/wx/generic/panelg.h | 2 +- include/wx/mousestate.h | 2 +- include/wx/msw/panel.h | 4 ++-- include/wx/slider.h | 2 +- include/wx/univ/panel.h | 4 ++-- include/wx/utils.h | 2 +- src/generic/grid.cpp | 2 ++ 12 files changed, 15 insertions(+), 13 deletions(-) diff --git a/include/wx/containr.h b/include/wx/containr.h index a0ce88484f..db2956ca4e 100644 --- a/include/wx/containr.h +++ b/include/wx/containr.h @@ -258,7 +258,7 @@ protected: // 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 diff --git a/include/wx/docview.h b/include/wx/docview.h index 502a714446..9b8cfa7354 100644 --- 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 -#ifdef WXWIN_COMPATIBILITY_2_8 +#if WXWIN_COMPATIBILITY_2_8 enum { wxDOC_SDI = 1, diff --git a/include/wx/event.h b/include/wx/event.h index fb45b71c55..0c074e6bae 100644 --- 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); -#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; ) diff --git a/include/wx/font.h b/include/wx/font.h index 43968049b3..b50949b7c6 100644 --- 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 -#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 diff --git a/include/wx/generic/grid.h b/include/wx/generic/grid.h index c65d2e2f50..c4eab88beb 100644 --- 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); } -#ifdef WXWIN_COMPATIBILITY_2_8 +#if WXWIN_COMPATIBILITY_2_8 // ------ For compatibility with previous wxGrid only... // // ************************************************ diff --git a/include/wx/generic/panelg.h b/include/wx/generic/panelg.h index a23d64786e..6bd2ad6073 100644 --- a/include/wx/generic/panelg.h +++ b/include/wx/generic/panelg.h @@ -30,7 +30,7 @@ public: 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, diff --git a/include/wx/mousestate.h b/include/wx/mousestate.h index f338ea55d9..98ab291baf 100644 --- 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 -#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(); ) diff --git a/include/wx/msw/panel.h b/include/wx/msw/panel.h index 690f54438e..7789a31d77 100644 --- 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 -// RCS-ID: $Id: wxhead.h,v 1.12 2010-04-22 12:44:51 zeitlin Exp $ +// RCS-ID: $Id$ // Copyright: (c) 2011 Vadim Zeitlin // Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// @@ -38,7 +38,7 @@ public: 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, diff --git a/include/wx/slider.h b/include/wx/slider.h index 2bb796236e..caf37117a8 100644 --- 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)) { } -#ifdef WXWIN_COMPATIBILITY_2_8 +#if WXWIN_COMPATIBILITY_2_8 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 19f0d52dc0..29537e48dd 100644 --- 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 -// RCS-ID: $Id: wxhead.h,v 1.12 2010-04-22 12:44:51 zeitlin Exp $ +// RCS-ID: $Id$ // Copyright: (c) 2011 Vadim Zeitlin // Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// @@ -32,7 +32,7 @@ public: 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, diff --git a/include/wx/utils.h b/include/wx/utils.h index 1ee4f2fbcb..45ae16eea5 100644 --- 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) // ---------------------------------------------------------------------------- -#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; ) diff --git a/src/generic/grid.cpp b/src/generic/grid.cpp index a6042898ad..a1393a0917 100644 --- a/src/generic/grid.cpp +++ b/src/generic/grid.cpp @@ -8151,10 +8151,12 @@ void wxGrid::Fit() AutoSize(); } +#if WXWIN_COMPATIBILITY_2_8 wxPen& wxGrid::GetDividerPen() const { return wxNullPen; } +#endif // WXWIN_COMPATIBILITY_2_8 // ---------------------------------------------------------------------------- // cell value accessor functions -- 2.45.2