X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/77ffb5937e89927b621128789401db8921fe580f..6493aacaeb7b22b9fa35c559f7753e9fec0da71f:/src/mac/classic/scrolbar.cpp diff --git a/src/mac/classic/scrolbar.cpp b/src/mac/classic/scrolbar.cpp index 82d6b72415..3da8ecd289 100644 --- a/src/mac/classic/scrolbar.cpp +++ b/src/mac/classic/scrolbar.cpp @@ -6,13 +6,9 @@ // Created: 1998-01-01 // RCS-ID: $Id$ // Copyright: (c) Stefan Csomor -// Licence: wxWidgets licence +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#ifdef __GNUG__ -#pragma implementation "scrolbar.h" -#endif - #include "wx/defs.h" #ifndef WX_PRECOMP @@ -23,14 +19,11 @@ #include "wx/scrolbar.h" #include "wx/mac/uma.h" -#if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxScrollBar, wxControl) BEGIN_EVENT_TABLE(wxScrollBar, wxControl) END_EVENT_TABLE() -#endif - extern ControlActionUPP wxMacLiveScrollbarActionUPP ; // Scrollbar @@ -48,7 +41,7 @@ bool wxScrollBar::Create(wxWindow *parent, wxWindowID id, MacPreControlCreate( parent , id , wxEmptyString , pos , size ,style, validator , name , &bounds , title ) ; - m_macControl = ::NewControl(MAC_WXHWND(parent->MacGetRootWindow()) , + m_macControl = (WXWidget) ::NewControl(MAC_WXHWND(parent->MacGetRootWindow()) , &bounds , title , false , 0 , 0 , 100, kControlScrollBarLiveProc , (long) this) ; @@ -102,7 +95,7 @@ void wxScrollBar::SetScrollbar(int position, int thumbSize, int range, int pageS void wxScrollBar::Command(wxCommandEvent& event) { - SetThumbPosition(event.m_commandInt); + SetThumbPosition(event.GetInt()); ProcessCommand(event); }