non-PCH build fix (according to Tinderbox).

[wxWidgets.git] / src / palmos / slider.cpp

diff --git a/src/palmos/slider.cpp b/src/palmos/slider.cpp
index 2f344b1261de443c8e917e2e921da0392cd7d7b5..fc4ab1a954b560da786fb4a9a53024ed1546e77a 100644 (file)
--- a/src/palmos/slider.cpp
+++ b/src/palmos/slider.cpp
@@ -9,10 +9,6 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma implementation "slider.h"
-#endif
-
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
@@ -22,13 +18,16 @@
 
 #if wxUSE_SLIDER
 
-#ifndef WX_PRECOMP
-#include "wx/utils.h"
-#include "wx/brush.h"
 #include "wx/slider.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/utils.h"
+    #include "wx/brush.h"
+    #include "wx/toplevel.h"
 #endif
 
-#include "wx/toplevel.h"
+#include <Form.h>
+#include <Control.h>
 
 #if wxUSE_EXTENDED_RTTI
 WX_DEFINE_FLAGS( wxSliderStyle )
@@ -74,7 +73,7 @@ wxBEGIN_FLAGS( wxSliderStyle )
 
 wxEND_FLAGS( wxSliderStyle )
 
-IMPLEMENT_DYNAMIC_CLASS_XTI(wxSlider, wxControl,"wx/scrolbar.h")
+IMPLEMENT_DYNAMIC_CLASS_XTI(wxSlider, wxControl,"wx/slider.h")
 
 wxBEGIN_PROPERTIES_TABLE(wxSlider)
     wxEVENT_RANGE_PROPERTY( Scroll , wxEVT_SCROLL_TOP , wxEVT_SCROLL_ENDSCROLL , wxScrollEvent )
@@ -123,7 +122,7 @@ bool wxSlider::Create(wxWindow *parent, wxWindowID id,
     if(!wxControl::Create(parent, id, pos, size, style, validator, name))
         return false;
 
-    FormType* form = GetParentForm();
+    FormType* form = (FormType*)GetParentForm();
     if(form==NULL)
         return false;
 
@@ -195,14 +194,6 @@ int wxSlider::GetPageSize() const
     return ret;
 }
 
-int wxSlider::PalmInvertOrNot(int value) const
-{
-    if (m_windowStyle & wxSL_INVERSE)
-        return (GetMax() + GetMin()) - value;
-    else
-        return value;
-}
-
 int wxSlider::GetValue() const
 {
     ControlType *control = (ControlType *)GetObjectPtr();
@@ -210,12 +201,12 @@ int wxSlider::GetValue() const
         return 0;
     uint16_t ret;
     CtlGetSliderValues(control, NULL, NULL, NULL, &ret);
-    return PalmInvertOrNot(ret);
+    return ValueInvertOrNot(ret);
 }
 
 void wxSlider::SetValue(int value)
 {
-    SetIntValue(PalmInvertOrNot(value));
+    SetIntValue(ValueInvertOrNot(value));
     m_oldValue = m_oldPos = value;
 }
 
@@ -332,10 +323,10 @@ bool wxSlider::SendUpdatedEvent()
     return handled;
 }
 
-bool wxSlider::SendScrollEvent(EventType* event)
+bool wxSlider::SendScrollEvent(WXEVENTPTR event)
 {
-    wxEventType scrollEvent;
-    int newPos = PalmInvertOrNot(event->data.ctlRepeat.value);
+    const EventType* palmEvent = (EventType*)event;
+    int newPos = ValueInvertOrNot(palmEvent->data.ctlRepeat.value);
     if ( newPos == m_oldPos )
     {
         // nothing changed since last event