Implement GetPageText for the OSX WebKit implementation.

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

diff --git a/include/wx/palmos/slider.h b/include/wx/palmos/slider.h
index 187e258d89f6937cc33fa5759953144bc59a027d..5c978c1b9c2e298362cbe59d0b0504e51d39efb4 100644 (file)
--- a/include/wx/palmos/slider.h
+++ b/include/wx/palmos/slider.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        wx/palmos/slider95.h
+// Name:        wx/palmos/slider.h

 // Purpose:     wxSlider class
 // Author:      William Osborne - minimal working wxPalmOS port
 // Modified by: Wlodzimierz ABX Skiba - native implementation
 // Purpose:     wxSlider class
 // Author:      William Osborne - minimal working wxPalmOS port
 // Modified by: Wlodzimierz ABX Skiba - native implementation


@@ -9,18 +9,17 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#ifndef _SLIDER95_H_
-#define _SLIDER95_H_
-
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma interface "slider95.h"
-#endif
+#ifndef _SLIDERPALM_H_
+#define _SLIDERPALM_H_

 
 // Slider
 
 // Slider

-class WXDLLEXPORT wxSlider : public wxSliderBase
+class WXDLLIMPEXP_CORE wxSlider : public wxSliderBase

 {
 public:
 {
 public:

-    wxSlider();
+    wxSlider()
+    {
+        Init();
+    }

 
     wxSlider(wxWindow *parent, wxWindowID id,
             int value, int minValue, int maxValue,
 
     wxSlider(wxWindow *parent, wxWindowID id,
             int value, int minValue, int maxValue,


@@ -30,10 +29,11 @@ public:
             const wxValidator& validator = wxDefaultValidator,
             const wxString& name = wxSliderNameStr)
     {
             const wxValidator& validator = wxDefaultValidator,
             const wxString& name = wxSliderNameStr)
     {

+        Init();

         Create(parent, id, value, minValue, maxValue, pos, size, style, validator, name);
     }
 
         Create(parent, id, value, minValue, maxValue, pos, size, style, validator, name);
     }
 

-    ~wxSlider();
+    virtual ~wxSlider();

 
     bool Create(wxWindow *parent, wxWindowID id,
             int value, int minValue, int maxValue,
 
     bool Create(wxWindow *parent, wxWindowID id,
             int value, int minValue, int maxValue,


@@ -52,8 +52,7 @@ public:
     int GetMax() const;
 
     // For trackbars only
     int GetMax() const;
 
     // For trackbars only

-    void SetTickFreq(int n, int pos);
-    int GetTickFreq() const { return GetPageSize(); }
+    int GetTickFreq() const;

     void SetPageSize(int pageSize);
     int GetPageSize() const;
     void ClearSel();
     void SetPageSize(int pageSize);
     int GetPageSize() const;
     void ClearSel();


@@ -72,12 +71,24 @@ public:
 
     // send a notification event, return true if processed
     bool SendUpdatedEvent();
 
     // send a notification event, return true if processed
     bool SendUpdatedEvent();

+    bool SendScrollEvent(WXEVENTPTR event);

 
 protected:
 
 protected:

+    // Platform-specific implementation of SetTickFreq
+    virtual void DoSetTickFreq(int freq);
+

     virtual wxSize DoGetBestSize() const;
 
     virtual wxSize DoGetBestSize() const;
 

+private:
+
+    void Init();
+
+    int m_oldPos;    // needed for tracing thumb position during scrolling
+    int m_oldValue;  // needed for comparing thumb position before and after scrolling
+    int m_lineSize;  // imitate line size
+

     DECLARE_DYNAMIC_CLASS_NO_COPY(wxSlider)
 };
 
 #endif
     DECLARE_DYNAMIC_CLASS_NO_COPY(wxSlider)
 };
 
 #endif

-    // _SLIDER95_H_
+    // _SLIDERPALM_H_