X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/bdb5436554c910fe850db1470514ee83ded76db3..eea4d01c65f9b29baa1193db762b4c6b8144af24:/src/palmos/slider.cpp
diff --git a/src/palmos/slider.cpp b/src/palmos/slider.cpp
index a6341e03a2..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,84 +18,22 @@
#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
-wxSlider::wxSlider()
+void wxSlider::Init()
{
+ m_oldValue = m_oldPos = 0;
+ m_lineSize = 1;
}
bool wxSlider::Create(wxWindow *parent, wxWindowID id,
@@ -109,40 +43,64 @@ bool wxSlider::Create(wxWindow *parent, wxWindowID id,
const wxValidator& validator,
const wxString& name)
{
- wxWindow* parentTLW = GetParent();
- while ( parentTLW && !parentTLW->IsTopLevel() )
- {
- parentTLW = parentTLW->GetParent();
- }
- wxTopLevelWindowPalm* tlw = wxDynamicCast(parentTLW, wxTopLevelWindowPalm);
- if(!tlw)
+ // 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, wxT("non vertical slider on PalmOS"));
+
+ if(!wxControl::Create(parent, id, pos, size, style, validator, name))
+ return false;
+
+ FormType* form = (FormType*)GetParentForm();
+ if(form==NULL)
return false;
- FormType* form = tlw->GetForm();
- SetParent(parent);
+ 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,
- id,
+ GetId(),
feedbackSliderCtl,
NULL,
0,
0,
- pos.x,
- pos.y,
- size.x,
- size.y,
+ x,
+ y,
+ w,
+ h,
minValue,
maxValue,
1,
value
);
-
- m_control = (ControlType*) slider;
-
- if(m_control==NULL)
+#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;
}
@@ -153,109 +111,180 @@ wxSlider::~wxSlider()
int wxSlider::GetMin() const
{
+ ControlType *control = (ControlType *)GetObjectPtr();
+ if(control==NULL)
+ return 0;
uint16_t ret;
- CtlGetSliderValues(m_control, &ret, NULL, NULL, NULL);
+ CtlGetSliderValues(control, &ret, NULL, NULL, NULL);
return ret;
}
int wxSlider::GetMax() const
{
+ ControlType *control = (ControlType *)GetObjectPtr();
+ if(control==NULL)
+ return 0;
uint16_t ret;
- CtlGetSliderValues(m_control, NULL, &ret, NULL, NULL);
+ CtlGetSliderValues(control, NULL, &ret, NULL, NULL);
return ret;
}
int wxSlider::GetPageSize() const
{
+ ControlType *control = (ControlType *)GetObjectPtr();
+ if(control==NULL)
+ return 0;
uint16_t ret;
- CtlGetSliderValues(m_control, NULL, NULL, &ret, NULL);
+ CtlGetSliderValues(control, NULL, NULL, &ret, NULL);
return ret;
}
int wxSlider::GetValue() const
{
+ ControlType *control = (ControlType *)GetObjectPtr();
+ if(control==NULL)
+ return 0;
uint16_t ret;
- CtlGetSliderValues(m_control, NULL, NULL, NULL, &ret);
- return ret;
+ CtlGetSliderValues(control, NULL, NULL, NULL, &ret);
+ return ValueInvertOrNot(ret);
}
void wxSlider::SetValue(int value)
{
+ SetIntValue(ValueInvertOrNot(value));
+ m_oldValue = m_oldPos = value;
}
-void wxSlider::DoGetSize(int *width, int *height) const
-{
-}
-
-void wxSlider::GetPosition(int *x, int *y) const
-{
-}
-
-void wxSlider::DoSetSize(int x, int y, int width, int height, int sizeFlags)
-{
-}
-
-
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::DoSetTickFreq(int WXUNUSED(n))
{
+ // 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 = 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);
+ }
+
+ 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 HandleWindowEvent(eventWx);
}
void wxSlider::Command (wxCommandEvent & event)