X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ad81651f00edc6f489d9b6a0839d316a964fd521..544421165fa7f656d23b69801443b7aa69f71db8:/src/mac/scrolbar.cpp diff --git a/src/mac/scrolbar.cpp b/src/mac/scrolbar.cpp index 2db4a175bb..0c1a130c78 100644 --- a/src/mac/scrolbar.cpp +++ b/src/mac/scrolbar.cpp @@ -16,11 +16,13 @@ #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 ; @@ -39,7 +41,7 @@ bool wxScrollBar::Create(wxWindow *parent, wxWindowID id, MacPreControlCreate( parent , id , "" , pos , size ,style, validator , name , &bounds , title ) ; - m_macControl = UMANewControl( parent->GetMacRootWindow() , &bounds , title , true , 0 , 0 , 100, + m_macControl = UMANewControl( parent->GetMacRootWindow() , &bounds , title , false , 0 , 0 , 100, kControlScrollBarLiveProc , (long) this ) ; wxASSERT_MSG( m_macControl != NULL , "No valid mac control" ) ; @@ -80,9 +82,10 @@ void wxScrollBar::SetScrollbar(int position, int thumbSize, int range, int pageS if ( UMAGetAppearanceVersion() >= 0x0110 ) { -#if UMA_USE_8_6 + if ( SetControlViewSize != (void*) kUnresolvedCFragSymbolAddress ) + { SetControlViewSize( m_macControl , m_pageSize ) ; -#endif + } } Refresh() ; }