X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/5b781a6729859abc77e6ca5b1f81cbaad974a78f..cf1a9b45c7b70f217d3cc282ab77df8feaadcdeb:/src/mac/carbon/textctrl.cpp?ds=sidebyside

diff --git a/src/mac/carbon/textctrl.cpp b/src/mac/carbon/textctrl.cpp
index dd35860824..9ff3b81637 100644
--- a/src/mac/carbon/textctrl.cpp
+++ b/src/mac/carbon/textctrl.cpp
@@ -13,27 +13,29 @@
 #pragma implementation "textctrl.h"
 #endif
 
-#ifndef __WXMAC__
-#include <sys/types.h>
-#include <sys/stat.h>
+#ifdef __UNIX__
+  #include <sys/types.h>
+  #include <sys/stat.h>
 #else
-#include <stat.h>
+  #include <stat.h>
 #endif
 #include <fstream.h>
 
+#include "wx/app.h"
+#include "wx/dc.h"
+#include "wx/button.h"
+#include "wx/panel.h"
 #include "wx/textctrl.h"
+#include "wx/notebook.h"
+#include "wx/tabctrl.h"
 #include "wx/settings.h"
 #include "wx/filefn.h"
 #include "wx/utils.h"
 
 #if defined(__BORLANDC__) && !defined(__WIN32__)
-#include <alloc.h>
-#else
-#ifndef __MWERKS__
-#ifndef __GNUWIN32__
-#include <malloc.h>
-#endif
-#endif
+  #include <alloc.h>
+#elif !defined(__MWERKS__) && !defined(__GNUWIN32) && !defined(__WXMAC_X__)
+  #include <malloc.h>
 #endif
 
 #include "wx/mac/uma.h"
@@ -160,7 +162,40 @@ void wxTextCtrl::SetValue(const wxString& st)
 	else
 		value = st ;
 	UMASetControlData( m_macControl, 0, ( m_windowStyle & wxTE_PASSWORD ) ? kControlEditTextPasswordTag : kControlEditTextTextTag , value.Length() , (char*) ((const char*)value) ) ;
-	UMADrawControl( m_macControl ) ;
+	WindowRef window = GetMacRootWindow() ;
+	if ( window )
+	{
+		wxWindow* win = wxFindWinFromMacWindow( window ) ;
+		if ( win )
+		{
+			wxMacDrawingHelper help( win ) ;
+			// the mac control manager always assumes to have the origin at 0,0
+			SetOrigin( 0 , 0 ) ;
+			
+			bool			hasTabBehind = false ;
+			wxWindow* parent = GetParent() ;
+			while ( parent )
+			{
+				if( parent->MacGetWindowData() )
+				{
+					UMASetThemeWindowBackground( win->MacGetWindowData()->m_macWindow , kThemeBrushDialogBackgroundActive , false ) ;
+					break ;
+				}
+				
+				if( parent->IsKindOf( CLASSINFO( wxNotebook ) ) ||  parent->IsKindOf( CLASSINFO( wxTabCtrl ) ))
+				{
+					if ( ((wxControl*)parent)->GetMacControl() )
+						SetUpControlBackground( ((wxControl*)parent)->GetMacControl() , -1 , true ) ;
+					break ;
+				}
+				
+				parent = parent->GetParent() ;
+			} 
+			
+			UMADrawControl( m_macControl ) ;
+			UMASetThemeWindowBackground( win->MacGetWindowData()->m_macWindow , win->MacGetWindowData()->m_macWindowBackgroundTheme , false ) ;
+		}
+	}
 }
 
 // Clipboard operations
@@ -215,7 +250,40 @@ void wxTextCtrl::Paste()
    		UMAGetControlData( m_macControl , 0, kControlEditTextTEHandleTag , sizeof( TEHandle ) , (char*) &teH , &size ) ;
 		TEFromScrap() ;
 		TEPaste( teH ) ;
-		UMADrawControl( m_macControl ) ;
+		WindowRef window = GetMacRootWindow() ;
+		if ( window )
+		{
+			wxWindow* win = wxFindWinFromMacWindow( window ) ;
+			if ( win )
+			{
+				wxMacDrawingHelper help( win ) ;
+				// the mac control manager always assumes to have the origin at 0,0
+				SetOrigin( 0 , 0 ) ;
+				
+				bool			hasTabBehind = false ;
+				wxWindow* parent = GetParent() ;
+				while ( parent )
+				{
+					if( parent->MacGetWindowData() )
+					{
+						UMASetThemeWindowBackground( win->MacGetWindowData()->m_macWindow , kThemeBrushDialogBackgroundActive , false ) ;
+						break ;
+					}
+					
+					if( parent->IsKindOf( CLASSINFO( wxNotebook ) ) ||  parent->IsKindOf( CLASSINFO( wxTabCtrl ) ))
+					{
+						if ( ((wxControl*)parent)->GetMacControl() )
+							SetUpControlBackground( ((wxControl*)parent)->GetMacControl() , -1 , true ) ;
+						break ;
+					}
+					
+					parent = parent->GetParent() ;
+				} 
+				
+				UMADrawControl( m_macControl ) ;
+				UMASetThemeWindowBackground( win->MacGetWindowData()->m_macWindow , win->MacGetWindowData()->m_macWindowBackgroundTheme , false ) ;
+			}
+		}
 	}
 }
 
@@ -326,7 +394,7 @@ void wxTextCtrl::Replace(long from, long to, const wxString& value)
    	TESetSelect( from , to  , teH ) ;
    	TEDelete( teH ) ;
 		TEInsert( value , value.Length() , teH ) ;
-//	MacInvalidateControl() ;
+	Refresh() ;
 }
 
 void wxTextCtrl::Remove(long from, long to)
@@ -341,7 +409,7 @@ void wxTextCtrl::Remove(long from, long to)
    	UMASetControlData( m_macControl , 0, kControlEditTextSelectionTag , sizeof( selection ) , (char*) &selection ) ;
 	UMAGetControlData( m_macControl , 0, kControlEditTextTEHandleTag , sizeof( TEHandle ) , (char*) &teH , &size ) ;
    	TEDelete( teH ) ;
-//	MacInvalidateControl() ;
+	Refresh() ;
 }
 
 void wxTextCtrl::SetSelection(long from, long to)