X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8be10866cedb04e1072e411a094524d0efe98525..da1625342d1e0f6f66f0e044360a00280aeab580:/src/palmos/slider.cpp
diff --git a/src/palmos/slider.cpp b/src/palmos/slider.cpp
index 8c9b711b7c..fc4ab1a954 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 )
@@ -117,19 +116,25 @@ bool wxSlider::Create(wxWindow *parent, wxWindowID id,
// 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"));
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(),
@@ -137,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,
@@ -150,6 +155,7 @@ bool wxSlider::Create(wxWindow *parent, wxWindowID id,
if(slider==NULL)
return false;
+ SetInitialBestSize(size);
Show();
return true;
}
@@ -195,12 +201,12 @@ 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;
}
@@ -317,10 +323,10 @@ bool wxSlider::SendUpdatedEvent()
return handled;
}
-bool wxSlider::SendScrollEvent(EventType* event)
+bool wxSlider::SendScrollEvent(WXEVENTPTR event)
{
- wxEventType scrollEvent;
- int newPos = 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