Merge in from trunk r68684 - r69046

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

diff --git a/include/wx/palmos/slider.h b/include/wx/palmos/slider.h
index 263e4a715308f7d10c45e80c6254945855f9af20..5c978c1b9c2e298362cbe59d0b0504e51d39efb4 100644 (file)
--- a/include/wx/palmos/slider.h
+++ b/include/wx/palmos/slider.h
@@ -13,7 +13,7 @@
 #define _SLIDERPALM_H_
 
 // Slider
-class WXDLLEXPORT wxSlider : public wxSliderBase
+class WXDLLIMPEXP_CORE wxSlider : public wxSliderBase
 {
 public:
     wxSlider()
@@ -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;