X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/01526d4f6cd7dd242e561aa24066f8ca0290a9ac..8946ede10c2702c7acbb194fe8bd2793d7fb8358:/src/palmos/slider.cpp?ds=sidebyside diff --git a/src/palmos/slider.cpp b/src/palmos/slider.cpp index 3776e7de96..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 +#include #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; } @@ -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 ) @@ -324,10 +335,10 @@ bool wxSlider::SendUpdatedEvent() return handled; } -bool wxSlider::SendScrollEvent(EventType* event) +bool wxSlider::SendScrollEvent(WXEVENTPTR event) { - wxEventType scrollEvent; - int newPos = ValueInvertOrNot(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 @@ -340,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)