no changes, just remove #if'd out code

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

diff --git a/include/wx/palmos/slider.h b/include/wx/palmos/slider.h
index b96e40ce1576354f2df22574de2436b37876f022..078d5d23ec7e9cb7c34e3dff4de0fd3b7bd4d1d7 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,15 +9,11 @@
 // 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:
     wxSlider()
 {
 public:
     wxSlider()


@@ -37,7 +33,7 @@ public:
         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,


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

-    bool SendScrollEvent(EventType* event);
+    bool SendScrollEvent(WXEVENTPTR event);

 
 protected:
 
 
 protected:
 


@@ -85,6 +81,7 @@ protected:
 private:
 
     void Init();
 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
     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


@@ -93,4 +90,4 @@ private:
 };
 
 #endif
 };
 
 #endif

-    // _SLIDER95_H_
+    // _SLIDERPALM_H_