added wxDebugContext::SetShutdownNotifyFunction() (patch 1887210)

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

diff --git a/src/palmos/slider.cpp b/src/palmos/slider.cpp
index 40c62201836ac12c041d19335c695f35518fd75f..22b64317c5a611bc5494c59d9725f662c5b640be 100644 (file)
--- a/src/palmos/slider.cpp
+++ b/src/palmos/slider.cpp
@@ -9,10 +9,6 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // 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"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 


@@ -22,13 +18,16 @@
 
 #if wxUSE_SLIDER
 
 
 #if wxUSE_SLIDER
 

-#ifndef WX_PRECOMP
-#include "wx/utils.h"
-#include "wx/brush.h"

 #include "wx/slider.h"
 #include "wx/slider.h"

+
+#ifndef WX_PRECOMP
+    #include "wx/utils.h"
+    #include "wx/brush.h"
+    #include "wx/toplevel.h"

 #endif
 
 #endif
 

-#include "wx/toplevel.h"
+#include <Form.h>
+#include <Control.h>

 
 #if wxUSE_EXTENDED_RTTI
 WX_DEFINE_FLAGS( wxSliderStyle )
 
 #if wxUSE_EXTENDED_RTTI
 WX_DEFINE_FLAGS( wxSliderStyle )


@@ -74,7 +73,7 @@ wxBEGIN_FLAGS( wxSliderStyle )
 
 wxEND_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 )
 
 wxBEGIN_PROPERTIES_TABLE(wxSlider)
     wxEVENT_RANGE_PROPERTY( Scroll , wxEVT_SCROLL_TOP , wxEVT_SCROLL_ENDSCROLL , wxScrollEvent )


@@ -117,14 +116,13 @@ 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"));
 
     if(!wxControl::Create(parent, id, pos, size, style, validator, name))
         return false;
 
     // 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;
 
     if(form==NULL)
         return false;
 


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

-    SetInitialBestSize(size);
+    SetInitialSize(size);

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


@@ -203,12 +201,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;
 }
 


@@ -310,7 +308,7 @@ bool wxSlider::SendUpdatedEvent()
     wxScrollEvent eventWxTrack(wxEVT_SCROLL_THUMBRELEASE, GetId());
     eventWxTrack.SetPosition(m_oldPos);
     eventWxTrack.SetEventObject(this);
     wxScrollEvent eventWxTrack(wxEVT_SCROLL_THUMBRELEASE, GetId());
     eventWxTrack.SetPosition(m_oldPos);
     eventWxTrack.SetEventObject(this);

-    bool handled = GetEventHandler()->ProcessEvent(eventWxTrack);
+    bool handled = HandleWindowEvent(eventWxTrack);

 
     // then slider event if position changed
     if( m_oldValue != m_oldPos )
 
     // then slider event if position changed
     if( m_oldValue != m_oldPos )


@@ -325,10 +323,10 @@ bool wxSlider::SendUpdatedEvent()
     return handled;
 }
 
     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
     if ( newPos == m_oldPos )
     {
         // nothing changed since last event


@@ -341,7 +339,7 @@ bool wxSlider::SendScrollEvent(EventType* event)
     wxScrollEvent eventWx(wxEVT_SCROLL_THUMBTRACK, GetId());
     eventWx.SetPosition(newPos);
     eventWx.SetEventObject(this);
     wxScrollEvent eventWx(wxEVT_SCROLL_THUMBTRACK, GetId());
     eventWx.SetPosition(newPos);
     eventWx.SetEventObject(this);

-    return GetEventHandler()->ProcessEvent(eventWx);
+    return HandleWindowEvent(eventWx);

 }
 
 void wxSlider::Command (wxCommandEvent & event)
 }
 
 void wxSlider::Command (wxCommandEvent & event)