X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ca715d8835fa612d5d5e6cf9017f7dd7ab446d4b..3a922bb4bd8dbcb04e31e324648c2912e167e0cd:/src/mac/window.cpp?ds=sidebyside

diff --git a/src/mac/window.cpp b/src/mac/window.cpp
index 7acae31b6c..3f12059d91 100644
--- a/src/mac/window.cpp
+++ b/src/mac/window.cpp
@@ -1,6 +1,6 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        windows.cpp
-// Purpose:     wxWindow
+// Purpose:     wxWindowMac
 // Author:      AUTHOR
 // Modified by:
 // Created:     ??/??/98
@@ -54,16 +54,22 @@
 #include <string.h>
 
 extern wxList wxPendingDelete;
-wxWindow* gFocusWindow = NULL ;
+wxWindowMac* gFocusWindow = NULL ;
+
+#ifdef __WXUNIVERSAL__
+    IMPLEMENT_ABSTRACT_CLASS(wxWindowMac, wxWindowBase)
+#else // __WXMAC__
+    IMPLEMENT_DYNAMIC_CLASS(wxWindow, wxWindowBase)
+#endif // __WXUNIVERSAL__/__WXMAC__
 
 #if !USE_SHARED_LIBRARY
-IMPLEMENT_DYNAMIC_CLASS(wxWindow, wxEvtHandler)
-BEGIN_EVENT_TABLE(wxWindow, wxEvtHandler)
-  EVT_ERASE_BACKGROUND(wxWindow::OnEraseBackground)
-  EVT_SYS_COLOUR_CHANGED(wxWindow::OnSysColourChanged)
-  EVT_INIT_DIALOG(wxWindow::OnInitDialog)
-  EVT_IDLE(wxWindow::OnIdle)
-  EVT_SET_FOCUS(wxWindow::OnSetFocus)
+
+BEGIN_EVENT_TABLE(wxWindowMac, wxWindowBase)
+  EVT_ERASE_BACKGROUND(wxWindowMac::OnEraseBackground)
+  EVT_SYS_COLOUR_CHANGED(wxWindowMac::OnSysColourChanged)
+  EVT_INIT_DIALOG(wxWindowMac::OnInitDialog)
+  EVT_IDLE(wxWindowMac::OnIdle)
+  EVT_SET_FOCUS(wxWindowMac::OnSetFocus)
 END_EVENT_TABLE()
 
 #endif
@@ -75,21 +81,21 @@ END_EVENT_TABLE()
 // ===========================================================================
 
 // ---------------------------------------------------------------------------
-// wxWindow utility functions
+// wxWindowMac utility functions
 // ---------------------------------------------------------------------------
 
 // Find an item given the Macintosh Window Reference
 
 wxList *wxWinMacWindowList = NULL;
-wxWindow *wxFindWinFromMacWindow(WindowRef inWindowRef)
+wxWindowMac *wxFindWinFromMacWindow(WindowRef inWindowRef)
 {
     wxNode *node = wxWinMacWindowList->Find((long)inWindowRef);
     if (!node)
         return NULL;
-    return (wxWindow *)node->Data();
+    return (wxWindowMac *)node->Data();
 }
 
-void wxAssociateWinWithMacWindow(WindowRef inWindowRef, wxWindow *win)
+void wxAssociateWinWithMacWindow(WindowRef inWindowRef, wxWindowMac *win)
 {
     // adding NULL WindowRef is (first) surely a result of an error and
     // (secondly) breaks menu command processing
@@ -99,7 +105,7 @@ void wxAssociateWinWithMacWindow(WindowRef inWindowRef, wxWindow *win)
         wxWinMacWindowList->Append((long)inWindowRef, win);
 }
 
-void wxRemoveMacWindowAssociation(wxWindow *win)
+void wxRemoveMacWindowAssociation(wxWindowMac *win)
 {
     wxWinMacWindowList->DeleteObject(win);
 }
@@ -108,9 +114,9 @@ void wxRemoveMacWindowAssociation(wxWindow *win)
 // constructors and such
 // ----------------------------------------------------------------------------
 
-WindowRef wxWindow::s_macWindowInUpdate = NULL;
+WindowRef wxWindowMac::s_macWindowInUpdate = NULL;
 
-void wxWindow::Init()
+void wxWindowMac::Init()
 {
     // generic
     InitBase();
@@ -150,8 +156,22 @@ void wxWindow::Init()
 }
 
 // Destructor
-wxWindow::~wxWindow()
+wxWindowMac::~wxWindowMac()
 {
+    // deleting a window while it is shown invalidates the region
+    if ( IsShown() ) {
+        wxWindowMac* iter = this ;
+        while( iter ) {
+            if ( iter->m_macWindowData )
+            {
+                Refresh() ;
+                break ;
+            }
+            iter = iter->GetParent() ;
+            
+        }
+    }
+    
     m_isBeingDeleted = TRUE;
 
 	if ( s_lastMouseWindow == this )
@@ -179,13 +199,13 @@ wxWindow::~wxWindow()
 }
 
 // Constructor
-bool wxWindow::Create(wxWindow *parent, wxWindowID id,
+bool wxWindowMac::Create(wxWindowMac *parent, wxWindowID id,
            const wxPoint& pos,
            const wxSize& size,
            long style,
            const wxString& name)
 {
-    wxCHECK_MSG( parent, FALSE, wxT("can't create wxWindow without parent") );
+    wxCHECK_MSG( parent, FALSE, wxT("can't create wxWindowMac without parent") );
 
     if ( !CreateBase(parent, id, pos, size, style, wxDefaultValidator, name) )
         return FALSE;
@@ -197,16 +217,16 @@ bool wxWindow::Create(wxWindow *parent, wxWindowID id,
 	AdjustForParentClientOrigin(m_x, m_y, wxSIZE_USE_EXISTING);
   	m_width = WidthDefault( size.x );
   	m_height = HeightDefault( size.y ) ;
-
+#ifndef __WXUNIVERSAL__
 	if ( ! IsKindOf( CLASSINFO ( wxControl ) ) && ! IsKindOf( CLASSINFO( wxStatusBar ) ) )
 	{
     	MacCreateScrollBars( style ) ;
 	}
-
+#endif
     return TRUE;
 }
 
-void wxWindow::SetFocus()
+void wxWindowMac::SetFocus()
 {
 	if ( gFocusWindow == this )
 		return ;
@@ -222,12 +242,14 @@ void wxWindow::SetFocus()
 			          gFocusWindow->m_caret->OnKillFocus();
 			    }
 			#endif // wxUSE_CARET
+      #ifndef __WXUNIVERSAL__
 			wxControl* control = wxDynamicCast( gFocusWindow , wxControl ) ;
 			if ( control && control->GetMacControl() )
 			{
 				UMASetKeyboardFocus( gFocusWindow->GetMacRootWindow() , control->GetMacControl()  , kControlFocusNoPart ) ;
 				control->MacRedrawControl() ;
 			}
+			#endif
 	    	wxFocusEvent event(wxEVT_KILL_FOCUS, gFocusWindow->m_windowId);
 	    	event.SetEventObject(gFocusWindow);
 			gFocusWindow->GetEventHandler()->ProcessEvent(event) ;
@@ -242,17 +264,16 @@ void wxWindow::SetFocus()
 		    }
 			#endif // wxUSE_CARET
    			// panel wants to track the window which was the last to have focus in it
-    		wxPanel *panel = wxDynamicCast(GetParent(), wxPanel);
-    		if ( panel )
-    		{
-        		panel->SetLastFocus(this);
-    		}
+            wxChildFocusEvent eventFocus(this);
+            (void)GetEventHandler()->ProcessEvent(eventFocus);
+
+      #ifndef __WXUNIVERSAL__
 			wxControl* control = wxDynamicCast( gFocusWindow , wxControl ) ;
 			if ( control && control->GetMacControl() )
 			{
 				UMASetKeyboardFocus( gFocusWindow->GetMacRootWindow() , control->GetMacControl()  , kControlEditTextPart ) ;
 			}
-
+      #endif
 	    	wxFocusEvent event(wxEVT_SET_FOCUS, m_windowId);
 	    	event.SetEventObject(this);
 			GetEventHandler()->ProcessEvent(event) ;
@@ -260,7 +281,7 @@ void wxWindow::SetFocus()
 	}
 }
 
-bool wxWindow::Enable(bool enable)
+bool wxWindowMac::Enable(bool enable)
 {
     if ( !wxWindowBase::Enable(enable) )
         return FALSE;
@@ -268,7 +289,7 @@ bool wxWindow::Enable(bool enable)
     wxWindowList::Node *node = GetChildren().GetFirst();
     while ( node )
     {
-        wxWindow *child = node->GetData();
+        wxWindowMac *child = node->GetData();
         child->Enable(enable);
 
         node = node->GetNext();
@@ -277,19 +298,24 @@ bool wxWindow::Enable(bool enable)
     return TRUE;
 }
 
-void wxWindow::CaptureMouse()
+void wxWindowMac::CaptureMouse()
 {
     wxTheApp->s_captureWindow = this ;
 }
 
-void wxWindow::ReleaseMouse()
+wxWindow* wxWindowBase::GetCapture()
+{
+    return wxTheApp->s_captureWindow ;
+}
+
+void wxWindowMac::ReleaseMouse()
 {
     wxTheApp->s_captureWindow = NULL ;
 }
 
 #if    wxUSE_DRAG_AND_DROP
 
-void wxWindow::SetDropTarget(wxDropTarget *pDropTarget)
+void wxWindowMac::SetDropTarget(wxDropTarget *pDropTarget)
 {
   if ( m_pDropTarget != 0 ) {
     delete m_pDropTarget;
@@ -305,32 +331,36 @@ void wxWindow::SetDropTarget(wxDropTarget *pDropTarget)
 #endif
 
 // Old style file-manager drag&drop
-void wxWindow::DragAcceptFiles(bool accept)
+void wxWindowMac::DragAcceptFiles(bool accept)
 {
     // TODO
 }
 
 // Get total size
-void wxWindow::DoGetSize(int *x, int *y) const
+void wxWindowMac::DoGetSize(int *x, int *y) const
 {
-    *x = m_width ;
-    *y = m_height ;
+     if(x)   *x = m_width ;
+     if(y)   *y = m_height ;
 }
 
-void wxWindow::DoGetPosition(int *x, int *y) const
+void wxWindowMac::DoGetPosition(int *x, int *y) const
 {
-    *x = m_x ;
-    *y = m_y ;
+    int xx,yy;
+ 
+    xx = m_x ;
+    yy = m_y ;
     if (GetParent())
     {
         wxPoint pt(GetParent()->GetClientAreaOrigin());
-        *x -= pt.x;
-        *y -= pt.y;
+        xx -= pt.x;
+        yy -= pt.y;
     }
+    if(x)   *x = xx;
+    if(y)   *y = yy;
 }
 
-
-bool wxWindow::DoPopupMenu(wxMenu *menu, int x, int y)
+#if wxUSE_MENUS
+bool wxWindowMac::DoPopupMenu(wxMenu *menu, int x, int y)
 {
 	menu->SetInvokingWindow(this);
     menu->UpdateUI();
@@ -344,14 +374,16 @@ bool wxWindow::DoPopupMenu(wxMenu *menu, int x, int y)
 
   return TRUE;
 }
+#endif
 
-void wxWindow::DoScreenToClient(int *x, int *y) const
+void wxWindowMac::DoScreenToClient(int *x, int *y) const
 {
 	WindowRef window = GetMacRootWindow() ;
 
-	Point		localwhere ;
-	localwhere.h = * x ;
-	localwhere.v = * y ;
+	Point		localwhere = {0,0} ;
+
+    if(x)   localwhere.h = * x ;
+    if(y)   localwhere.v = * y ;
 
 	GrafPtr		port ;	
 	::GetPort( &port ) ;
@@ -359,21 +391,21 @@ void wxWindow::DoScreenToClient(int *x, int *y) const
 	::GlobalToLocal( &localwhere ) ;
 	::SetPort( port ) ;
 
-	*x = localwhere.h ;
-	*y = localwhere.v ;
+    if(x)   *x = localwhere.h ;
+    if(y)   *y = localwhere.v ;
 	
 	MacRootWindowToClient( x , y ) ;
 }
 
-void wxWindow::DoClientToScreen(int *x, int *y) const
+void wxWindowMac::DoClientToScreen(int *x, int *y) const
 {
 	WindowRef window = GetMacRootWindow() ;
 	
 	MacClientToRootWindow( x , y ) ;
 	
-	Point		localwhere ;
-	localwhere.h = * x ;
-	localwhere.v = * y ;
+	Point		localwhere = { 0,0 };
+    if(x)   localwhere.h = * x ;
+    if(y)   localwhere.v = * y ;
 	
 	GrafPtr		port ;	
 	::GetPort( &port ) ;
@@ -381,49 +413,51 @@ void wxWindow::DoClientToScreen(int *x, int *y) const
 	::SetOrigin( 0 , 0 ) ;
 	::LocalToGlobal( &localwhere ) ;
 	::SetPort( port ) ;
-	*x = localwhere.h ;
-	*y = localwhere.v ;
+    if(x)   *x = localwhere.h ;
+    if(y)   *y = localwhere.v ;
 }
 
-void wxWindow::MacClientToRootWindow( int *x , int *y ) const
+void wxWindowMac::MacClientToRootWindow( int *x , int *y ) const
 {
-	if ( m_macWindowData )
-	{
-	}
-	else
+ 	if ( m_macWindowData == NULL)
 	{
-		*x += m_x ;
-		*y += m_y ;
+		if(x)   *x += m_x ;
+		if(y)   *y += m_y ;
 		GetParent()->MacClientToRootWindow( x , y ) ;
 	}
 }
 
-void wxWindow::MacRootWindowToClient( int *x , int *y ) const
+void wxWindowMac::MacRootWindowToClient( int *x , int *y ) const
 {
-	if ( m_macWindowData )
-	{
-	}
-	else
+	if ( m_macWindowData == NULL)
 	{
-		*x -= m_x ;
-		*y -= m_y ;
+		if(x)   *x -= m_x ;
+	    if(y)   *y -= m_y ;
 		GetParent()->MacRootWindowToClient( x , y ) ;
 	}
 }
 
-bool wxWindow::SetCursor(const wxCursor& cursor)
+bool wxWindowMac::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"));
 
   Point pt ;
-  wxWindow *mouseWin ;
+  wxWindowMac *mouseWin ;
   GetMouse( &pt ) ;
   
   // Change the cursor NOW if we're within the correct window
@@ -432,7 +466,7 @@ bool wxWindow::SetCursor(const wxCursor& cursor)
   {
   	if ( mouseWin == this && !wxIsBusy() )
   	{
-		cursor.MacInstall() ;
+		m_cursor.MacInstall() ;
   	}
   }
 
@@ -441,13 +475,14 @@ bool wxWindow::SetCursor(const wxCursor& cursor)
 
 
 // Get size *available for subwindows* i.e. excluding menu bar etc.
-void wxWindow::DoGetClientSize(int *x, int *y) const
+void wxWindowMac::DoGetClientSize(int *x, int *y) const
 {
-    *x = m_width ;
-    *y = m_height ;
+    int ww, hh;
+    ww = m_width ;
+    hh = m_height ;
 
-	*x -= MacGetLeftBorderSize(  )  + MacGetRightBorderSize(  ) ;
-	*y -= MacGetTopBorderSize(  ) + MacGetBottomBorderSize( );
+	ww -= MacGetLeftBorderSize(  )  + MacGetRightBorderSize(  ) ;
+	hh -= MacGetTopBorderSize(  ) + MacGetBottomBorderSize( );
 	
   if ( (m_vScrollBar && m_vScrollBar->IsShown()) || (m_hScrollBar  && m_hScrollBar->IsShown()) )
   {
@@ -459,8 +494,7 @@ void wxWindow::DoGetClientSize(int *x, int *y) const
 	MacClientToRootWindow( &x1 , &y1 ) ;
 	MacClientToRootWindow( &w , &h ) ;
 	
-	WindowRef window = NULL ;
-	wxWindow *iter = (wxWindow*)this ;
+	wxWindowMac *iter = (wxWindowMac*)this ;
 	
 	int totW = 10000 , totH = 10000;
 	while( iter )
@@ -477,21 +511,23 @@ void wxWindow::DoGetClientSize(int *x, int *y) const
 	
   	if (m_hScrollBar  && m_hScrollBar->IsShown() )
   	{
-  		(*y) -= MAC_SCROLLBAR_SIZE;
+  		hh -= MAC_SCROLLBAR_SIZE;
 		if ( h-y1 >= totH )
 		{
-			(*y)+= 1 ;
+			hh += 1 ;
 		}
     }
   	if (m_vScrollBar  && m_vScrollBar->IsShown() )
   	{
-    	(*x) -= MAC_SCROLLBAR_SIZE;
+    	ww -= MAC_SCROLLBAR_SIZE;
 		if ( w-x1 >= totW )
 		{
-    		(*x) += 1 ;
+    		ww += 1 ;
     	}
   	}
   }
+  if(x)   *x = ww;
+  if(y)   *y = hh;
 }
 
 
@@ -501,7 +537,7 @@ void wxWindow::DoGetClientSize(int *x, int *y) const
 
 #if wxUSE_TOOLTIPS
 
-void wxWindow::DoSetToolTip(wxToolTip *tooltip)
+void wxWindowMac::DoSetToolTip(wxToolTip *tooltip)
 {
     wxWindowBase::DoSetToolTip(tooltip);
 
@@ -511,75 +547,18 @@ void wxWindow::DoSetToolTip(wxToolTip *tooltip)
 
 #endif // wxUSE_TOOLTIPS
 
-void wxWindow::DoMoveWindow(int x, int y, int width, int height)
+void wxWindowMac::DoMoveWindow(int x, int y, int width, int height)
 {
-	DoSetSize( x,y, width, height ) ;
-}
-
-// set the size of the window: if the dimensions are positive, just use them,
-// but if any of them is equal to -1, it means that we must find the value for
-// it ourselves (unless sizeFlags contains wxSIZE_ALLOW_MINUS_ONE flag, in
-// which case -1 is a valid value for x and y)
-//
-// If sizeFlags contains wxSIZE_AUTO_WIDTH/HEIGHT flags (default), we calculate
-// the width/height to best suit our contents, otherwise we reuse the current
-// width/height
-void wxWindow::DoSetSize(int x, int y, int width, int height, int sizeFlags)
-{
-
 	int former_x = m_x ;
 	int former_y = m_y ;
 	int former_w = m_width ;
 	int former_h = m_height ;
 	
-  int currentX, currentY;
-  GetPosition(&currentX, &currentY);
-  int currentW,currentH;
-  GetSize(&currentW, &currentH);
-
   int actualWidth = width;
   int actualHeight = height;
   int actualX = x;
   int actualY = y;
-  if (x == -1 && !(sizeFlags & wxSIZE_ALLOW_MINUS_ONE))
-      actualX = currentX;
-  if (y == -1 && !(sizeFlags & wxSIZE_ALLOW_MINUS_ONE))
-      actualY = currentY;
-  
-  wxSize size( -1 , -1 ) ;
   
-  if (width == -1 || height == -1 )
-  {
-  	size = DoGetBestSize() ;
-  }
-  
-  if ( width == -1 )
-  {
-  	if ( sizeFlags & wxSIZE_AUTO_WIDTH )
-    {
-      actualWidth = size.x ;	
-      if ( actualWidth == -1 )
-      	actualWidth = 80 ;
-    }
-    else
-    {
-      actualWidth = currentW ;
-    }
-  }
-  if (height == -1)
-  {
-  	if ( sizeFlags & wxSIZE_AUTO_HEIGHT )
-  	{
-  		actualHeight = size.y ;
-  		if ( actualHeight == -1 )
-  			actualHeight = 26 ;
-  	}
-  	else 
-  	{
-      actualHeight = currentH ;
-    }
-  }
-
     if ((m_minWidth != -1) && (actualWidth < m_minWidth)) 
     	actualWidth = m_minWidth;
     if ((m_minHeight != -1) && (actualHeight < m_minHeight)) 
@@ -588,15 +567,7 @@ void wxWindow::DoSetSize(int x, int y, int width, int height, int sizeFlags)
     	actualWidth = m_maxWidth;
     if ((m_maxHeight != -1) && (actualHeight > m_maxHeight)) 
     	actualHeight = m_maxHeight;
-	if ( actualX == currentX && actualY == currentY && actualWidth == currentW && actualHeight == currentH)
-	{
-		MacRepositionScrollBars() ; // we might have a real position shift
-		return ;
-	}
 
-	AdjustForParentClientOrigin(actualX, actualY, sizeFlags);
-	
-	
 	bool doMove = false ;
 	bool doResize = false ;
 	
@@ -621,7 +592,7 @@ void wxWindow::DoSetSize(int x, int y, int width, int height, int sizeFlags)
 			if ( focus.Ok() )
 			{
 		  		Rect clientrect = { 0 , 0 , m_height , m_width } ;
-				ClipRect( &clientrect ) ;
+				// ClipRect( &clientrect ) ;
 		    	InvalWindowRect( GetMacRootWindow() , &clientrect ) ;
 			}
 		}
@@ -656,41 +627,113 @@ void wxWindow::DoSetSize(int x, int y, int width, int height, int sizeFlags)
 				if ( focus.Ok() )
 				{
 			  		Rect clientrect = { 0 , 0 , m_height , m_width } ;
-  					ClipRect( &clientrect ) ;
+  					// ClipRect( &clientrect ) ;
 			    	InvalWindowRect( GetMacRootWindow() , &clientrect ) ;
 				}
 			}
 			
 			if ( doMove )
-				wxWindow::MacSuperChangedPosition() ; // like this only children will be notified
+				wxWindowMac::MacSuperChangedPosition() ; // like this only children will be notified
 		}
 		MacRepositionScrollBars() ;
 		if ( doMove )
 		{
-    		wxMoveEvent event(wxPoint(m_x, m_y), m_windowId);
+	        wxPoint point(m_x, m_y);
+    		wxMoveEvent event(point, m_windowId);
     		event.SetEventObject(this);
     		GetEventHandler()->ProcessEvent(event) ;
     	}
     	if ( doResize )
     	{
-			MacRepositionScrollBars() ;
-	    	wxSizeEvent event(wxSize(m_width, m_height), m_windowId);
-	    	event.SetEventObject(this);
-	    	GetEventHandler()->ProcessEvent(event);
+	         MacRepositionScrollBars() ;
+	         wxSize size(m_width, m_height);
+	         wxSizeEvent event(size, m_windowId);
+	         event.SetEventObject(this);
+	         GetEventHandler()->ProcessEvent(event);
     	}
 	}
+	
+}
+
+// set the size of the window: if the dimensions are positive, just use them,
+// but if any of them is equal to -1, it means that we must find the value for
+// it ourselves (unless sizeFlags contains wxSIZE_ALLOW_MINUS_ONE flag, in
+// which case -1 is a valid value for x and y)
+//
+// If sizeFlags contains wxSIZE_AUTO_WIDTH/HEIGHT flags (default), we calculate
+// the width/height to best suit our contents, otherwise we reuse the current
+// width/height
+void wxWindowMac::DoSetSize(int x, int y, int width, int height, int sizeFlags)
+{
+    // get the current size and position...
+    int currentX, currentY;
+    GetPosition(&currentX, &currentY);
+    int currentW,currentH;
+    GetSize(&currentW, &currentH);
+
+    // ... and don't do anything (avoiding flicker) if it's already ok
+    if ( x == currentX && y == currentY &&
+         width == currentW && height == currentH )
+    {
+		MacRepositionScrollBars() ; // we might have a real position shift
+        return;
+    }
+
+    if ( x == -1 && !(sizeFlags & wxSIZE_ALLOW_MINUS_ONE) )
+        x = currentX;
+    if ( y == -1 && !(sizeFlags & wxSIZE_ALLOW_MINUS_ONE) )
+        y = currentY;
+
+    AdjustForParentClientOrigin(x, y, sizeFlags);
+
+    wxSize size(-1, -1);
+    if ( width == -1 )
+    {
+        if ( sizeFlags & wxSIZE_AUTO_WIDTH )
+        {
+            size = DoGetBestSize();
+            width = size.x;
+        }
+        else
+        {
+            // just take the current one
+            width = currentW;
+        }
+    }
+
+    if ( height == -1 )
+    {
+        if ( sizeFlags & wxSIZE_AUTO_HEIGHT )
+        {
+            if ( size.x == -1 )
+            {
+                size = DoGetBestSize();
+            }
+            //else: already called DoGetBestSize() above
+
+            height = size.y;
+        }
+        else
+        {
+            // just take the current one
+            height = currentH;
+        }
+    }
+
+    DoMoveWindow(x, y, width, height);
+
 }
 // For implementation purposes - sometimes decorations make the client area
 // smaller
 
-wxPoint wxWindow::GetClientAreaOrigin() const
+wxPoint wxWindowMac::GetClientAreaOrigin() const
 {
     return wxPoint(MacGetLeftBorderSize(  ) , MacGetTopBorderSize(  ) );
 }
 
 // Makes an adjustment to the window position (for example, a frame that has
 // a toolbar that it manages itself).
-void wxWindow::AdjustForParentClientOrigin(int& x, int& y, int sizeFlags)
+void wxWindowMac::AdjustForParentClientOrigin(int& x, int& y, int sizeFlags)
 {
 	if( !m_macWindowData )
 	{
@@ -702,7 +745,7 @@ void wxWindow::AdjustForParentClientOrigin(int& x, int& y, int sizeFlags)
    }
 }
 
-void wxWindow::SetTitle(const wxString& title)
+void wxWindowMac::SetTitle(const wxString& title)
 {
 	m_label = title ;
 	
@@ -717,12 +760,12 @@ void wxWindow::SetTitle(const wxString& title)
     	UMASetWTitleC( m_macWindowData->m_macWindow , label ) ;
 }
 
-wxString wxWindow::GetTitle() const
+wxString wxWindowMac::GetTitle() const
 {
 	return m_label ;
 }
 
-bool wxWindow::Show(bool show)
+bool wxWindowMac::Show(bool show)
 {
     if ( !wxWindowBase::Show(show) )
         return FALSE;
@@ -735,7 +778,8 @@ bool wxWindow::Show(bool show)
 	  	UMASelectWindow( m_macWindowData->m_macWindow ) ;
 		// no need to generate events here, they will get them triggered by macos
 		// actually they should be , but apparently they are not
-	    wxSizeEvent event(wxSize(m_width, m_height), m_windowId);
+	    wxSize size(m_width, m_height);
+	    wxSizeEvent event(size, m_windowId);
 	    event.SetEventObject(this);
 	    GetEventHandler()->ProcessEvent(event);
 	  }
@@ -745,26 +789,34 @@ bool wxWindow::Show(bool show)
 	  }
 	}
 	MacSuperShown( show ) ;
-	Refresh() ;
-	if(m_macWindowData)
-		MacUpdateImmediately() ;
+	if ( !show )
+	{
+	    WindowRef window = GetMacRootWindow() ;
+	    wxWindowMac* win = wxFindWinFromMacWindow( window ) ;
+	    if ( win && !win->m_isBeingDeleted )
+   	        Refresh() ;	
+	}
+	else
+	{
+    	Refresh() ;	
+	}
 
     return TRUE;
 }
 
-void wxWindow::MacSuperShown( bool show ) 
+void wxWindowMac::MacSuperShown( bool show ) 
 {
 	wxNode *node = GetChildren().First();
 	while ( node )
 	{
-		wxWindow *child = (wxWindow *)node->Data();
+		wxWindowMac *child = (wxWindowMac *)node->Data();
 		if ( child->m_isShown )
 			child->MacSuperShown( show ) ;
 		node = node->Next();
 	}
 }
 
-bool wxWindow::MacIsReallyShown() const 
+bool wxWindowMac::MacIsReallyShown() const 
 {
 	if ( m_isShown && (m_parent != NULL) ) {
 		return m_parent->MacIsReallyShown();
@@ -772,7 +824,7 @@ bool wxWindow::MacIsReallyShown() const
 	return m_isShown;
 /*	
 	bool status = m_isShown ;
-	wxWindow * win = this ;
+	wxWindowMac * win = this ;
 	while ( status && win->m_parent != NULL )
 	{
 		win = win->m_parent ;
@@ -782,26 +834,26 @@ bool wxWindow::MacIsReallyShown() const
 */
 }
 
-int wxWindow::GetCharHeight() const
+int wxWindowMac::GetCharHeight() const
 {
-	wxClientDC dc ( (wxWindow*)this ) ;
+	wxClientDC dc ( (wxWindowMac*)this ) ;
 	return dc.GetCharHeight() ;
 }
 
-int wxWindow::GetCharWidth() const
+int wxWindowMac::GetCharWidth() const
 {
-	wxClientDC dc ( (wxWindow*)this ) ;
+	wxClientDC dc ( (wxWindowMac*)this ) ;
 	return dc.GetCharWidth() ;
 }
 
-void wxWindow::GetTextExtent(const wxString& string, int *x, int *y,
+void wxWindowMac::GetTextExtent(const wxString& string, int *x, int *y,
                            int *descent, int *externalLeading, const wxFont *theFont ) const
 {
     const wxFont *fontToUse = theFont;
     if ( !fontToUse )
         fontToUse = &m_font;
         
-    wxClientDC dc( (wxWindow*) this ) ;
+    wxClientDC dc( (wxWindowMac*) this ) ;
     long lx,ly,ld,le ;
     dc.GetTextExtent( string , &lx , &ly , &ld, &le, (wxFont *)fontToUse ) ;
     if ( externalLeading )
@@ -814,7 +866,7 @@ void wxWindow::GetTextExtent(const wxString& string, int *x, int *y,
     	*y = ly ;
 }
 
-void wxWindow::MacEraseBackground( Rect *rect )
+void wxWindowMac::MacEraseBackground( Rect *rect )
 {
 /*
 	WindowRef window = GetMacRootWindow() ;
@@ -828,7 +880,7 @@ void wxWindow::MacEraseBackground( Rect *rect )
 		// it is on a notebook panel or not, in order to take care of that we walk up the hierarchy until we have
 		// either a non gray background color or a non control window
 		
-			wxWindow* parent = GetParent() ;
+			wxWindowMac* parent = GetParent() ;
 			while( parent )
 			{
 				if ( parent->m_backgroundColour != wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DFACE ) )
@@ -869,7 +921,7 @@ void wxWindow::MacEraseBackground( Rect *rect )
 	
 	for (wxNode *node = GetChildren().First(); node; node = node->Next())
 	{
-		wxWindow *child = (wxWindow*)node->Data();
+		wxWindowMac *child = (wxWindowMac*)node->Data();
 		
 		Rect clientrect = { child->m_x , child->m_y , child->m_x +child->m_width , child->m_y + child->m_height } ;
 		SectRect( &clientrect , rect , &clientrect ) ;    	
@@ -887,13 +939,18 @@ void wxWindow::MacEraseBackground( Rect *rect )
 */
 }
 
-void wxWindow::Refresh(bool eraseBack, const wxRect *rect)
+void wxWindowMac::Refresh(bool eraseBack, const wxRect *rect)
 {
-	wxMacDrawingHelper focus( this ) ;
+//    if ( !IsShown() )
+//        return ;
+        
+	wxMacDrawingClientHelper focus( this ) ;
 	if ( focus.Ok() )
 	{
-	  	Rect clientrect = { 0 , 0 , m_height , m_width } ;
-  		ClipRect( &clientrect ) ;
+  	    wxPoint client ;
+	    client = GetClientAreaOrigin( ) ;
+	  	Rect clientrect = { -client.y , -client.x , m_height - client.y , m_width - client.x} ;
+  		// ClipRect( &clientrect ) ;
 
     	if ( rect )
     	{
@@ -909,13 +966,13 @@ void wxWindow::Refresh(bool eraseBack, const wxRect *rect)
 }
 
 // Responds to colour changes: passes event on to children.
-void wxWindow::OnSysColourChanged(wxSysColourChangedEvent& event)
+void wxWindowMac::OnSysColourChanged(wxSysColourChangedEvent& event)
 {
     wxNode *node = GetChildren().First();
     while ( node )
     {
         // Only propagate to non-top-level windows
-        wxWindow *win = (wxWindow *)node->Data();
+        wxWindowMac *win = (wxWindowMac *)node->Data();
         if ( win->GetParent() )
         {
             wxSysColourChangedEvent event2;
@@ -932,36 +989,36 @@ void wxWindow::OnSysColourChanged(wxSysColourChangedEvent& event)
 // Caret manipulation
 // ---------------------------------------------------------------------------
 
-void wxWindow::CreateCaret(int w, int h)
+void wxWindowMac::CreateCaret(int w, int h)
 {
     SetCaret(new wxCaret(this, w, h));
 }
 
-void wxWindow::CreateCaret(const wxBitmap *WXUNUSED(bitmap))
+void wxWindowMac::CreateCaret(const wxBitmap *WXUNUSED(bitmap))
 {
     wxFAIL_MSG("not implemented");
 }
 
-void wxWindow::ShowCaret(bool show)
+void wxWindowMac::ShowCaret(bool show)
 {
     wxCHECK_RET( m_caret, "no caret to show" );
 
     m_caret->Show(show);
 }
 
-void wxWindow::DestroyCaret()
+void wxWindowMac::DestroyCaret()
 {
     SetCaret(NULL);
 }
 
-void wxWindow::SetCaretPos(int x, int y)
+void wxWindowMac::SetCaretPos(int x, int y)
 {
     wxCHECK_RET( m_caret, "no caret to move" );
 
     m_caret->Move(x, y);
 }
 
-void wxWindow::GetCaretPos(int *x, int *y) const
+void wxWindowMac::GetCaretPos(int *x, int *y) const
 {
     wxCHECK_RET( m_caret, "no caret to get position of" );
 
@@ -969,24 +1026,24 @@ void wxWindow::GetCaretPos(int *x, int *y) const
 }
 #endif // wxUSE_CARET
 
-wxWindow *wxGetActiveWindow()
+wxWindowMac *wxGetActiveWindow()
 {
     // actually this is a windows-only concept
     return NULL;
 }
 
 // Coordinates relative to the window
-void wxWindow::WarpPointer (int x_pos, int y_pos)
+void wxWindowMac::WarpPointer (int x_pos, int y_pos)
 {
     // We really dont move the mouse programmatically under mac
 }
 
-void wxWindow::OnEraseBackground(wxEraseEvent& event)
+void wxWindowMac::OnEraseBackground(wxEraseEvent& event)
 {
     // TODO : probably we would adopt the EraseEvent structure
 }
 
-int wxWindow::GetScrollPos(int orient) const
+int wxWindowMac::GetScrollPos(int orient) const
 {
 		if ( orient == wxHORIZONTAL )
 		{
@@ -1003,7 +1060,7 @@ int wxWindow::GetScrollPos(int orient) const
 
 // This now returns the whole range, not just the number
 // of positions that we can scroll.
-int wxWindow::GetScrollRange(int orient) const
+int wxWindowMac::GetScrollRange(int orient) const
 {
 		if ( orient == wxHORIZONTAL )
 		{
@@ -1018,7 +1075,7 @@ int wxWindow::GetScrollRange(int orient) const
     return 0;
 }
 
-int wxWindow::GetScrollThumb(int orient) const
+int wxWindowMac::GetScrollThumb(int orient) const
 {
 		if ( orient == wxHORIZONTAL )
 		{
@@ -1033,7 +1090,7 @@ int wxWindow::GetScrollThumb(int orient) const
     return 0;
 }
 
-void wxWindow::SetScrollPos(int orient, int pos, bool refresh)
+void wxWindowMac::SetScrollPos(int orient, int pos, bool refresh)
 {
 		if ( orient == wxHORIZONTAL )
 		{
@@ -1047,7 +1104,7 @@ void wxWindow::SetScrollPos(int orient, int pos, bool refresh)
 		}
 }
 
-void  wxWindow::MacCreateRealWindow( const wxString& title,
+void  wxWindowMac::MacCreateRealWindow( const wxString& title,
            const wxPoint& pos,
            const wxSize& size,
            long style,
@@ -1133,13 +1190,14 @@ void  wxWindow::MacCreateRealWindow( const wxString& title,
 	UMACreateRootControl( m_macWindowData->m_macWindow , &m_macWindowData->m_macRootControl ) ;
 
 	m_macWindowData->m_macFocus = NULL ;
+	m_macWindowData->m_macHasReceivedFirstActivate = true ;
 }
 
-void wxWindow::MacPaint( wxPaintEvent &event ) 
+void wxWindowMac::MacPaint( wxPaintEvent &event ) 
 {
 }
 
-void wxWindow::MacPaintBorders( ) 
+void wxWindowMac::MacPaintBorders( ) 
 {
 	if( m_macWindowData )
 		return ;
@@ -1253,7 +1311,7 @@ void wxWindow::MacPaintBorders( )
 }
 
 // New function that will replace some of the above.
-void wxWindow::SetScrollbar(int orient, int pos, int thumbVisible,
+void wxWindowMac::SetScrollbar(int orient, int pos, int thumbVisible,
     int range, bool refresh)
 {
 		if ( orient == wxHORIZONTAL )
@@ -1269,7 +1327,7 @@ void wxWindow::SetScrollbar(int orient, int pos, int thumbVisible,
 				{
 					if ( !m_hScrollBar->IsShown() )
 						m_hScrollBar->Show(true) ;
-					m_hScrollBar->SetScrollbar( pos , thumbVisible , range , refresh ) ;
+					m_hScrollBar->SetScrollbar( pos , thumbVisible , range , thumbVisible , refresh ) ;
 				}
 			}
 		}
@@ -1286,7 +1344,7 @@ void wxWindow::SetScrollbar(int orient, int pos, int thumbVisible,
 				{
 					if ( !m_vScrollBar->IsShown() )
 						m_vScrollBar->Show(true) ;
-					m_vScrollBar->SetScrollbar( pos , thumbVisible , range , refresh ) ;
+					m_vScrollBar->SetScrollbar( pos , thumbVisible , range , thumbVisible , refresh ) ;
 				}
 			}
 		}
@@ -1294,7 +1352,7 @@ void wxWindow::SetScrollbar(int orient, int pos, int thumbVisible,
 }
 
 // Does a physical scroll
-void wxWindow::ScrollWindow(int dx, int dy, const wxRect *rect)
+void wxWindowMac::ScrollWindow(int dx, int dy, const wxRect *rect)
 {
 	wxMacDrawingClientHelper focus( this ) ;
 	if ( focus.Ok() )
@@ -1318,7 +1376,7 @@ void wxWindow::ScrollWindow(int dx, int dy, const wxRect *rect)
 	
 	for (wxNode *node = GetChildren().First(); node; node = node->Next())
 	{
-		wxWindow *child = (wxWindow*)node->Data();
+		wxWindowMac *child = (wxWindowMac*)node->Data();
 		if (child == m_vScrollBar) continue;
 		if (child == m_hScrollBar) continue;
 		if (child->IsTopLevel()) continue;
@@ -1331,7 +1389,7 @@ void wxWindow::ScrollWindow(int dx, int dy, const wxRect *rect)
 	
 }
 
-void wxWindow::MacOnScroll(wxScrollEvent &event )
+void wxWindowMac::MacOnScroll(wxScrollEvent &event )
 {
 	if ( event.m_eventObject == m_vScrollBar || event.m_eventObject == m_hScrollBar )
 	{
@@ -1366,7 +1424,7 @@ void wxWindow::MacOnScroll(wxScrollEvent &event )
     }
 }
 
-bool wxWindow::SetFont(const wxFont& font)
+bool wxWindowMac::SetFont(const wxFont& font)
 {
     if ( !wxWindowBase::SetFont(font) )
     {
@@ -1378,7 +1436,7 @@ bool wxWindow::SetFont(const wxFont& font)
 }
 
 // Get the window with the focus
-wxWindow *wxWindowBase::FindFocus()
+wxWindowMac *wxWindowBase::FindFocus()
 {
 	return gFocusWindow ;
 }
@@ -1387,7 +1445,7 @@ wxWindow *wxWindowBase::FindFocus()
 // If nothing defined for this, try the parent.
 // E.g. we may be a button loaded from a resource, with no callback function
 // defined.
-void wxWindow::OnCommand(wxWindow& win, wxCommandEvent& event)
+void wxWindowMac::OnCommand(wxWindowMac& win, wxCommandEvent& event)
 {
     if ( GetEventHandler()->ProcessEvent(event)  )
         return;
@@ -1397,7 +1455,7 @@ void wxWindow::OnCommand(wxWindow& win, wxCommandEvent& event)
 #endif // WXWIN_COMPATIBILITY_2
 
 #if WXWIN_COMPATIBILITY
-wxObject* wxWindow::GetChild(int number) const
+wxObject* wxWindowMac::GetChild(int number) const
 {
     // Return a pointer to the Nth object in the Panel
     wxNode *node = GetChildren().First();
@@ -1414,7 +1472,7 @@ wxObject* wxWindow::GetChild(int number) const
 }
 #endif // WXWIN_COMPATIBILITY
 
-void wxWindow::OnSetFocus(wxFocusEvent& event)
+void wxWindowMac::OnSetFocus(wxFocusEvent& event)
 {
     // panel wants to track the window which was the last to have focus in it,
     // so we want to set ourselves as the window which last had focus
@@ -1422,23 +1480,15 @@ void wxWindow::OnSetFocus(wxFocusEvent& event)
     // notice that it's also important to do it upwards the tree becaus
     // otherwise when the top level panel gets focus, it won't set it back to
     // us, but to some other sibling
-    wxWindow *win = this;
-    while ( win )
-    {
-        wxWindow *parent = win->GetParent();
-        wxPanel *panel = wxDynamicCast(parent, wxPanel);
-        if ( panel )
-        {
-            panel->SetLastFocus(win);
-        }
-
-        win = parent;
-    }
+    
+    // CS:don't know if this is still needed:
+    //wxChildFocusEvent eventFocus(this);
+    //(void)GetEventHandler()->ProcessEvent(eventFocus);
 
     event.Skip();
 }
 
-void wxWindow::Clear()
+void wxWindowMac::Clear()
 {
 	if ( m_macWindowData )
 	{
@@ -1460,13 +1510,13 @@ void wxWindow::Clear()
 }
 
 // Setup background and foreground colours correctly
-void wxWindow::SetupColours()
+void wxWindowMac::SetupColours()
 {
     if ( GetParent() )
         SetBackgroundColour(GetParent()->GetBackgroundColour());
 }
 
-void wxWindow::OnIdle(wxIdleEvent& event)
+void wxWindowMac::OnIdle(wxIdleEvent& event)
 {
 /*
    // Check if we need to send a LEAVE event
@@ -1489,18 +1539,24 @@ void wxWindow::OnIdle(wxIdleEvent& event)
 }
 
 // Raise the window to the top of the Z order
-void wxWindow::Raise()
+void wxWindowMac::Raise()
 {
-    // TODO
+    if ( m_macWindowData )
+    {
+        UMABringToFront( m_macWindowData->m_macWindow ) ;
+    }
 }
 
 // Lower the window to the bottom of the Z order
-void wxWindow::Lower()
+void wxWindowMac::Lower()
 {
-    // TODO
+    if ( m_macWindowData )
+    {
+        UMASendBehind( m_macWindowData->m_macWindow , NULL ) ;
+    }
 }
 
-void wxWindow::DoSetClientSize(int width, int height)
+void wxWindowMac::DoSetClientSize(int width, int height)
 {
 	if ( width != -1 || height != -1 )
 	{
@@ -1518,9 +1574,9 @@ void wxWindow::DoSetClientSize(int width, int height)
 }
 
 
-wxWindow* wxWindow::s_lastMouseWindow = NULL ;
+wxWindowMac* wxWindowMac::s_lastMouseWindow = NULL ;
 
-bool wxWindow::MacGetWindowFromPointSub( const wxPoint &point , wxWindow** outWin ) 
+bool wxWindowMac::MacGetWindowFromPointSub( const wxPoint &point , wxWindowMac** outWin ) 
 {
 	if ((point.x < m_x) || (point.y < m_y) ||
 		(point.x > (m_x + m_width)) || (point.y > (m_y + m_height)))
@@ -1535,7 +1591,7 @@ bool wxWindow::MacGetWindowFromPointSub( const wxPoint &point , wxWindow** outWi
 	
 	for (wxNode *node = GetChildren().First(); node; node = node->Next())
 	{
-		wxWindow *child = (wxWindow*)node->Data();
+		wxWindowMac *child = (wxWindowMac*)node->Data();
 		// added the m_isShown test --dmazzoni
 		if ( child->GetMacRootWindow() == window && child->m_isShown )
 		{
@@ -1548,14 +1604,14 @@ bool wxWindow::MacGetWindowFromPointSub( const wxPoint &point , wxWindow** outWi
 	return TRUE;
 }
 
-bool wxWindow::MacGetWindowFromPoint( const wxPoint &screenpoint , wxWindow** outWin ) 
+bool wxWindowMac::MacGetWindowFromPoint( const wxPoint &screenpoint , wxWindowMac** outWin ) 
 {
 	WindowRef window ;
 	Point pt = { screenpoint.y , screenpoint.x } ;
 	if ( ::FindWindow( pt , &window ) == 3 )
 	{
 			wxPoint point( screenpoint ) ;
-			wxWindow* win = wxFindWinFromMacWindow( window ) ;
+			wxWindowMac* win = wxFindWinFromMacWindow( window ) ;
 			if ( win )
 			{
 			win->ScreenToClient( point ) ;
@@ -1567,7 +1623,7 @@ bool wxWindow::MacGetWindowFromPoint( const wxPoint &screenpoint , wxWindow** ou
 
 extern int wxBusyCursorCount ;
 
-bool wxWindow::MacDispatchMouseEvent(wxMouseEvent& event)
+bool wxWindowMac::MacDispatchMouseEvent(wxMouseEvent& event)
 {
 	if ((event.m_x < m_x) || (event.m_y < m_y) ||
 		(event.m_x > (m_x + m_width)) || (event.m_y > (m_y + m_height)))
@@ -1587,7 +1643,7 @@ bool wxWindow::MacDispatchMouseEvent(wxMouseEvent& event)
 
 	for (wxNode *node = GetChildren().First(); node; node = node->Next())
 	{
-		wxWindow *child = (wxWindow*)node->Data();
+		wxWindowMac *child = (wxWindowMac*)node->Data();
 		if ( child->GetMacRootWindow() == window && child->IsShown() && child->IsEnabled() )
 		{
 			if (child->MacDispatchMouseEvent(event))
@@ -1623,7 +1679,7 @@ bool wxWindow::MacDispatchMouseEvent(wxMouseEvent& event)
 Point lastWhere ;
 long lastWhen = 0 ;
 
-wxString wxWindow::MacGetToolTipString( wxPoint &pt )
+wxString wxWindowMac::MacGetToolTipString( wxPoint &pt )
 {
 	if ( m_tooltip )
 	{
@@ -1631,7 +1687,7 @@ wxString wxWindow::MacGetToolTipString( wxPoint &pt )
 	}
 	return "" ;
 }
-void wxWindow::MacFireMouseEvent( EventRecord *ev )
+void wxWindowMac::MacFireMouseEvent( EventRecord *ev )
 {
 	wxMouseEvent event(wxEVT_LEFT_DOWN);
 	bool isDown = !(ev->modifiers & btnState) ; // 1 is for up
@@ -1684,8 +1740,12 @@ void wxWindow::MacFireMouseEvent( EventRecord *ev )
 				else
 					event.SetEventType(wxEVT_LEFT_DCLICK ) ;
 			}
+		    lastWhen = 0 ;
+		}
+		else
+		{
+		    lastWhen = ev->when ;
 		}
-		lastWhen = ev->when ;
 		lastWhere = localwhere ;
 	}
 
@@ -1726,14 +1786,13 @@ void wxWindow::MacFireMouseEvent( EventRecord *ev )
 	}
 }
 
-void wxWindow::MacMouseDown( EventRecord *ev , short part)
+void wxWindowMac::MacMouseDown( EventRecord *ev , short part)
 {
 	MacFireMouseEvent( ev ) ;
 }
 
-void wxWindow::MacMouseUp( EventRecord *ev , short part)
+void wxWindowMac::MacMouseUp( EventRecord *ev , short part)
 {
-	WindowPtr frontWindow ;
 	switch (part)
 	{
 		case inContent:		
@@ -1744,9 +1803,8 @@ void wxWindow::MacMouseUp( EventRecord *ev , short part)
 	}
 }
 
-void wxWindow::MacMouseMoved( EventRecord *ev , short part)
+void wxWindowMac::MacMouseMoved( EventRecord *ev , short part)
 {
-	WindowPtr frontWindow ;
 	switch (part)
 	{
 		case inContent:		
@@ -1756,25 +1814,30 @@ void wxWindow::MacMouseMoved( EventRecord *ev , short part)
 			break ;
 	}
 }
-void wxWindow::MacActivate( EventRecord *ev , bool inIsActivating )
+void wxWindowMac::MacActivate( EventRecord *ev , bool inIsActivating )
 {
+    if ( !m_macWindowData->m_macHasReceivedFirstActivate )
+        m_macWindowData->m_macHasReceivedFirstActivate = true ;
+    
 	wxActivateEvent event(wxEVT_ACTIVATE, inIsActivating , m_windowId);
 	event.m_timeStamp = ev->when ;
 	event.SetEventObject(this);
 	
 	GetEventHandler()->ProcessEvent(event);
 	
+    Refresh(false) ;
 	UMAHighlightAndActivateWindow( m_macWindowData->m_macWindow , inIsActivating ) ;
+//	MacUpdateImmediately() ;
 }
 
-void wxWindow::MacRedraw( RgnHandle updatergn , long time)
+void wxWindowMac::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
 		if ( focus.Ok() )
@@ -1794,7 +1857,7 @@ void wxWindow::MacRedraw( RgnHandle updatergn , long time)
 					// either a non gray background color or a non control window
 		
 
-					wxWindow* parent = GetParent() ;
+					wxWindowMac* parent = GetParent() ;
 					while( parent )
 					{
 						if ( parent->GetMacRootWindow() != window )
@@ -1839,23 +1902,26 @@ 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();
+        		wxWindowMac *child = (wxWindowMac*)node->Data();
         		// eventually test for transparent windows
 		        if ( child->GetMacRootWindow() == window && child->IsShown() )
 		        {
-        		    SetRectRgn( childarea , child->m_x , child->m_y , child->m_x + child->m_width ,  child->m_y + child->m_height ) ;
-        		    DiffRgn( ownUpdateRgn , childarea , ownUpdateRgn ) ;
+		            if ( child->GetBackgroundColour() != m_backgroundColour && !child->IsKindOf( CLASSINFO( wxControl ) ) && ((wxControl*)child)->GetMacControl() )
+		            {
+        		        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 ) ;
+			SetClip( ownUpdateRgn ) ;
 			if ( m_macEraseOnRedraw ) {
     			if ( eraseBackground  )
     			{
@@ -1891,7 +1957,7 @@ void wxWindow::MacRedraw( RgnHandle updatergn , long time)
 			
 	for (wxNode *node = GetChildren().First(); node; node = node->Next())
 	{
-		wxWindow *child = (wxWindow*)node->Data();
+		wxWindowMac *child = (wxWindowMac*)node->Data();
 		SetRectRgn( childupdate , child->m_x , child->m_y , child->m_x + child->m_width ,  child->m_y + child->m_height ) ;
 		SectRgn( childupdate , updatergn , childupdate ) ;
 		OffsetRgn( childupdate , -child->m_x , -child->m_y ) ;
@@ -1905,12 +1971,12 @@ void wxWindow::MacRedraw( RgnHandle updatergn , long time)
 	// eventually a draw grow box here
 }
 
-void wxWindow::MacUpdateImmediately()
+void wxWindowMac::MacUpdateImmediately()
 {
 	WindowRef window = GetMacRootWindow() ;
 	if ( window )
 	{
-		wxWindow* win = wxFindWinFromMacWindow( window ) ;
+		wxWindowMac* win = wxFindWinFromMacWindow( window ) ;
 		#if TARGET_CARBON
 		AGAPortHelper help( GetWindowPort(window) ) ;
 		#else
@@ -1927,7 +1993,7 @@ void wxWindow::MacUpdateImmediately()
 	            GetPortVisibleRegion( GetWindowPort( window ), region );
 
 				// if windowshade gives incompatibility , take the follwing out
-	            if ( !EmptyRgn( region ) )
+	            if ( !EmptyRgn( region ) && win->m_macWindowData->m_macHasReceivedFirstActivate )
 	            {
 					win->MacRedraw( region , wxTheApp->sm_lastMessageTime ) ;
 	            }
@@ -1938,10 +2004,10 @@ void wxWindow::MacUpdateImmediately()
 	}
 }
 
-void wxWindow::MacUpdate( EventRecord *ev )
+void wxWindowMac::MacUpdate( EventRecord *ev )
 {
 	WindowRef window = (WindowRef) ev->message ;
-	wxWindow * win = wxFindWinFromMacWindow( window ) ;
+	wxWindowMac * win = wxFindWinFromMacWindow( window ) ;
 	#if TARGET_CARBON
 	AGAPortHelper help( GetWindowPort(window) ) ;
 	#else
@@ -1958,7 +2024,7 @@ void wxWindow::MacUpdate( EventRecord *ev )
             GetPortVisibleRegion( GetWindowPort( window ), region );
 
 			// if windowshade gives incompatibility , take the follwing out
-            if ( !EmptyRgn( region ) )
+            if ( !EmptyRgn( region ) && win->m_macWindowData->m_macHasReceivedFirstActivate )
             {
 				MacRedraw( region , ev->when ) ;
             }
@@ -1968,10 +2034,9 @@ void wxWindow::MacUpdate( EventRecord *ev )
 	EndUpdate( window ) ;
 }
 
-WindowRef wxWindow::GetMacRootWindow() const
+WindowRef wxWindowMac::GetMacRootWindow() const
 {
-	WindowRef window = NULL ;
-	wxWindow *iter = (wxWindow*)this ;
+	wxWindowMac *iter = (wxWindowMac*)this ;
 	
 	while( iter )
 	{
@@ -1984,7 +2049,7 @@ WindowRef wxWindow::GetMacRootWindow() const
 	return NULL ;
 }
 
-void wxWindow::MacCreateScrollBars( long style ) 
+void wxWindowMac::MacCreateScrollBars( long style ) 
 {
 	wxASSERT_MSG( m_vScrollBar == NULL && m_hScrollBar == NULL , "attempt to create window twice" ) ;
 	
@@ -2023,7 +2088,7 @@ void wxWindow::MacCreateScrollBars( long style )
 	MacRepositionScrollBars() ; // we might have a real position shift
 }
 
-void wxWindow::MacRepositionScrollBars()
+void wxWindowMac::MacRepositionScrollBars()
 {
 	bool hasBoth = ( m_hScrollBar && m_hScrollBar->IsShown()) && ( m_vScrollBar && m_vScrollBar->IsShown()) ;
 	int adjust = hasBoth ? MAC_SCROLLBAR_SIZE - 1 : 0 ;
@@ -2049,8 +2114,7 @@ void wxWindow::MacRepositionScrollBars()
 	MacClientToRootWindow( &x , &y ) ;
 	MacClientToRootWindow( &w , &h ) ;
 	
-	WindowRef window = NULL ;
-	wxWindow *iter = (wxWindow*)this ;
+	wxWindowMac *iter = (wxWindowMac*)this ;
 	
 	int totW = 10000 , totH = 10000;
 	while( iter )
@@ -2098,18 +2162,18 @@ void wxWindow::MacRepositionScrollBars()
 	}
 }
 
-void wxWindow::MacKeyDown( EventRecord *ev ) 
+void wxWindowMac::MacKeyDown( EventRecord *ev ) 
 {
 
 }
 
 
-bool wxWindow::AcceptsFocus() const
+bool wxWindowMac::AcceptsFocus() const
 {
     return MacCanFocus() && wxWindowBase::AcceptsFocus();
 }
 
-ControlHandle wxWindow::MacGetContainerForEmbedding() 
+ControlHandle wxWindowMac::MacGetContainerForEmbedding() 
 {
 	if ( m_macWindowData )
 		return m_macWindowData->m_macRootControl ;
@@ -2117,20 +2181,20 @@ ControlHandle wxWindow::MacGetContainerForEmbedding()
 		return GetParent()->MacGetContainerForEmbedding() ;
 }
 
-void wxWindow::MacSuperChangedPosition() 
+void wxWindowMac::MacSuperChangedPosition() 
 {
 	// only window-absolute structures have to be moved i.e. controls
 
 	wxNode *node = GetChildren().First();
 	while ( node )
 	{
-		wxWindow *child = (wxWindow *)node->Data();
+		wxWindowMac *child = (wxWindowMac *)node->Data();
 		child->MacSuperChangedPosition() ;
 		node = node->Next();
 	}
 }
 
-bool wxWindow::MacSetPortFocusParams( const Point & localOrigin, const Rect & clipRect, WindowRef window , wxWindow* win ) 
+bool wxWindowMac::MacSetPortFocusParams( const Point & localOrigin, const Rect & clipRect, WindowRef window , wxWindowMac* win ) 
 {
 	if ( window == NULL )
 		return false ;
@@ -2148,7 +2212,7 @@ bool wxWindow::MacSetPortFocusParams( const Point & localOrigin, const Rect & cl
 	return true;			
 }
 
-bool wxWindow::MacSetPortDrawingParams( const Point & localOrigin, const Rect & clipRect, WindowRef window , wxWindow* win ) 
+bool wxWindowMac::MacSetPortDrawingParams( const Point & localOrigin, const Rect & clipRect, WindowRef window , wxWindowMac* win ) 
 {
 	if ( window == NULL )
 		return false ;
@@ -2173,7 +2237,7 @@ bool wxWindow::MacSetPortDrawingParams( const Point & localOrigin, const Rect &
 	return true;			
 }
 
-void wxWindow::MacGetPortParams(Point* localOrigin, Rect* clipRect, WindowRef *window  , wxWindow** rootwin) 
+void wxWindowMac::MacGetPortParams(Point* localOrigin, Rect* clipRect, WindowRef *window  , wxWindowMac** rootwin) 
 {
 	if ( m_macWindowData )
 	{
@@ -2203,7 +2267,7 @@ void wxWindow::MacGetPortParams(Point* localOrigin, Rect* clipRect, WindowRef *w
 	}
 }
 
-void wxWindow::MacDoGetPortClientParams(Point* localOrigin, Rect* clipRect, WindowRef *window , wxWindow** rootwin ) 
+void wxWindowMac::MacDoGetPortClientParams(Point* localOrigin, Rect* clipRect, WindowRef *window , wxWindowMac** rootwin ) 
 {
 //	int width , height ;
 //	GetClientSize( &width , &height ) ;
@@ -2238,7 +2302,7 @@ void wxWindow::MacDoGetPortClientParams(Point* localOrigin, Rect* clipRect, Wind
 	}
 }
 
-void wxWindow::MacGetPortClientParams(Point* localOrigin, Rect* clipRect, WindowRef *window , wxWindow** rootwin ) 
+void wxWindowMac::MacGetPortClientParams(Point* localOrigin, Rect* clipRect, WindowRef *window , wxWindowMac** rootwin ) 
 {
 	MacDoGetPortClientParams( localOrigin , clipRect , window , rootwin ) ;
 
@@ -2259,7 +2323,7 @@ void wxWindow::MacGetPortClientParams(Point* localOrigin, Rect* clipRect, Window
 	SectRect(clipRect, &myClip, clipRect);
 }
 
-long wxWindow::MacGetLeftBorderSize( ) const
+long wxWindowMac::MacGetLeftBorderSize( ) const
 {
 	if( m_macWindowData )
 		return 0 ;
@@ -2279,7 +2343,7 @@ long wxWindow::MacGetLeftBorderSize( ) const
 	return 0 ;
 }
 
-long wxWindow::MacGetRightBorderSize( ) const
+long wxWindowMac::MacGetRightBorderSize( ) const
 {
 	if( m_macWindowData )
 		return 0 ;
@@ -2299,7 +2363,7 @@ long wxWindow::MacGetRightBorderSize( ) const
 	return 0 ;
 }
 
-long wxWindow::MacGetTopBorderSize( ) const
+long wxWindowMac::MacGetTopBorderSize( ) const
 {
 	if( m_macWindowData )
 		return 0 ;
@@ -2319,7 +2383,7 @@ long wxWindow::MacGetTopBorderSize( ) const
 	return 0 ;
 }
 
-long wxWindow::MacGetBottomBorderSize( ) const
+long wxWindowMac::MacGetBottomBorderSize( ) const
 {
 	if( m_macWindowData )
 		return 0 ;
@@ -2339,19 +2403,19 @@ long wxWindow::MacGetBottomBorderSize( ) const
 	return 0 ;
 }
 
-long wxWindow::MacRemoveBordersFromStyle( long style ) 
+long wxWindowMac::MacRemoveBordersFromStyle( long style ) 
 {
 	return style & ~( wxDOUBLE_BORDER | wxSUNKEN_BORDER | wxRAISED_BORDER | wxBORDER | wxSTATIC_BORDER ) ;
 }
 
 
-wxMacDrawingHelper::wxMacDrawingHelper( wxWindow * theWindow ) 
+wxMacDrawingHelper::wxMacDrawingHelper( wxWindowMac * theWindow ) 
 {
 	m_ok = false ;
 	Point localOrigin ;
 	Rect clipRect ;
 	WindowRef window ;
-	wxWindow *rootwin ;
+	wxWindowMac *rootwin ;
 	m_currentPort = NULL ;
 	
 	GetPort( &m_formerPort ) ;
@@ -2383,13 +2447,13 @@ wxMacDrawingHelper::~wxMacDrawingHelper()
 		SetPort( m_formerPort ) ;
 }
 
-wxMacDrawingClientHelper::wxMacDrawingClientHelper( wxWindow * theWindow ) 
+wxMacDrawingClientHelper::wxMacDrawingClientHelper( wxWindowMac * theWindow ) 
 {
 	m_ok = false ;
 	Point localOrigin ;
 	Rect clipRect ;
 	WindowRef window ;
-	wxWindow *rootwin ;
+	wxWindowMac *rootwin ;
 	m_currentPort = NULL ;
 	
 	GetPort( &m_formerPort ) ;
@@ -2422,12 +2486,12 @@ wxMacDrawingClientHelper::~wxMacDrawingClientHelper()
 		SetPort( m_formerPort ) ;
 }
 
-// Find the wxWindow at the current mouse position, returning the mouse
+// Find the wxWindowMac at the current mouse position, returning the mouse
 // position.
-wxWindow* wxFindWindowAtPointer(wxPoint& pt)
+wxWindowMac* wxFindWindowAtPointer(wxPoint& pt)
 {
     pt = wxGetMousePosition();
-    wxWindow* found = wxFindWindowAtPoint(pt);
+    wxWindowMac* found = wxFindWindowAtPoint(pt);
     return found;
 }