X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/324eeecb3cdc9522e136af6670443148772b412a..94e0018723919fe2ca2f5b5f0a42804c16dbf3a1:/src/palmos/slider.cpp?ds=inline diff --git a/src/palmos/slider.cpp b/src/palmos/slider.cpp index 2f344b1261..53f08eeaaa 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,81 +18,17 @@ #if wxUSE_SLIDER -#ifndef WX_PRECOMP -#include "wx/utils.h" -#include "wx/brush.h" #include "wx/slider.h" -#endif -#include "wx/toplevel.h" - -#if wxUSE_EXTENDED_RTTI -WX_DEFINE_FLAGS( wxSliderStyle ) - -wxBEGIN_FLAGS( wxSliderStyle ) - // new style border flags, we put them first to - // use them for streaming out - wxFLAGS_MEMBER(wxBORDER_SIMPLE) - wxFLAGS_MEMBER(wxBORDER_SUNKEN) - wxFLAGS_MEMBER(wxBORDER_DOUBLE) - wxFLAGS_MEMBER(wxBORDER_RAISED) - wxFLAGS_MEMBER(wxBORDER_STATIC) - wxFLAGS_MEMBER(wxBORDER_NONE) - - // old style border flags - wxFLAGS_MEMBER(wxSIMPLE_BORDER) - wxFLAGS_MEMBER(wxSUNKEN_BORDER) - wxFLAGS_MEMBER(wxDOUBLE_BORDER) - wxFLAGS_MEMBER(wxRAISED_BORDER) - wxFLAGS_MEMBER(wxSTATIC_BORDER) - wxFLAGS_MEMBER(wxBORDER) - - // standard window styles - wxFLAGS_MEMBER(wxTAB_TRAVERSAL) - wxFLAGS_MEMBER(wxCLIP_CHILDREN) - wxFLAGS_MEMBER(wxTRANSPARENT_WINDOW) - wxFLAGS_MEMBER(wxWANTS_CHARS) - wxFLAGS_MEMBER(wxFULL_REPAINT_ON_RESIZE) - wxFLAGS_MEMBER(wxALWAYS_SHOW_SB ) - wxFLAGS_MEMBER(wxVSCROLL) - wxFLAGS_MEMBER(wxHSCROLL) - - wxFLAGS_MEMBER(wxSL_HORIZONTAL) - wxFLAGS_MEMBER(wxSL_VERTICAL) - wxFLAGS_MEMBER(wxSL_AUTOTICKS) - wxFLAGS_MEMBER(wxSL_LABELS) - wxFLAGS_MEMBER(wxSL_LEFT) - wxFLAGS_MEMBER(wxSL_TOP) - wxFLAGS_MEMBER(wxSL_RIGHT) - wxFLAGS_MEMBER(wxSL_BOTTOM) - wxFLAGS_MEMBER(wxSL_BOTH) - wxFLAGS_MEMBER(wxSL_SELRANGE) - -wxEND_FLAGS( wxSliderStyle ) - -IMPLEMENT_DYNAMIC_CLASS_XTI(wxSlider, wxControl,"wx/scrolbar.h") - -wxBEGIN_PROPERTIES_TABLE(wxSlider) - wxEVENT_RANGE_PROPERTY( Scroll , wxEVT_SCROLL_TOP , wxEVT_SCROLL_ENDSCROLL , wxScrollEvent ) - wxEVENT_PROPERTY( Updated , wxEVT_COMMAND_SLIDER_UPDATED , wxCommandEvent ) - - wxPROPERTY( Value , int , SetValue, GetValue , 0, 0 /*flags*/ , wxT("Helpstring") , wxT("group")) - wxPROPERTY( Minimum , int , SetMin, GetMin, 0 , 0 /*flags*/ , wxT("Helpstring") , wxT("group")) - wxPROPERTY( Maximum , int , SetMax, GetMax, 0 , 0 /*flags*/ , wxT("Helpstring") , wxT("group")) - wxPROPERTY( PageSize , int , SetPageSize, GetLineSize, 1 , 0 /*flags*/ , wxT("Helpstring") , wxT("group")) - wxPROPERTY( LineSize , int , SetLineSize, GetLineSize, 1 , 0 /*flags*/ , wxT("Helpstring") , wxT("group")) - wxPROPERTY( ThumbLength , int , SetThumbLength, GetThumbLength, 1 , 0 /*flags*/ , wxT("Helpstring") , wxT("group")) - wxPROPERTY_FLAGS( WindowStyle , wxSliderStyle , long , SetWindowStyleFlag , GetWindowStyleFlag , EMPTY_MACROVALUE , 0 /*flags*/ , wxT("Helpstring") , wxT("group")) // style -wxEND_PROPERTIES_TABLE() - -wxBEGIN_HANDLERS_TABLE(wxSlider) -wxEND_HANDLERS_TABLE() - -wxCONSTRUCTOR_8( wxSlider , wxWindow* , Parent , wxWindowID , Id , int , Value , int , Minimum , int , Maximum , wxPoint , Position , wxSize , Size , long , WindowStyle ) -#else -IMPLEMENT_DYNAMIC_CLASS(wxSlider, wxControl) +#ifndef WX_PRECOMP + #include "wx/utils.h" + #include "wx/brush.h" + #include "wx/toplevel.h" #endif +#include +#include + // Slider void wxSlider::Init() { @@ -118,12 +50,12 @@ 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; - FormType* form = GetParentForm(); + FormType* form = (FormType*)GetParentForm(); if(form==NULL) return false; @@ -136,6 +68,7 @@ bool wxSlider::Create(wxWindow *parent, wxWindowID id, AdjustForParentClientOrigin(x, y); +#ifdef __WXPALMOS6__ SliderControlType *slider = CtlNewSliderControl ( (void **)&form, GetId(), @@ -152,11 +85,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 +139,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 +146,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; } @@ -232,7 +168,7 @@ void wxSlider::SetRange(int WXUNUSED(minValue), int WXUNUSED(maxValue)) // unsupported feature } -void wxSlider::SetTickFreq(int WXUNUSED(n), int WXUNUSED(pos)) +void wxSlider::DoSetTickFreq(int WXUNUSED(n)) { // unsupported feature } @@ -317,7 +253,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 +268,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 +284,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)