X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/936f635341e9b92b37db93cc7781d564babbe25f..1f0acb435592470b421b80df854fbbb08cd2853f:/include/wx/msw/slider.h

diff --git a/include/wx/msw/slider.h b/include/wx/msw/slider.h
index 4dfe3dd50a..23de38a607 100644
--- a/include/wx/msw/slider.h
+++ b/include/wx/msw/slider.h
@@ -15,7 +15,7 @@
 class WXDLLIMPEXP_FWD_CORE wxSubwindows;
 
 // Slider
-class WXDLLEXPORT wxSlider : public wxSliderBase
+class WXDLLIMPEXP_CORE wxSlider : public wxSliderBase
 {
 public:
     wxSlider() { Init(); }
@@ -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;
@@ -101,13 +100,17 @@ protected:
     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 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.
+    //
+    // Notice that the return value will be 0 if we don't have wxSL_LABELS
+    // style but we do fill widthMin and widthMax even if we don't have
+    // wxSL_MIN_MAX_LABELS style set so the caller should account for it.
+    int GetLabelsSize(int *widthMin = NULL, int *widthMax = NULL) const;
 
 
     // overridden base class virtuals
@@ -129,6 +132,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)
 };