Removed WXWIN_COMPATIBILITY_2_2 together with code guarded by it.
Changed default for WXWIN_COMPATIBILITY_2_4 to 0. Added WXWIN_COMPATIBILITY_2_6 (defaults to 1). Ran build/update-setup-h. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35858 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -82,11 +82,6 @@ public:
|
||||
int m_rangeMax,
|
||||
m_gaugePos;
|
||||
|
||||
// obsolete functions, don't use
|
||||
#if WXWIN_COMPATIBILITY_2_2
|
||||
bool GetProgressBar() const { return true; }
|
||||
#endif // WXWIN_COMPATIBILITY_2_2
|
||||
|
||||
protected:
|
||||
// common part of all ctors
|
||||
void Init() { m_rangeMax = m_gaugePos = 0; }
|
||||
|
@@ -90,13 +90,6 @@ public:
|
||||
|
||||
int GetCount() const;
|
||||
|
||||
// for compatibility only, don't use these methods in new code!
|
||||
#if WXWIN_COMPATIBILITY_2_2
|
||||
wxDEPRECATED( int Number() const );
|
||||
wxDEPRECATED( wxString GetLabel(int n) const );
|
||||
wxDEPRECATED( void SetLabel( int item, const wxString& label ) );
|
||||
#endif // WXWIN_COMPATIBILITY_2_2
|
||||
|
||||
// we have to override those to avoid virtual function name hiding
|
||||
virtual wxString GetLabel() const { return wxControl::GetLabel(); }
|
||||
virtual void SetLabel( const wxString& label );
|
||||
|
@@ -163,11 +163,6 @@ public:
|
||||
// Overridden from wxWidgets due callback being static
|
||||
virtual void SetScrollPos( int orient, int pos, bool refresh = TRUE );
|
||||
|
||||
#if WXWIN_COMPATIBILITY_2_2
|
||||
// Compatibility
|
||||
void ViewStart(int *x, int *y) const { GetViewStart( x, y ); }
|
||||
#endif // WXWIN_COMPATIBILITY_2_2
|
||||
|
||||
virtual void DoPrepareDC(wxDC& dc);
|
||||
|
||||
protected:
|
||||
|
Reference in New Issue
Block a user