// 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"
#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 <Form.h>
+#include <Control.h>
+
// Slider
void wxSlider::Init()
{
- m_oldPos = 0;
+ m_oldValue = m_oldPos = 0;
m_lineSize = 1;
}
// wxSL_RIGHT is ignored - always off
// wxSL_TOP is ignored - always off
// wxSL_SELRANGE is ignored - always off
- // wxSL_INVERSE 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;
- m_oldPos = value;
+ m_oldValue = m_oldPos = value;
+ wxCoord x = pos.x == wxDefaultCoord ? 0 : pos.x,
+ y = pos.y == wxDefaultCoord ? 0 : pos.y,
+ w = size.x == wxDefaultCoord ? 1 : size.x,
+ h = size.y == wxDefaultCoord ? 1 : size.y;
+
+ AdjustForParentClientOrigin(x, y);
+
+#ifdef __WXPALMOS6__
SliderControlType *slider = CtlNewSliderControl (
(void **)&form,
GetId(),
NULL,
0,
0,
- pos.x,
- pos.y,
- size.x,
- size.y,
+ x,
+ y,
+ w,
+ h,
minValue,
maxValue,
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;
+ SetInitialSize(size);
Show();
return true;
}
return 0;
uint16_t ret;
CtlGetSliderValues(control, NULL, NULL, NULL, &ret);
- return ret;
+ return ValueInvertOrNot(ret);
}
void wxSlider::SetValue(int value)
{
- SetIntValue(value);
- m_oldPos = value;
+ SetIntValue(ValueInvertOrNot(value));
+ m_oldValue = m_oldPos = value;
}
wxSize wxSlider::DoGetBestSize() const
// unsupported feature
}
-void wxSlider::SetTickFreq(int WXUNUSED(n), int WXUNUSED(pos))
+void wxSlider::DoSetTickFreq(int WXUNUSED(n))
{
// unsupported feature
}
{
m_oldPos = GetValue();
- // first track event
+ // first thumb event
wxScrollEvent eventWxTrack(wxEVT_SCROLL_THUMBRELEASE, GetId());
eventWxTrack.SetPosition(m_oldPos);
eventWxTrack.SetEventObject(this);
- GetEventHandler()->ProcessEvent(eventWxTrack);
+ bool handled = HandleWindowEvent(eventWxTrack);
+
+ // then slider event if position changed
+ if( m_oldValue != m_oldPos )
+ {
+ m_oldValue = m_oldPos;
+ wxCommandEvent event(wxEVT_COMMAND_SLIDER_UPDATED, GetId());
+ event.SetEventObject(this);
+ event.SetInt(m_oldPos);
+ return ProcessCommand(event);
+ }
- // then scroll event
- wxCommandEvent event(wxEVT_COMMAND_SLIDER_UPDATED, GetId());
- event.SetEventObject(this);
- event.SetInt(m_oldPos);
- return ProcessCommand(event);
+ return handled;
}
-bool wxSlider::SendScrollEvent(EventType* event)
+bool wxSlider::SendScrollEvent(WXEVENTPTR event)
{
- wxEventType scrollEvent;
- int newPos = event->data.ctlRepeat.value;
- if ( newPos == GetMax() )
- {
- scrollEvent = wxEVT_SCROLL_TOP;
- }
- else if ( newPos == GetMin() )
- {
- scrollEvent = wxEVT_SCROLL_BOTTOM;
- }
- else if ( newPos == ( m_oldPos + GetLineSize() ) )
- {
- scrollEvent = wxEVT_SCROLL_LINEUP;
- }
- else if ( newPos == ( m_oldPos - GetLineSize() ) )
- {
- scrollEvent = wxEVT_SCROLL_LINEDOWN;
- }
- else if ( newPos == ( m_oldPos + GetPageSize() ) )
- {
- scrollEvent = wxEVT_SCROLL_PAGEUP;
- }
- else if ( newPos == ( m_oldPos - GetPageSize() ) )
- {
- scrollEvent = wxEVT_SCROLL_PAGEDOWN;
- }
- else
+ const EventType* palmEvent = (EventType*)event;
+ int newPos = ValueInvertOrNot(palmEvent->data.ctlRepeat.value);
+ if ( newPos == m_oldPos )
{
+ // nothing changed since last event
return false;
}
m_oldPos = newPos;
// first track event
- wxScrollEvent eventWxTrack(wxEVT_SCROLL_THUMBTRACK, GetId());
- eventWxTrack.SetPosition(newPos);
- eventWxTrack.SetEventObject(this);
- GetEventHandler()->ProcessEvent(eventWxTrack);
-
- // then scroll event
- wxScrollEvent eventWxScroll(scrollEvent, GetId());
- eventWxScroll.SetPosition(newPos);
- eventWxScroll.SetEventObject(this);
- return GetEventHandler()->ProcessEvent(eventWxScroll);
+ wxScrollEvent eventWx(wxEVT_SCROLL_THUMBTRACK, GetId());
+ eventWx.SetPosition(newPos);
+ eventWx.SetEventObject(this);
+ return HandleWindowEvent(eventWx);
}
void wxSlider::Command (wxCommandEvent & event)
projects / wxWidgets.git / blobdiff