X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f4da9a943131e6654f05dbf0761e52593d30e5b5..e3d358bbe4940c85304e9193010b27ba04c9fb86:/src/palmos/slider.cpp?ds=sidebyside diff --git a/src/palmos/slider.cpp b/src/palmos/slider.cpp index 7598d4f846..9caf2d290d 100644 --- 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" + #include "wx/toplevel.h" #endif -#include "wx/toplevel.h" - #include #include @@ -118,7 +117,7 @@ bool wxSlider::Create(wxWindow *parent, wxWindowID id, // wxSL_TOP is ignored - always off // wxSL_SELRANGE is ignored - always off // wxSL_VERTICAL is impossible in native form - wxCHECK_MSG(!(style & wxSL_VERTICAL), false, _T("non vertical slider on PalmOS")); + wxCHECK_MSG(!(style & wxSL_VERTICAL), false, wxT("non vertical slider on PalmOS")); if(!wxControl::Create(parent, id, pos, size, style, validator, name)) 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; } @@ -309,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 ) @@ -340,7 +351,7 @@ bool wxSlider::SendScrollEvent(WXEVENTPTR 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)