X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b89dac7816168bc86d4862edb394e681c161a3e3..d9f9aa2d8fcb956444588b2c19ffe8d4a3f5d2bb:/src/mac/control.cpp

diff --git a/src/mac/control.cpp b/src/mac/control.cpp
index 0953356de7..e3511e87a1 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 ) ;
@@ -135,6 +136,7 @@ void wxControl::SetLabel(const wxString& title)
 #endif
 		::SetControlTitle( m_macControl , maclabel ) ;
 	}
+	Refresh() ;
 }
 
 wxSize wxControl::DoGetBestSize() const
@@ -266,8 +268,10 @@ void wxControl::MacPostControlCreate()
 	ControlHandle container = GetParent()->MacGetContainerForEmbedding() ;
 	wxASSERT_MSG( container != NULL , "No valid mac container control" ) ;
 	::UMAEmbedControl( m_macControl , container ) ;
+	m_macControlIsShown  = true ;
 	MacAdjustControlRect() ;
 	wxAssociateControlWithMacControl( m_macControl , this ) ;
+	UMAShowControl( m_macControl ) ;
 }
 
 void wxControl::MacAdjustControlRect() 
@@ -301,6 +305,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 ) ) )
 			{
@@ -354,15 +360,15 @@ void wxControl::MacSuperChangedPosition()
 	
 		if ( mac_x != former_mac_x || mac_y != former_mac_y )
 		{
-			{
-				Rect inval = { former_mac_y , former_mac_x , former_mac_y + m_height , former_mac_x + m_width } ;
-				InvalWindowRect( rootwindow , &inval ) ;
-			}
+ 			{
+ 				Rect inval = { former_mac_y , former_mac_x , former_mac_y + m_height , former_mac_x + m_width } ;
+ 				InvalWindowRect( rootwindow , &inval ) ;
+ 			}
 	  		UMAMoveControl( m_macControl , mac_x + m_macHorizontalBorder , mac_y + m_macVerticalBorder ) ;
-			{
-				Rect inval = { mac_y , mac_x , mac_y + m_height , mac_x + m_width } ;
-				InvalWindowRect( rootwindow , &inval ) ;
-			}
+ 			{
+ 				Rect inval = { mac_y , mac_x , mac_y + m_height , mac_x + m_width } ;
+ 				InvalWindowRect( rootwindow , &inval ) ;
+ 			}
 		}
 		if ( wxrootwindow->IsKindOf( CLASSINFO( wxDialog ) ) )
 		{
@@ -416,12 +422,19 @@ void  wxControl::MacSuperShown( bool show )
 	{
 		if ( !show )
 		{
-			::UMAHideControl( m_macControl ) ;
+			if ( m_macControlIsShown )
+			{
+				::UMAHideControl( m_macControl ) ;
+				m_macControlIsShown = false ;
+			}
 		}
 		else
 		{
-			if ( m_isShown )
+			if ( MacIsReallyShown() && !m_macControlIsShown )
+			{
 				::UMAShowControl( m_macControl ) ;
+				m_macControlIsShown = true ;
+			}
 		}
 	}
 		
@@ -483,15 +496,15 @@ void  wxControl::DoSetSize(int x, int y,
 	
 	if ( mac_x != former_mac_x || mac_y != former_mac_y )
 	{
-		{
-			Rect inval = { former_mac_y , former_mac_x , former_mac_y + m_height , former_mac_x + m_width } ;
-			InvalWindowRect( macrootwindow, &inval ) ;
-		}
+ 		{
+ 			Rect inval = { former_mac_y , former_mac_x , former_mac_y + m_height , former_mac_x + m_width } ;
+ 			InvalWindowRect( macrootwindow, &inval ) ;
+ 		}
   		UMAMoveControl( m_macControl , mac_x + m_macHorizontalBorder , mac_y  + m_macVerticalBorder ) ;
-		{
-			Rect inval = { mac_y , mac_x , mac_y + m_height , mac_x + m_width } ;
-			InvalWindowRect(macrootwindow, &inval ) ;
-		}
+ 		{
+ 			Rect inval = { mac_y , mac_x , mac_y + m_height , mac_x + m_width } ;
+ 			InvalWindowRect(macrootwindow, &inval ) ;
+ 		}
 	}
 
 	if ( actualX != former_x || actualY != former_y )
@@ -501,9 +514,9 @@ void  wxControl::DoSetSize(int x, int y,
 
 		MacRepositionScrollBars() ;
 		// To consider -> should the parameters be the effective or the virtual coordinates (AdjustForParent..)
-    wxMoveEvent event(wxPoint(m_x, m_y), m_windowId);
-    event.SetEventObject(this);
-    GetEventHandler()->ProcessEvent(event);
+        wxMoveEvent event(wxPoint(m_x, m_y), m_windowId);
+        event.SetEventObject(this);
+        GetEventHandler()->ProcessEvent(event);
 	}		
 	if ( actualWidth != former_w || actualHeight != former_h )
 	{
@@ -521,9 +534,9 @@ void  wxControl::DoSetSize(int x, int y,
 		}
 
 		MacRepositionScrollBars() ;
-    wxSizeEvent event(wxSize(m_width, m_height), m_windowId);
-    event.SetEventObject(this);
-    GetEventHandler()->ProcessEvent(event);
+        wxSizeEvent event(wxSize(m_width, m_height), m_windowId);
+        event.SetEventObject(this);
+        GetEventHandler()->ProcessEvent(event);
 	}
 	if ( wxrootwindow->IsKindOf( CLASSINFO( wxDialog ) ) )
 	{
@@ -541,10 +554,22 @@ bool  wxControl::Show(bool show)
 		
 	if ( m_macControl )
 	{
-		if ( show )
-			::UMAShowControl( m_macControl ) ;
+		if ( !show )
+		{
+			if ( m_macControlIsShown )
+			{
+				::UMAHideControl( m_macControl ) ;
+				m_macControlIsShown = false ;
+			}
+		}
 		else
-			::UMAHideControl( m_macControl ) ;
+		{
+			if ( MacIsReallyShown() && !m_macControlIsShown )
+			{
+				::UMAShowControl( m_macControl ) ;
+				m_macControlIsShown = true ;
+			}
+		}
 	}
 	return TRUE ;
 }
@@ -556,21 +581,10 @@ bool  wxControl::Enable(bool enable)
 
 	if ( m_macControl )
 	{
-		
-		if ( UMAHasAppearance() )
-		{
-			if ( enable )
-				::ActivateControl( m_macControl ) ;
-			else
-				::DeactivateControl( m_macControl ) ;
-		}
+		if ( enable )
+		    UMAActivateControl( m_macControl ) ;
 		else
-		{
-			if ( enable )
-				::HiliteControl( m_macControl , 0 ) ;
-			else
-				::HiliteControl( m_macControl , 255 ) ;
-		}
+		    UMADeactivateControl( m_macControl ) ;
 	}
 	return TRUE ;
 }
@@ -623,7 +637,6 @@ void wxControl::MacRedrawControl()
 				
 				UMADrawControl( m_macControl ) ;
 				UMASetThemeWindowBackground( win->MacGetWindowData()->m_macWindow , win->MacGetWindowData()->m_macWindowBackgroundTheme , false ) ;
-				wxDC::MacInvalidateSetup() ;
 			}
 		}
 	}
@@ -642,8 +655,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 )
 				{
@@ -662,10 +676,9 @@ void wxControl::OnPaint(wxPaintEvent& event)
 					
 					parent = parent->GetParent() ;
 				} 
-				
+
 				UMADrawControl( m_macControl ) ;
 				UMASetThemeWindowBackground( win->MacGetWindowData()->m_macWindow , win->MacGetWindowData()->m_macWindowBackgroundTheme , false ) ;
-				wxDC::MacInvalidateSetup() ;
 			}
 		}
 	}
@@ -741,10 +754,12 @@ void  wxControl::OnMouseEvent( wxMouseEvent &event )
 	
 		controlpart = FindControl( localwhere , window , &control ) ;
 		{
+		/*
 			if ( AcceptsFocus() && FindFocus() != this )
 			{
 				SetFocus() ;
 			}
+		*/
 			if ( control && UMAIsControlActive( control ) )
 			{
 				{