Try loading even English translations if provided.

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

diff --git a/include/wx/msw/slider.h b/include/wx/msw/slider.h
index 4dfe3dd50a38417d303d3fd603003215f1f2abdc..a16c5952e05e5cca1a52da21cd3ac4d709d4c6d5 100644 (file)
--- a/include/wx/msw/slider.h
+++ b/include/wx/msw/slider.h
@@ -4,7 +4,6 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     01/02/97
-// RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -15,7 +14,7 @@
 class WXDLLIMPEXP_FWD_CORE wxSubwindows;
 
 // Slider
-class WXDLLEXPORT wxSlider : public wxSliderBase
+class WXDLLIMPEXP_CORE wxSlider : public wxSliderBase
 {
 public:
     wxSlider() { Init(); }
@@ -59,7 +58,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 +99,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 +131,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)
 };