Applied patch [ 1776951 ] wxSizer::GetContainingWindow fails for nested sizers

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

diff --git a/src/palmos/slider.cpp b/src/palmos/slider.cpp
index 94dcd7835792919d9f012e8783d0111af655b2b0..72bb092ca1e32d31c6670ed60a1d277c3dd81d5c 100644 (file)
--- 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 <Form.h>
+#include <Control.h>
 
 #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 )
@@ -100,7 +99,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxSlider, wxControl)
 // Slider
 void wxSlider::Init()
 {
-    m_oldPos = 0;
+    m_oldValue = m_oldPos = 0;
     m_lineSize = 1;
 }
 
@@ -117,18 +116,24 @@ 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_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,
@@ -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;
 
+    SetInitialSize(size);
     Show();
     return true;
 }
@@ -195,13 +201,13 @@ 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);
-    m_oldPos = value;
+    SetIntValue(ValueInvertOrNot(value));
+    m_oldValue = m_oldPos = value;
 }
 
 wxSize wxSlider::DoGetBestSize() const
@@ -298,65 +304,42 @@ bool wxSlider::SendUpdatedEvent()
 {
     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 = GetEventHandler()->ProcessEvent(eventWxTrack);
 
-    // then scroll event
-    wxCommandEvent event(wxEVT_COMMAND_SLIDER_UPDATED, GetId());
-    event.SetEventObject(this);
-    event.SetInt(m_oldPos);
-    return ProcessCommand(event);
+    // 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(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 GetEventHandler()->ProcessEvent(eventWx);
 }
 
 void wxSlider::Command (wxCommandEvent & event)