X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/324eeecb3cdc9522e136af6670443148772b412a..bcf324bebe65cd7ee49c139533ceea52dceb4b91:/src/palmos/slider.cpp

diff --git a/src/palmos/slider.cpp b/src/palmos/slider.cpp
index 2f344b1261..ed0f238bd9 100644
--- 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;
 
@@ -136,6 +135,7 @@ bool wxSlider::Create(wxWindow *parent, wxWindowID id,
 
     AdjustForParentClientOrigin(x, y);
 
+#ifdef __WXPALMOS6__
     SliderControlType *slider = CtlNewSliderControl (
                                    (void **)&form,
                                    GetId(),
@@ -152,11 +152,22 @@ bool wxSlider::Create(wxWindow *parent, wxWindowID id,
                                    1,
                                    value
                               );
+#else // __WXPALMOS5__
+    //SliderControlType *CtlNewSliderControl (void **formPP, UInt16 ID, ControlStyleType style, DmResID thumbID,
+    //    DmResID backgroundID, Coord x, Coord y, Coord width, Coord height, UInt16 minValue, UInt16 maxValue,
+    //    UInt16 pageSize, UInt16 value);
+    SliderControlType *slider =  CtlNewSliderControl ((void **)&form,
+             GetId(),
+             feedbackSliderCtl,//style
+             0,//thumbID
+             0,//backgroundid
+             x, y, w, h, minValue, maxValue, 1, value);
+#endif // __WXPALMOS6__/__WXPALMOS5__
 
     if(slider==NULL)
         return false;
 
-    SetInitialBestSize(size);
+    SetInitialSize(size);
     Show();
     return true;
 }
@@ -195,14 +206,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 +213,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;
 }
 
@@ -317,7 +320,7 @@ bool wxSlider::SendUpdatedEvent()
     wxScrollEvent eventWxTrack(wxEVT_SCROLL_THUMBRELEASE, GetId());
     eventWxTrack.SetPosition(m_oldPos);
     eventWxTrack.SetEventObject(this);
-    bool handled = GetEventHandler()->ProcessEvent(eventWxTrack);
+    bool handled = HandleWindowEvent(eventWxTrack);
 
     // then slider event if position changed
     if( m_oldValue != m_oldPos )
@@ -332,10 +335,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
@@ -348,7 +351,7 @@ bool wxSlider::SendScrollEvent(EventType* event)
     wxScrollEvent eventWx(wxEVT_SCROLL_THUMBTRACK, GetId());
     eventWx.SetPosition(newPos);
     eventWx.SetEventObject(this);
-    return GetEventHandler()->ProcessEvent(eventWx);
+    return HandleWindowEvent(eventWx);
 }
 
 void wxSlider::Command (wxCommandEvent & event)