Move "static" keyword out from wxDEPRECATED() macros to placate icc.

[wxWidgets.git] / include / wx / msw / slider.h

diff --git a/include/wx/msw/slider.h b/include/wx/msw/slider.h
index 019bc233da1f017223d002c405c166e3c6859cf9..abd4ec4985fa0a771e084afea13044d699906f37 100644 (file)
--- a/include/wx/msw/slider.h
+++ b/include/wx/msw/slider.h
@@ -59,7 +59,6 @@ public:
     int GetMax() const { return m_rangeMax; }
 
     // Win32-specific slider methods
     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;
     int GetTickFreq() const { return m_tickFreq; }
     void SetPageSize(int pageSize);
     int GetPageSize() const;


@@ -101,13 +100,13 @@ protected:
     void Init();
 
     // format an integer value as string
     void Init();
 
     // format an integer value as string

-    static wxString Format(int n) { return wxString::Format(_T("%d"), n); }
+    static wxString Format(int n) { return wxString::Format(wxT("%d"), n); }

 
     // get the boundig box for the slider and possible labels
     wxRect GetBoundingBox() const;
 
 
     // get the boundig box for the slider and possible labels
     wxRect GetBoundingBox() const;
 

-    // get the height and, if the pointer is not NULL, width of our labels
-    int GetLabelsSize(int *width = NULL) const;
+    // Get the height and, if the pointers are non NULL, widths of both labels.
+    int GetLabelsSize(int *widthMin = NULL, int *widthMax = NULL) const;

 
 
     // overridden base class virtuals
 
 
     // overridden base class virtuals


@@ -124,11 +123,16 @@ protected:
     int           m_pageSize;
     int           m_lineSize;
     int           m_tickFreq;
     int           m_pageSize;
     int           m_lineSize;
     int           m_tickFreq;

+    int           m_minLabelWidth;
+    int           m_maxLabelWidth;

 
     // flag needed to detect whether we're getting THUMBRELEASE event because
     // of dragging the thumb or scrolling the mouse wheel
     bool m_isDragging;
 
 
     // flag needed to detect whether we're getting THUMBRELEASE event because
     // 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)
 };
 
     DECLARE_DYNAMIC_CLASS_NO_COPY(wxSlider)
 };