mac paths updated

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

diff --git a/src/palmos/slider.cpp b/src/palmos/slider.cpp
index 7598d4f846482f8c4f298f2c124d0b2b1ce74abf..ed0f238bd985b1df6545d7d68dc76919b2533a26 100644 (file)
--- a/src/palmos/slider.cpp
+++ b/src/palmos/slider.cpp
@@ -23,10 +23,9 @@
 #ifndef WX_PRECOMP
     #include "wx/utils.h"
     #include "wx/brush.h"
 #ifndef WX_PRECOMP
     #include "wx/utils.h"
     #include "wx/brush.h"

+    #include "wx/toplevel.h"

 #endif
 
 #endif
 

-#include "wx/toplevel.h"
-

 #include <Form.h>
 #include <Control.h>
 
 #include <Form.h>
 #include <Control.h>
 


@@ -136,6 +135,7 @@ bool wxSlider::Create(wxWindow *parent, wxWindowID id,
 
     AdjustForParentClientOrigin(x, y);
 
 
     AdjustForParentClientOrigin(x, y);
 

+#ifdef __WXPALMOS6__

     SliderControlType *slider = CtlNewSliderControl (
                                    (void **)&form,
                                    GetId(),
     SliderControlType *slider = CtlNewSliderControl (
                                    (void **)&form,
                                    GetId(),


@@ -152,11 +152,22 @@ bool wxSlider::Create(wxWindow *parent, wxWindowID id,
                                    1,
                                    value
                               );
                                    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;
 
 
     if(slider==NULL)
         return false;
 

-    SetInitialBestSize(size);
+    SetInitialSize(size);

     Show();
     return true;
 }
     Show();
     return true;
 }


@@ -309,7 +320,7 @@ bool wxSlider::SendUpdatedEvent()
     wxScrollEvent eventWxTrack(wxEVT_SCROLL_THUMBRELEASE, GetId());
     eventWxTrack.SetPosition(m_oldPos);
     eventWxTrack.SetEventObject(this);
     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 )
 
     // then slider event if position changed
     if( m_oldValue != m_oldPos )


@@ -340,7 +351,7 @@ bool wxSlider::SendScrollEvent(WXEVENTPTR event)
     wxScrollEvent eventWx(wxEVT_SCROLL_THUMBTRACK, GetId());
     eventWx.SetPosition(newPos);
     eventWx.SetEventObject(this);
     wxScrollEvent eventWx(wxEVT_SCROLL_THUMBTRACK, GetId());
     eventWx.SetPosition(newPos);
     eventWx.SetEventObject(this);

-    return GetEventHandler()->ProcessEvent(eventWx);
+    return HandleWindowEvent(eventWx);

 }
 
 void wxSlider::Command (wxCommandEvent & event)
 }
 
 void wxSlider::Command (wxCommandEvent & event)