X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c809f3be86c79dc44854433fec4ccfc030d4f7b9..9082f1a970e72765544a23b6f0b3481011ddca15:/src/mac/control.cpp

diff --git a/src/mac/control.cpp b/src/mac/control.cpp
index 15bc46b48e..8268b03c8b 100644
--- a/src/mac/control.cpp
+++ b/src/mac/control.cpp
@@ -16,6 +16,7 @@
 #include "wx/control.h"
 #include "wx/panel.h"
 #include "wx/app.h"
+#include "wx/dc.h"
 #include "wx/notebook.h"
 #include "wx/tabctrl.h"
 #include "wx/radiobox.h"
@@ -69,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 ) ;
@@ -302,6 +303,8 @@ void wxControl::MacAdjustControlRect()
 			if ( IsKindOf( CLASSINFO( wxButton ) ) )
 			{
 				m_width = m_label.Length() * 8 + 12 ;
+				if ( m_width < 70 )
+				  m_width = 70 ;
 			}
 			else if ( IsKindOf( CLASSINFO( wxStaticText ) ) )
 			{
@@ -643,7 +646,6 @@ void wxControl::MacRedrawControl()
 				
 				UMADrawControl( m_macControl ) ;
 				UMASetThemeWindowBackground( win->MacGetWindowData()->m_macWindow , win->MacGetWindowData()->m_macWindowBackgroundTheme , false ) ;
-				wxDC::MacInvalidateSetup() ;
 			}
 		}
 	}
@@ -662,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 )
 				{
@@ -682,10 +685,9 @@ void wxControl::OnPaint(wxPaintEvent& event)
 					
 					parent = parent->GetParent() ;
 				} 
-				
+
 				UMADrawControl( m_macControl ) ;
 				UMASetThemeWindowBackground( win->MacGetWindowData()->m_macWindow , win->MacGetWindowData()->m_macWindowBackgroundTheme , false ) ;
-				wxDC::MacInvalidateSetup() ;
 			}
 		}
 	}
@@ -761,10 +763,12 @@ void  wxControl::OnMouseEvent( wxMouseEvent &event )
 	
 		controlpart = FindControl( localwhere , window , &control ) ;
 		{
+		/*
 			if ( AcceptsFocus() && FindFocus() != this )
 			{
 				SetFocus() ;
 			}
+		*/
 			if ( control && UMAIsControlActive( control ) )
 			{
 				{