Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix tests for WXWIN_COMPATIBILITY_2_8, closes #13800

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70098 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Paul Cornett
2011-12-23 05:59:59 +00:00
parent 9f194b9de0
commit 7bc57fd972
12 changed files with 15 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/wx/containr.h
View File

@@ -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, // common part of WX_DECLARE_CONTROL_CONTAINER in the native and generic cases,
// it should be used in the wxWindow-derived class declaration // it should be used in the wxWindow-derived class declaration

2
include/wx/docview.h
View File

@@ -986,7 +986,7 @@ wxTransferStreamToFile(wxInputStream& stream, const wxString& filename);
// these flags are not used anywhere by wxWidgets and kept only for an unlikely // 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 // case of existing user code using them for its own purposes
#ifdef WXWIN_COMPATIBILITY_2_8 #if WXWIN_COMPATIBILITY_2_8
enum enum
{ {
wxDOC_SDI = 1, wxDOC_SDI = 1,

2
include/wx/event.h
View File

@@ -3349,7 +3349,7 @@ protected:
// base class implementation passes the event to wxTheApp // base class implementation passes the event to wxTheApp
virtual bool TryAfter(wxEvent& event); virtual bool TryAfter(wxEvent& event);
#ifdef WXWIN_COMPATIBILITY_2_8 #if WXWIN_COMPATIBILITY_2_8
// deprecated method: override TryBefore() instead of this one // deprecated method: override TryBefore() instead of this one
wxDEPRECATED_BUT_USED_INTERNALLY_INLINE( wxDEPRECATED_BUT_USED_INTERNALLY_INLINE(
virtual bool TryValidator(wxEvent& WXUNUSED(event)), return false; ) virtual bool TryValidator(wxEvent& WXUNUSED(event)), return false; )

2
include/wx/font.h
View File

@@ -277,7 +277,7 @@ public:
static void SetDefaultEncoding(wxFontEncoding encoding); static void SetDefaultEncoding(wxFontEncoding encoding);
// this doesn't do anything and is kept for compatibility only // 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(void SetNoAntiAliasing(bool no = true), wxUnusedVar(no););
wxDEPRECATED_INLINE(bool GetNoAntiAliasing() const, return false;) wxDEPRECATED_INLINE(bool GetNoAntiAliasing() const, return false;)
#endif // WXWIN_COMPATIBILITY_2_8 #endif // WXWIN_COMPATIBILITY_2_8

2
include/wx/generic/grid.h
View File

@@ -1637,7 +1637,7 @@ public:
// unset any existing sorting column // unset any existing sorting column
void UnsetSortingColumn() { SetSortingColumn(wxNOT_FOUND); } 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...
// //
// ************************************************ // ************************************************

2
include/wx/generic/panelg.h
View File

@@ -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( wxDEPRECATED_CONSTRUCTOR(
wxPanel(wxWindow *parent, wxPanel(wxWindow *parent,
int x, int y, int width, int height, int x, int y, int width, int height,

2
include/wx/mousestate.h
View File

@@ -128,7 +128,7 @@ public:
// version of wxMouseState but their names are confusing as wxMouseEvent // version of wxMouseState but their names are confusing as wxMouseEvent
// has methods with the same names which do something quite different so // has methods with the same names which do something quite different so
// don't use them any more // 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 LeftDown() const, return LeftIsDown(); )
wxDEPRECATED_INLINE(bool MiddleDown() const, return MiddleIsDown(); ) wxDEPRECATED_INLINE(bool MiddleDown() const, return MiddleIsDown(); )
wxDEPRECATED_INLINE(bool RightDown() const, return RightIsDown(); ) wxDEPRECATED_INLINE(bool RightDown() const, return RightIsDown(); )

4
include/wx/msw/panel.h
View File

@@ -3,7 +3,7 @@
// Purpose: wxMSW-specific wxPanel class. // Purpose: wxMSW-specific wxPanel class.
// Author: Vadim Zeitlin // Author: Vadim Zeitlin
// Created: 2011-03-18 // 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> // Copyright: (c) 2011 Vadim Zeitlin <vadim@wxwidgets.org>
// Licence: wxWindows licence // 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( wxDEPRECATED_CONSTRUCTOR(
wxPanel(wxWindow *parent, wxPanel(wxWindow *parent,
int x, int y, int width, int height, int x, int y, int width, int height,

2
include/wx/slider.h
View File

@@ -105,7 +105,7 @@ public:
virtual int GetSelStart() const { return GetMax(); } virtual int GetSelStart() const { return GetMax(); }
virtual void SetSelection(int WXUNUSED(min), int WXUNUSED(max)) { } 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); ) wxDEPRECATED_INLINE( void SetTickFreq(int freq, int), DoSetTickFreq(freq); )
#endif #endif

4
include/wx/univ/panel.h
View File

@@ -3,7 +3,7 @@
// Purpose: wxUniversal-specific wxPanel class. // Purpose: wxUniversal-specific wxPanel class.
// Author: Vadim Zeitlin // Author: Vadim Zeitlin
// Created: 2011-03-18 // 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> // Copyright: (c) 2011 Vadim Zeitlin <vadim@wxwidgets.org>
// Licence: wxWindows licence // 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( wxDEPRECATED_CONSTRUCTOR(
wxPanel(wxWindow *parent, wxPanel(wxWindow *parent,
int x, int y, int width, int height, int x, int y, int width, int height,

2
include/wx/utils.h
View File

@@ -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 // A shorter way of using strcmp
wxDEPRECATED_INLINE(inline bool wxStringEq(const char *s1, const char *s2), wxDEPRECATED_INLINE(inline bool wxStringEq(const char *s1, const char *s2),
return wxCRT_StrcmpA(s1, s2) == 0; ) return wxCRT_StrcmpA(s1, s2) == 0; )

2
src/generic/grid.cpp
View File

@@ -8151,10 +8151,12 @@ void wxGrid::Fit()
AutoSize(); AutoSize();
} }
#if WXWIN_COMPATIBILITY_2_8
wxPen& wxGrid::GetDividerPen() const wxPen& wxGrid::GetDividerPen() const
{ {
return wxNullPen; return wxNullPen;
} }
#endif // WXWIN_COMPATIBILITY_2_8
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// cell value accessor functions // cell value accessor functions