Richtext interface fixes and additions for Phoenix

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

diff --git a/include/wx/osx/slider.h b/include/wx/osx/slider.h
index b70ae451b0def4329a28c433d20cd4708b4def2a..b4f4cdf8b4229ba657203db2a3e76834040b0b5f 100644 (file)
--- a/include/wx/osx/slider.h
+++ b/include/wx/osx/slider.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        slider.h
+// Name:        wx/osx/slider.h

 // Purpose:     wxSlider class
 // Author:      Stefan Csomor
 // Modified by:
 // Purpose:     wxSlider class
 // Author:      Stefan Csomor
 // Modified by:


@@ -16,8 +16,6 @@
 #include "wx/slider.h"
 #include "wx/stattext.h"
 
 #include "wx/slider.h"
 #include "wx/stattext.h"
 

-WXDLLIMPEXP_DATA_CORE(extern const char) wxSliderNameStr[];
-

 // Slider
 class WXDLLIMPEXP_CORE wxSlider: public wxSliderBase
 {
 // Slider
 class WXDLLIMPEXP_CORE wxSlider: public wxSliderBase
 {


@@ -59,7 +57,6 @@ public:
     void SetMax(int maxValue) { SetRange(m_rangeMin, maxValue); }
 
     // For trackbars only
     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 ;
     inline int GetTickFreq() const { return m_tickFreq; }
     void SetPageSize(int pageSize);
     int GetPageSize() const ;


@@ -76,11 +73,14 @@ public:
 
     void Command(wxCommandEvent& event);
     // osx specific event handling common for all osx-ports
 
     void Command(wxCommandEvent& event);
     // osx specific event handling common for all osx-ports

-    
+

     virtual bool OSXHandleClicked( double timestampsec );
     virtual void TriggerScrollEvent( wxEventType scrollEvent ) ;
 
 protected:
     virtual bool OSXHandleClicked( double timestampsec );
     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);
     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);