X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/0eaa1d68c29cd273971be9d60008045e470c2d46..9082f1a970e72765544a23b6f0b3481011ddca15:/src/mac/control.cpp diff --git a/src/mac/control.cpp b/src/mac/control.cpp index 9f495d36ef..8268b03c8b 100644 --- a/src/mac/control.cpp +++ b/src/mac/control.cpp @@ -70,7 +70,7 @@ wxControl::wxControl() if ( wxMacLiveScrollbarActionUPP == NULL ) { -#ifdef __UNIX__ +#if defined(UNIVERSAL_INTERFACES_VERSION) && (UNIVERSAL_INTERFACES_VERSION >= 0x0340) wxMacLiveScrollbarActionUPP = NewControlActionUPP( wxMacLiveScrollbarActionProc ); #else wxMacLiveScrollbarActionUPP = NewControlActionProc( wxMacLiveScrollbarActionProc ) ; @@ -664,8 +664,9 @@ void wxControl::OnPaint(wxPaintEvent& event) wxMacDrawingHelper help( win ) ; // the mac control manager always assumes to have the origin at 0,0 SetOrigin( 0 , 0 ) ; + - bool hasTabBehind = false ; + bool hasTabBehind = false ; wxWindow* parent = GetParent() ; while ( parent ) { @@ -684,7 +685,7 @@ void wxControl::OnPaint(wxPaintEvent& event) parent = parent->GetParent() ; } - + UMADrawControl( m_macControl ) ; UMASetThemeWindowBackground( win->MacGetWindowData()->m_macWindow , win->MacGetWindowData()->m_macWindowBackgroundTheme , false ) ; }