Added XPM ctor

[wxWidgets.git] / src / palmos / slider.cpp

diff --git a/src/palmos/slider.cpp b/src/palmos/slider.cpp
index 8c9b711b7cf430a4009d16716835bb13d4096d7c..3776e7de960edc18d568752dd5a6e5cf85508302 100644 (file)
--- a/src/palmos/slider.cpp
+++ b/src/palmos/slider.cpp
@@ -117,7 +117,6 @@ 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_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"));
 
     // wxSL_VERTICAL is impossible in native form
     wxCHECK_MSG(!(style & wxSL_VERTICAL), false, _T("non vertical slider on PalmOS"));
 


@@ -130,6 +129,13 @@ bool wxSlider::Create(wxWindow *parent, wxWindowID id,
 
     m_oldValue = 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);
+

     SliderControlType *slider = CtlNewSliderControl (
                                    (void **)&form,
                                    GetId(),
     SliderControlType *slider = CtlNewSliderControl (
                                    (void **)&form,
                                    GetId(),


@@ -137,10 +143,10 @@ bool wxSlider::Create(wxWindow *parent, wxWindowID id,
                                    NULL,
                                    0,
                                    0,
                                    NULL,
                                    0,
                                    0,

-                                   pos.x,
-                                   pos.y,
-                                   size.x,
-                                   size.y,
+                                   x,
+                                   y,
+                                   w,
+                                   h,

                                    minValue,
                                    maxValue,
                                    1,
                                    minValue,
                                    maxValue,
                                    1,


@@ -150,6 +156,7 @@ bool wxSlider::Create(wxWindow *parent, wxWindowID id,
     if(slider==NULL)
         return false;
 
     if(slider==NULL)
         return false;
 

+    SetInitialBestSize(size);

     Show();
     return true;
 }
     Show();
     return true;
 }


@@ -195,12 +202,12 @@ int wxSlider::GetValue() const
         return 0;
     uint16_t ret;
     CtlGetSliderValues(control, NULL, NULL, NULL, &ret);
         return 0;
     uint16_t ret;
     CtlGetSliderValues(control, NULL, NULL, NULL, &ret);

-    return ret;
+    return ValueInvertOrNot(ret);

 }
 
 void wxSlider::SetValue(int value)
 {
 }
 
 void wxSlider::SetValue(int value)
 {

-    SetIntValue(value);
+    SetIntValue(ValueInvertOrNot(value));

     m_oldValue = m_oldPos = value;
 }
 
     m_oldValue = m_oldPos = value;
 }
 


@@ -320,7 +327,7 @@ bool wxSlider::SendUpdatedEvent()
 bool wxSlider::SendScrollEvent(EventType* event)
 {
     wxEventType scrollEvent;
 bool wxSlider::SendScrollEvent(EventType* event)
 {
     wxEventType scrollEvent;

-    int newPos = event->data.ctlRepeat.value;
+    int newPos = ValueInvertOrNot(event->data.ctlRepeat.value);

     if ( newPos == m_oldPos )
     {
         // nothing changed since last event
     if ( newPos == m_oldPos )
     {
         // nothing changed since last event