Deprecate second parameter of wxSlider::SetTickFreq().

This parameter was never needed nor properly documented. Simply remove it from
SetTickFreq() and keep the overload still taking it for backwards
compatibility only.

Closes #12907.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66844 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2011-02-05 16:36:30 +00:00
parent c20389eb5f
commit 0a12e013f5
18 changed files with 41 additions and 26 deletions

View File

@@ -94,12 +94,14 @@ public:
virtual int GetThumbLength() const;
// copied from (wxSliderCocoa.h)
virtual void SetTickFreq(int n, int pos);
virtual int GetTickFreq() const;
virtual void ClearTicks() { SetTickFreq(0, 0); }
virtual void ClearTicks() { SetTickFreq(0); }
virtual void SetTickPos(int pos);
protected:
// Platform-specific implementation of SetTickFreq
virtual void DoSetTickFreq(int freq);
};
#endif

View File

@@ -59,7 +59,6 @@ public:
int GetMax() const { return m_rangeMax; }
// Win32-specific slider methods
void SetTickFreq(int n, int pos);
int GetTickFreq() const { return m_tickFreq; }
void SetPageSize(int pageSize);
int GetPageSize() const;
@@ -131,6 +130,9 @@ protected:
// of dragging the thumb or scrolling the mouse wheel
bool m_isDragging;
// Platform-specific implementation of SetTickFreq
virtual void DoSetTickFreq(int freq);
DECLARE_DYNAMIC_CLASS_NO_COPY(wxSlider)
};

View File

@@ -94,9 +94,6 @@ public:
);
void SetThumbLength(int nLen) ;
void SetTick(int ntickPos) ;
void SetTickFreq( int n
,int nPos
);
//
// IMPLEMENTATION
@@ -148,6 +145,10 @@ protected:
,int nHeight
,int nSizeFlags = wxSIZE_AUTO
);
// Platform-specific implementation of SetTickFreq
virtual void DoSetTickFreq(int freq);
private:
DECLARE_DYNAMIC_CLASS(wxSlider)
}; // end of CLASS wxSlider

View File

@@ -59,7 +59,6 @@ public:
void SetMax(int maxValue) { SetRange(m_rangeMin, maxValue); }
// For trackbars only
void SetTickFreq(int n, int pos);
inline int GetTickFreq() const { return m_tickFreq; }
void SetPageSize(int pageSize);
int GetPageSize() const ;
@@ -81,6 +80,9 @@ public:
virtual void TriggerScrollEvent( wxEventType scrollEvent ) ;
protected:
// Platform-specific implementation of SetTickFreq
virtual void DoSetTickFreq(int freq);
virtual wxSize DoGetBestSize() const;
virtual void DoSetSize(int x, int y, int w, int h, int sizeFlags);
virtual void DoMoveWindow(int x, int y, int w, int h);

View File

@@ -52,7 +52,6 @@ public:
int GetMax() const;
// For trackbars only
void SetTickFreq(int n, int pos);
int GetTickFreq() const;
void SetPageSize(int pageSize);
int GetPageSize() const;
@@ -75,6 +74,8 @@ public:
bool SendScrollEvent(WXEVENTPTR event);
protected:
// Platform-specific implementation of SetTickFreq
virtual void DoSetTickFreq(int freq);
virtual wxSize DoGetBestSize() const;

View File

@@ -95,7 +95,7 @@ public:
// warning: most of subsequent methods are currently only implemented in
// wxMSW under Win95 and are silently ignored on other platforms
virtual void SetTickFreq(int WXUNUSED(n), int WXUNUSED(pos)) { }
void SetTickFreq(int freq) { DoSetTickFreq(freq); }
virtual int GetTickFreq() const { return 0; }
virtual void ClearTicks() { }
virtual void SetTick(int WXUNUSED(tickPos)) { }
@@ -105,7 +105,13 @@ public:
virtual int GetSelStart() const { return GetMax(); }
virtual void SetSelection(int WXUNUSED(min), int WXUNUSED(max)) { }
#ifdef WXWIN_COMPATIBILITY_2_8
wxDEPRECATED_INLINE( void SetTickFreq(int freq, int), DoSetTickFreq(freq); )
#endif
protected:
// Platform-specific implementation of SetTickFreq
virtual void DoSetTickFreq(int WXUNUSED(freq)) { /* unsupported by default */ }
// choose the default border for this window
virtual wxBorder GetDefaultBorder() const { return wxBORDER_NONE; }

View File

@@ -77,7 +77,6 @@ public:
virtual void SetThumbLength(int lenPixels);
virtual int GetThumbLength() const;
virtual void SetTickFreq(int n, int WXUNUSED(dummy) = 0);
virtual int GetTickFreq() const { return m_tickFreq; }
// wxUniv-specific methods
@@ -137,6 +136,9 @@ protected:
INVALID_THUMB_VALUE = -0xffff
};
// Platform-specific implementation of SetTickFreq
virtual void DoSetTickFreq(int freq);
// overridden base class virtuals
virtual wxSize DoGetBestClientSize() const;
virtual void DoDraw(wxControlRenderer *renderer);