X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a152561c76dbed50d23f28d6e5761b4ece968156..0962839d231c7ae1250337c9a22c1384dd0285ea:/src/palmos/slider.cpp
diff --git a/src/palmos/slider.cpp b/src/palmos/slider.cpp
index b638ca961e..72bb092ca1 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 )
@@ -98,8 +97,10 @@ IMPLEMENT_DYNAMIC_CLASS(wxSlider, wxControl)
#endif
// Slider
-wxSlider::wxSlider()
+void wxSlider::Init()
{
+ m_oldValue = m_oldPos = 0;
+ m_lineSize = 1;
}
bool wxSlider::Create(wxWindow *parent, wxWindowID id,
@@ -109,13 +110,31 @@ bool wxSlider::Create(wxWindow *parent, wxWindowID id,
const wxValidator& validator,
const wxString& name)
{
+ // wxSL_AUTOTICKS is ignored - always on
+ // wxSL_LABELS is ignored - always off
+ // wxSL_LEFT is ignored - always off
+ // wxSL_RIGHT is ignored - always off
+ // 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"));
+
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_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);
+
SliderControlType *slider = CtlNewSliderControl (
(void **)&form,
GetId(),
@@ -123,10 +142,10 @@ bool wxSlider::Create(wxWindow *parent, wxWindowID id,
NULL,
0,
0,
- pos.x,
- pos.y,
- size.x,
- size.y,
+ x,
+ y,
+ w,
+ h,
minValue,
maxValue,
1,
@@ -136,6 +155,7 @@ bool wxSlider::Create(wxWindow *parent, wxWindowID id,
if(slider==NULL)
return false;
+ SetInitialSize(size);
Show();
return true;
}
@@ -181,74 +201,145 @@ int wxSlider::GetValue() const
return 0;
uint16_t ret;
CtlGetSliderValues(control, NULL, NULL, NULL, &ret);
- return ret;
+ return ValueInvertOrNot(ret);
}
void wxSlider::SetValue(int value)
{
- SetIntValue(value);
+ SetIntValue(ValueInvertOrNot(value));
+ m_oldValue = m_oldPos = value;
}
wxSize wxSlider::DoGetBestSize() const
{
- return wxSize(0,0);
+ // 15 is taken as used in one of official samples
+ // 45 is dummy height tripled, any idea what's better ?
+ return wxSize(45,15);
}
-void wxSlider::SetRange(int minValue, int maxValue)
+void wxSlider::SetRange(int WXUNUSED(minValue), int WXUNUSED(maxValue))
{
+ // unsupported feature
}
-void wxSlider::SetTickFreq(int n, int pos)
+void wxSlider::SetTickFreq(int WXUNUSED(n), int WXUNUSED(pos))
{
+ // unsupported feature
}
void wxSlider::SetPageSize(int pageSize)
{
+ ControlType *control = (ControlType *)GetObjectPtr();
+ if(control==NULL)
+ return;
+ uint16_t val = pageSize;
+ CtlSetSliderValues(control, NULL, NULL, &val, NULL);
}
void wxSlider::ClearSel()
{
+ // unsupported feature
}
void wxSlider::ClearTicks()
{
+ // unsupported feature
}
void wxSlider::SetLineSize(int lineSize)
{
+ m_lineSize = lineSize;
}
int wxSlider::GetLineSize() const
{
- return 0;
+ return m_lineSize;
}
int wxSlider::GetSelEnd() const
{
- return 0;
+ // unsupported feature
+ return GetValue();
}
int wxSlider::GetSelStart() const
{
- return 0;
+ // unsupported feature
+ return GetValue();
}
-void wxSlider::SetSelection(int minPos, int maxPos)
+void wxSlider::SetSelection(int WXUNUSED(minPos), int WXUNUSED(maxPos))
{
+ // unsupported feature
}
-void wxSlider::SetThumbLength(int len)
+void wxSlider::SetThumbLength(int WXUNUSED(len))
{
+ // unsupported feature
}
int wxSlider::GetThumbLength() const
{
+ // unsupported feature
return 0;
}
-void wxSlider::SetTick(int tickPos)
+int wxSlider::GetTickFreq() const
+{
+ // unsupported feature
+ return GetPageSize();
+}
+
+void wxSlider::SetTick(int WXUNUSED(tickPos))
+{
+ // unsupported feature
+}
+
+// ----------------------------------------------------------------------------
+// helpers
+// ----------------------------------------------------------------------------
+
+bool wxSlider::SendUpdatedEvent()
+{
+ m_oldPos = GetValue();
+
+ // first thumb event
+ wxScrollEvent eventWxTrack(wxEVT_SCROLL_THUMBRELEASE, GetId());
+ eventWxTrack.SetPosition(m_oldPos);
+ eventWxTrack.SetEventObject(this);
+ bool handled = GetEventHandler()->ProcessEvent(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);
+ }
+
+ return handled;
+}
+
+bool wxSlider::SendScrollEvent(WXEVENTPTR event)
{
+ 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 eventWx(wxEVT_SCROLL_THUMBTRACK, GetId());
+ eventWx.SetPosition(newPos);
+ eventWx.SetEventObject(this);
+ return GetEventHandler()->ProcessEvent(eventWx);
}
void wxSlider::Command (wxCommandEvent & event)