X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/7810c95b5de52447a5c2c8aaed06f287e02fc690..804c69d3d193d0d821aea227524f8f5d96ecc309:/src/mac/window.cpp

diff --git a/src/mac/window.cpp b/src/mac/window.cpp
index 78cbd8ca19..48ac3429cf 100644
--- a/src/mac/window.cpp
+++ b/src/mac/window.cpp
@@ -15,6 +15,7 @@
 
 #include "wx/setup.h"
 #include "wx/menu.h"
+#include "wx/window.h"
 #include "wx/dc.h"
 #include "wx/dcclient.h"
 #include "wx/utils.h" 
@@ -33,9 +34,6 @@
 #include "wx/tabctrl.h"
 #include "wx/tooltip.h"
 #include "wx/statusbr.h"
-// TODO remove the line below, just for lookup-up convenience CS
-#include "wx/window.h"
-
 #include "wx/menuitem.h"
 #include "wx/log.h"
 
@@ -110,11 +108,15 @@ void wxRemoveMacWindowAssociation(wxWindow *win)
 // constructors and such
 // ----------------------------------------------------------------------------
 
+WindowRef wxWindow::s_macWindowInUpdate = NULL;
+
 void wxWindow::Init()
 {
     // generic
     InitBase();
 
+    m_macEraseOnRedraw = true ;
+
     // MSW specific
     m_doubleClickAllowed = 0;
     m_winCaptured = FALSE;
@@ -132,6 +134,7 @@ void wxWindow::Init()
     m_isShown = TRUE;
 
 	m_macWindowData = NULL ;
+	m_macEraseOnRedraw = true ;
 
 	m_x = 0;
 	m_y = 0 ;	
@@ -410,11 +413,19 @@ void wxWindow::MacRootWindowToClient( int *x , int *y ) const
 
 bool wxWindow::SetCursor(const wxCursor& cursor)
 {
-   if ( !wxWindowBase::SetCursor(cursor) )
-   {
-       // no change
+    if (m_cursor == cursor)
        return FALSE;
-   }
+
+    if (wxNullCursor == cursor)
+    {
+       if ( ! wxWindowBase::SetCursor( *wxSTANDARD_CURSOR ) )
+        return FALSE ;
+    }
+    else
+    {
+       if ( ! wxWindowBase::SetCursor( cursor ) )
+        return FALSE ;
+    }
 
   wxASSERT_MSG( m_cursor.Ok(),
                   wxT("cursor must be valid after call to the base version"));
@@ -429,7 +440,7 @@ bool wxWindow::SetCursor(const wxCursor& cursor)
   {
   	if ( mouseWin == this && !wxIsBusy() )
   	{
-		cursor.MacInstall() ;
+		m_cursor.MacInstall() ;
   	}
   }
 
@@ -763,6 +774,11 @@ void wxWindow::MacSuperShown( bool show )
 
 bool wxWindow::MacIsReallyShown() const 
 {
+	if ( m_isShown && (m_parent != NULL) ) {
+		return m_parent->MacIsReallyShown();
+	}
+	return m_isShown;
+/*	
 	bool status = m_isShown ;
 	wxWindow * win = this ;
 	while ( status && win->m_parent != NULL )
@@ -771,6 +787,7 @@ bool wxWindow::MacIsReallyShown() const
 		status = win->m_isShown ;
 	}
 	return status ;
+*/
 }
 
 int wxWindow::GetCharHeight() const
@@ -794,7 +811,7 @@ void wxWindow::GetTextExtent(const wxString& string, int *x, int *y,
         
     wxClientDC dc( (wxWindow*) this ) ;
     long lx,ly,ld,le ;
-    dc.GetTextExtent( string , &lx , &ly , &ld, &le, fontToUse ) ;
+    dc.GetTextExtent( string , &lx , &ly , &ld, &le, (wxFont *)fontToUse ) ;
     if ( externalLeading )
     	*externalLeading = le ;
     if ( descent )
@@ -807,6 +824,7 @@ void wxWindow::GetTextExtent(const wxString& string, int *x, int *y,
 
 void wxWindow::MacEraseBackground( Rect *rect )
 {
+/*
 	WindowRef window = GetMacRootWindow() ;
 	if ( m_backgroundColour == wxSystemSettings::GetSystemColour(wxSYS_COLOUR_APPWORKSPACE) )
 	{
@@ -874,6 +892,7 @@ void wxWindow::MacEraseBackground( Rect *rect )
 			}
 		}
 	}
+*/
 }
 
 void wxWindow::Refresh(bool eraseBack, const wxRect *rect)
@@ -891,6 +910,10 @@ void wxWindow::Refresh(bool eraseBack, const wxRect *rect)
     	}
     	InvalWindowRect( GetMacRootWindow() , &clientrect ) ;
 	}
+	if ( !eraseBack )
+		m_macEraseOnRedraw = false ;
+	else
+		m_macEraseOnRedraw = true ;
 }
 
 // Responds to colour changes: passes event on to children.
@@ -1083,23 +1106,10 @@ void  wxWindow::MacCreateRealWindow( const wxString& title,
 		{
 			wclass = kMovableModalWindowClass ;
 		}
-		else if ( HasFlag( wxDIALOG_MODELESS ) )
+		else 
 		{
 			wclass = kDocumentWindowClass ;
 		}
-		/*
-		else
-		{
-			if ( HasFlag( wxCAPTION ) )
-			{
-				wclass = kDocumentWindowClass ;
-			}
-			else
-			{
-				wclass = kModalWindowClass ;
-			}
-		}
-		*/
 	}
 	else
 	{
@@ -1756,7 +1766,7 @@ void wxWindow::MacMouseMoved( EventRecord *ev , short part)
 }
 void wxWindow::MacActivate( EventRecord *ev , bool inIsActivating )
 {
-	wxActivateEvent event(wxEVT_ACTIVATE, inIsActivating);
+	wxActivateEvent event(wxEVT_ACTIVATE, inIsActivating , m_windowId);
 	event.m_timeStamp = ev->when ;
 	event.SetEventObject(this);
 	
@@ -1769,6 +1779,9 @@ void wxWindow::MacRedraw( RgnHandle updatergn , long time)
 {
 	// updatergn is always already clipped to our boundaries
 	WindowRef window = GetMacRootWindow() ;
+	// ownUpdateRgn is the area that this window has to invalidate i.e. its own area without its children
+	RgnHandle ownUpdateRgn = NewRgn() ;
+	CopyRgn( updatergn , ownUpdateRgn ) ;
 	wxWindow* win = wxFindWinFromMacWindow( window ) ;
 	{
 		wxMacDrawingHelper focus( this ) ; // was client
@@ -1833,23 +1846,45 @@ void wxWindow::MacRedraw( RgnHandle updatergn , long time)
 			{
 		  		RGBBackColor( &m_backgroundColour.GetPixel()) ;
 			}
+            // subtract all non transparent children from updatergn
+
+    	    RgnHandle childarea = NewRgn() ;
+        	for (wxNode *node = GetChildren().First(); node; node = node->Next())
+        	{
+        		wxWindow *child = (wxWindow*)node->Data();
+        		// eventually test for transparent windows
+		        if ( child->GetMacRootWindow() == window && child->IsShown() )
+		        {
+		            if ( !child->IsKindOf( CLASSINFO( wxNotebook ) ) && !child->IsKindOf( CLASSINFO( wxTabCtrl ) ) )
+		            {
+        		        SetRectRgn( childarea , child->m_x , child->m_y , child->m_x + child->m_width ,  child->m_y + child->m_height ) ;
+        		        DiffRgn( ownUpdateRgn , childarea , ownUpdateRgn ) ;
+        		    }
+        		}
+         	}		
+         	DisposeRgn( childarea ) ;
+
 	  		if ( GetParent() && m_backgroundColour != GetParent()->GetBackgroundColour() )
 	  			eraseBackground = true ;
 			SetClip( updatergn ) ;
-			if ( eraseBackground )
-			{
-				EraseRgn( updatergn ) ;	
-			}
+			if ( m_macEraseOnRedraw ) {
+    			if ( eraseBackground  )
+    			{
+    				EraseRgn( ownUpdateRgn ) ;	
+    			}
+    		}
+    		else {
+    		    m_macEraseOnRedraw = true ;
+    		}
 		}
 
-		m_macUpdateRgn = updatergn ;
 		{
 			RgnHandle newupdate = NewRgn() ;
 			wxSize point = GetClientSize() ;
 			wxPoint origin = GetClientAreaOrigin() ;
 
 			SetRectRgn( newupdate , origin.x , origin.y , origin.x + point.x , origin.y+point.y ) ;
-			SectRgn( newupdate , m_macUpdateRgn , newupdate ) ;
+			SectRgn( newupdate , ownUpdateRgn , newupdate ) ;
 			OffsetRgn( newupdate , -origin.x , -origin.y ) ;
 			m_updateRegion = newupdate ;
 			DisposeRgn( newupdate ) ;
@@ -1869,7 +1904,7 @@ void wxWindow::MacRedraw( RgnHandle updatergn , long time)
 	{
 		wxWindow *child = (wxWindow*)node->Data();
 		SetRectRgn( childupdate , child->m_x , child->m_y , child->m_x + child->m_width ,  child->m_y + child->m_height ) ;
-		SectRgn( childupdate , m_macUpdateRgn , childupdate ) ;
+		SectRgn( childupdate , updatergn , childupdate ) ;
 		OffsetRgn( childupdate , -child->m_x , -child->m_y ) ;
 		if ( child->GetMacRootWindow() == window && child->IsShown() && !EmptyRgn( childupdate ) )
 		{
@@ -2353,7 +2388,6 @@ wxMacDrawingHelper::~wxMacDrawingHelper()
 		Rect portRect ;
 		GetPortBounds( m_currentPort , &portRect ) ;
 		ClipRect( &portRect ) ;
-		wxDC::MacInvalidateSetup() ;	
 	}
 		
 	if ( m_formerPort != m_currentPort )