Lots of OS/2 Updates mirroring msw updates

[wxWidgets.git] / src / mac / control.cpp

diff --git a/src/mac/control.cpp b/src/mac/control.cpp
index eb83a83ee005c16dfdead7029b36cb1609539e32..8268b03c8bd330f30ab81154a84394cfbe15087e 100644 (file)
--- a/src/mac/control.cpp
+++ b/src/mac/control.cpp
@@ -70,7 +70,7 @@ wxControl::wxControl()
 
        if ( wxMacLiveScrollbarActionUPP == NULL )
        {
 
        if ( wxMacLiveScrollbarActionUPP == NULL )
        {

-#ifdef __UNIX__
+#if defined(UNIVERSAL_INTERFACES_VERSION) && (UNIVERSAL_INTERFACES_VERSION >= 0x0340)

         wxMacLiveScrollbarActionUPP = NewControlActionUPP( wxMacLiveScrollbarActionProc );
 #else
                wxMacLiveScrollbarActionUPP = NewControlActionProc( wxMacLiveScrollbarActionProc ) ;
         wxMacLiveScrollbarActionUPP = NewControlActionUPP( wxMacLiveScrollbarActionProc );
 #else
                wxMacLiveScrollbarActionUPP = NewControlActionProc( wxMacLiveScrollbarActionProc ) ;


@@ -646,7 +646,6 @@ void wxControl::MacRedrawControl()
                                
                                UMADrawControl( m_macControl ) ;
                                UMASetThemeWindowBackground( win->MacGetWindowData()->m_macWindow , win->MacGetWindowData()->m_macWindowBackgroundTheme , false ) ;
                                
                                UMADrawControl( m_macControl ) ;
                                UMASetThemeWindowBackground( win->MacGetWindowData()->m_macWindow , win->MacGetWindowData()->m_macWindowBackgroundTheme , false ) ;

-                               wxDC::MacInvalidateSetup() ;

                        }
                }
        }
                        }
                }
        }


@@ -665,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 ) ;
                                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 )
                                {
                                wxWindow* parent = GetParent() ;
                                while ( parent )
                                {


@@ -685,10 +685,9 @@ void wxControl::OnPaint(wxPaintEvent& event)
                                        
                                        parent = parent->GetParent() ;
                                } 
                                        
                                        parent = parent->GetParent() ;
                                } 

-                               
+

                                UMADrawControl( m_macControl ) ;
                                UMASetThemeWindowBackground( win->MacGetWindowData()->m_macWindow , win->MacGetWindowData()->m_macWindowBackgroundTheme , false ) ;
                                UMADrawControl( m_macControl ) ;
                                UMASetThemeWindowBackground( win->MacGetWindowData()->m_macWindow , win->MacGetWindowData()->m_macWindowBackgroundTheme , false ) ;

-                               wxDC::MacInvalidateSetup() ;

                        }
                }
        }
                        }
                }
        }