X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/20bc5ad8dd419d0d3e524079f8fdbe3d8c14231f..9d5507f7a2701395e1d5c121bd877bb9066ee6ea:/src/palmos/slider.cpp?ds=inline diff --git a/src/palmos/slider.cpp b/src/palmos/slider.cpp index a2390e506d..22b64317c5 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,13 @@ #if wxUSE_SLIDER -#ifndef WX_PRECOMP -#include "wx/utils.h" -#include "wx/brush.h" #include "wx/slider.h" -#endif -#include "wx/toplevel.h" +#ifndef WX_PRECOMP + #include "wx/utils.h" + #include "wx/brush.h" + #include "wx/toplevel.h" +#endif #include #include @@ -77,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 ) @@ -159,7 +155,7 @@ bool wxSlider::Create(wxWindow *parent, wxWindowID id, if(slider==NULL) return false; - SetInitialBestSize(size); + SetInitialSize(size); Show(); return true; } @@ -312,7 +308,7 @@ bool wxSlider::SendUpdatedEvent() 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 ) @@ -343,7 +339,7 @@ bool wxSlider::SendScrollEvent(WXEVENTPTR event) wxScrollEvent eventWx(wxEVT_SCROLL_THUMBTRACK, GetId()); eventWx.SetPosition(newPos); eventWx.SetEventObject(this); - return GetEventHandler()->ProcessEvent(eventWx); + return HandleWindowEvent(eventWx); } void wxSlider::Command (wxCommandEvent & event)