docs and example for wxDC::DrawPolyPolygon() (patch 882189)

[wxWidgets.git] / src / mac / carbon / window.cpp

diff --git a/src/mac/carbon/window.cpp b/src/mac/carbon/window.cpp
index fb00a1c4d1f53946447adf7ed48e924eed1c93bc..a5c56e42028dabb7f72c35d08e9370bf3808bb47 100644 (file)
--- a/src/mac/carbon/window.cpp
+++ b/src/mac/carbon/window.cpp
@@ -1,11 +1,11 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        windows.cpp
 // Purpose:     wxWindowMac
 /////////////////////////////////////////////////////////////////////////////
 // Name:        windows.cpp
 // Purpose:     wxWindowMac

-// Author:      AUTHOR
+// Author:      Stefan Csomor

 // Modified by:
 // Modified by:

-// Created:     ??/??/98
+// Created:     1998-01-01

 // RCS-ID:      $Id$
 // RCS-ID:      $Id$

-// Copyright:   (c) AUTHOR
+// Copyright:   (c) Stefan Csomor

 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 


@@ -18,7 +18,7 @@
 #include "wx/window.h"
 #include "wx/dc.h"
 #include "wx/dcclient.h"
 #include "wx/window.h"
 #include "wx/dc.h"
 #include "wx/dcclient.h"

-#include "wx/utils.h" 
+#include "wx/utils.h"

 #include "wx/app.h"
 #include "wx/panel.h"
 #include "wx/layout.h"
 #include "wx/app.h"
 #include "wx/panel.h"
 #include "wx/layout.h"


@@ -37,6 +37,7 @@
 #include "wx/menuitem.h"
 #include "wx/spinctrl.h"
 #include "wx/log.h"
 #include "wx/menuitem.h"
 #include "wx/spinctrl.h"
 #include "wx/log.h"

+#include "wx/geometry.h"

 
 #if wxUSE_CARET
     #include "wx/caret.h"
 
 #if wxUSE_CARET
     #include "wx/caret.h"


@@ -74,8 +75,8 @@ BEGIN_EVENT_TABLE(wxWindowMac, wxWindowBase)
   EVT_ERASE_BACKGROUND(wxWindowMac::OnEraseBackground)
   EVT_SYS_COLOUR_CHANGED(wxWindowMac::OnSysColourChanged)
   EVT_INIT_DIALOG(wxWindowMac::OnInitDialog)
   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)
   EVT_SET_FOCUS(wxWindowMac::OnSetFocus)

+  EVT_MOUSE_EVENTS(wxWindowMac::OnMouseEvent)

 END_EVENT_TABLE()
 
 #endif
 END_EVENT_TABLE()
 
 #endif


@@ -99,39 +100,25 @@ END_EVENT_TABLE()
 
 void wxWindowMac::Init()
 {
 
 void wxWindowMac::Init()
 {

-    // generic
-    InitBase();
-
-    // MSW specific
-    m_doubleClickAllowed = 0;
-    m_winCaptured = FALSE;
-
-    m_isBeingDeleted = FALSE;
-
-    m_useCtl3D = FALSE;
-    m_mouseInWindow = FALSE;
-
-    m_xThumbSize = 0;
-    m_yThumbSize = 0;

     m_backgroundTransparent = FALSE;
 
     // as all windows are created with WS_VISIBLE style...
     m_isShown = TRUE;
 
     m_x = 0;
     m_backgroundTransparent = FALSE;
 
     // as all windows are created with WS_VISIBLE style...
     m_isShown = TRUE;
 
     m_x = 0;

-    m_y = 0 ;   
+    m_y = 0 ;

     m_width = 0 ;
     m_height = 0 ;
 
     m_hScrollBar = NULL ;
     m_vScrollBar = NULL ;
     m_width = 0 ;
     m_height = 0 ;
 
     m_hScrollBar = NULL ;
     m_vScrollBar = NULL ;

-
-    m_label = wxEmptyString;

 }
 
 // Destructor
 wxWindowMac::~wxWindowMac()
 {
 }
 
 // Destructor
 wxWindowMac::~wxWindowMac()
 {

+    SendDestroyEvent();
+

     // deleting a window while it is shown invalidates the region
     if ( IsShown() ) {
         wxWindowMac* iter = this ;
     // deleting a window while it is shown invalidates the region
     if ( IsShown() ) {
         wxWindowMac* iter = this ;


@@ -142,26 +129,55 @@ wxWindowMac::~wxWindowMac()
                 break ;
             }
             iter = iter->GetParent() ;
                 break ;
             }
             iter = iter->GetParent() ;

-            
+

         }
     }
         }
     }

-    
+

     m_isBeingDeleted = TRUE;
 
     m_isBeingDeleted = TRUE;
 

+#ifndef __WXUNIVERSAL__
+    // VS: make sure there's no wxFrame with last focus set to us:
+    for ( wxWindow *win = GetParent(); win; win = win->GetParent() )
+    {
+        wxFrame *frame = wxDynamicCast(win, wxFrame);
+        if ( frame )
+        {
+            if ( frame->GetLastFocus() == this )
+            {
+                frame->SetLastFocus((wxWindow*)NULL);
+            }
+            break;
+        }
+    }
+#endif // __WXUNIVERSAL__
+

     if ( s_lastMouseWindow == this )
     {
         s_lastMouseWindow = NULL ;
     }
 
     if ( s_lastMouseWindow == this )
     {
         s_lastMouseWindow = NULL ;
     }
 

+    wxFrame* frame = wxDynamicCast( wxGetTopLevelParent( this ) , wxFrame ) ;
+    if ( frame )
+    {
+        if ( frame->GetLastFocus() == this )
+            frame->SetLastFocus( NULL ) ;
+    }
+

     if ( gFocusWindow == this )
     {
         gFocusWindow = NULL ;
     }
 
     if ( gFocusWindow == this )
     {
         gFocusWindow = NULL ;
     }
 

-    if ( m_parent )
-        m_parent->RemoveChild(this);
-

     DestroyChildren();
     DestroyChildren();

+
+    // delete our drop target if we've got one
+#if wxUSE_DRAG_AND_DROP
+    if ( m_dropTarget != NULL )
+    {
+        delete m_dropTarget;
+        m_dropTarget = NULL;
+    }
+#endif // wxUSE_DRAG_AND_DROP

 }
 
 // Constructor
 }
 
 // Constructor


@@ -173,6 +189,17 @@ bool wxWindowMac::Create(wxWindowMac *parent, wxWindowID id,
 {
     wxCHECK_MSG( parent, FALSE, wxT("can't create wxWindowMac without parent") );
 
 {
     wxCHECK_MSG( parent, FALSE, wxT("can't create wxWindowMac without parent") );
 

+#if wxUSE_STATBOX
+    // wxGTK doesn't allow to create controls with static box as the parent so
+    // this will result in a crash when the program is ported to wxGTK - warn
+    // about it
+    //
+    // the correct solution is to create the controls as siblings of the
+    // static box
+    wxASSERT_MSG( !wxDynamicCast(parent, wxStaticBox),
+                  _T("wxStaticBox can't be used as a window parent!") );
+#endif // wxUSE_STATBOX
+

     if ( !CreateBase(parent, id, pos, size, style, wxDefaultValidator, name) )
         return FALSE;
 
     if ( !CreateBase(parent, id, pos, size, style, wxDefaultValidator, name) )
         return FALSE;
 


@@ -184,11 +211,17 @@ bool wxWindowMac::Create(wxWindowMac *parent, wxWindowID id,
     m_width = WidthDefault( size.x );
     m_height = HeightDefault( size.y ) ;
 #ifndef __WXUNIVERSAL__
     m_width = WidthDefault( size.x );
     m_height = HeightDefault( size.y ) ;
 #ifndef __WXUNIVERSAL__

-    if ( ! IsKindOf( CLASSINFO ( wxControl ) ) && ! IsKindOf( CLASSINFO( wxStatusBar ) ) )
+    // Don't give scrollbars to wxControls unless they ask for them
+    if ( (! IsKindOf(CLASSINFO(wxControl)) && ! IsKindOf(CLASSINFO(wxStatusBar))) ||
+         (IsKindOf(CLASSINFO(wxControl)) && ( style & wxHSCROLL || style & wxVSCROLL)))

     {
         MacCreateScrollBars( style ) ;
     }
 #endif
     {
         MacCreateScrollBars( style ) ;
     }
 #endif

+
+    wxWindowCreateEvent event(this);
+    GetEventHandler()->AddPendingEvent(event);
+

     return TRUE;
 }
 
     return TRUE;
 }
 


@@ -196,29 +229,37 @@ void wxWindowMac::SetFocus()
 {
     if ( gFocusWindow == this )
         return ;
 {
     if ( gFocusWindow == this )
         return ;

-    
+

     if ( AcceptsFocus() )
     {
         if (gFocusWindow )
         {
     if ( AcceptsFocus() )
     {
         if (gFocusWindow )
         {

-            #if wxUSE_CARET
+#if wxUSE_CARET

                 // Deal with caret
                 if ( gFocusWindow->m_caret )
                 {
                       gFocusWindow->m_caret->OnKillFocus();
                 }
                 // Deal with caret
                 if ( gFocusWindow->m_caret )
                 {
                       gFocusWindow->m_caret->OnKillFocus();
                 }

-            #endif // wxUSE_CARET
-      #ifndef __WXUNIVERSAL__
+#endif // wxUSE_CARET
+#ifndef __WXUNIVERSAL__

             wxControl* control = wxDynamicCast( gFocusWindow , wxControl ) ;
             if ( control && control->GetMacControl() )
             {
                 UMASetKeyboardFocus( (WindowRef) gFocusWindow->MacGetRootWindow() , (ControlHandle) control->GetMacControl()  , kControlFocusNoPart ) ;
                 control->MacRedrawControl() ;
             }
             wxControl* control = wxDynamicCast( gFocusWindow , wxControl ) ;
             if ( control && control->GetMacControl() )
             {
                 UMASetKeyboardFocus( (WindowRef) gFocusWindow->MacGetRootWindow() , (ControlHandle) control->GetMacControl()  , kControlFocusNoPart ) ;
                 control->MacRedrawControl() ;
             }

-            #endif
-            wxFocusEvent event(wxEVT_KILL_FOCUS, gFocusWindow->m_windowId);
-            event.SetEventObject(gFocusWindow);
-            gFocusWindow->GetEventHandler()->ProcessEvent(event) ;
+#endif
+            // Without testing the window id, for some reason
+            // a kill focus event can still be sent to
+            // the control just being focussed.
+            int thisId = this->m_windowId;
+            int gFocusWindowId = gFocusWindow->m_windowId;
+            if (gFocusWindowId != thisId)
+            {
+                wxFocusEvent event(wxEVT_KILL_FOCUS, gFocusWindow->m_windowId);
+                event.SetEventObject(gFocusWindow);
+                gFocusWindow->GetEventHandler()->ProcessEvent(event) ;
+            }

         }
         gFocusWindow = this ;
         {
         }
         gFocusWindow = this ;
         {


@@ -237,7 +278,7 @@ void wxWindowMac::SetFocus()
             wxControl* control = wxDynamicCast( gFocusWindow , wxControl ) ;
             if ( control && control->GetMacControl() )
             {
             wxControl* control = wxDynamicCast( gFocusWindow , wxControl ) ;
             if ( control && control->GetMacControl() )
             {

-                UMASetKeyboardFocus( (WindowRef) gFocusWindow->MacGetRootWindow() , (ControlHandle) control->GetMacControl()  , kControlEditTextPart ) ;
+                UMASetKeyboardFocus( (WindowRef) gFocusWindow->MacGetRootWindow() , (ControlHandle) control->GetMacControl()  , kControlFocusNextPart ) ;

             }
       #endif
             wxFocusEvent event(wxEVT_SET_FOCUS, m_windowId);
             }
       #endif
             wxFocusEvent event(wxEVT_SET_FOCUS, m_windowId);


@@ -276,15 +317,15 @@ void wxWindowMac::DoReleaseMouse()
 
 void wxWindowMac::SetDropTarget(wxDropTarget *pDropTarget)
 {
 
 void wxWindowMac::SetDropTarget(wxDropTarget *pDropTarget)
 {

-  if ( m_dropTarget != 0 ) {
-    delete m_dropTarget;
-  }
+    if ( m_dropTarget != 0 ) {
+        delete m_dropTarget;
+    }

 
 

-  m_dropTarget = pDropTarget;
-  if ( m_dropTarget != 0 )
-  {
-    // TODO
-  }
+    m_dropTarget = pDropTarget;
+    if ( m_dropTarget != 0 )
+    {
+        // TODO
+    }

 }
 
 #endif
 }
 
 #endif


@@ -305,7 +346,7 @@ void wxWindowMac::DoGetSize(int *x, int *y) const
 void wxWindowMac::DoGetPosition(int *x, int *y) const
 {
     int xx,yy;
 void wxWindowMac::DoGetPosition(int *x, int *y) const
 {
     int xx,yy;

- 
+

     xx = m_x ;
     yy = m_y ;
     if ( !IsTopLevel() && GetParent())
     xx = m_x ;
     yy = m_y ;
     if ( !IsTopLevel() && GetParent())


@@ -325,10 +366,23 @@ bool wxWindowMac::DoPopupMenu(wxMenu *menu, int x, int y)
     menu->UpdateUI();
     ClientToScreen( &x , &y ) ;
 
     menu->UpdateUI();
     ClientToScreen( &x , &y ) ;
 

-    ::InsertMenu( (MenuHandle) menu->GetHMenu() , -1 ) ;
+    menu->MacBeforeDisplay( true ) ;

     long menuResult = ::PopUpMenuSelect((MenuHandle) menu->GetHMenu() ,y,x, 0) ;
     long menuResult = ::PopUpMenuSelect((MenuHandle) menu->GetHMenu() ,y,x, 0) ;

-    menu->MacMenuSelect( this , TickCount() , HiWord(menuResult) , LoWord(menuResult) ) ;
-    ::DeleteMenu( menu->MacGetMenuId() ) ;
+    if ( HiWord(menuResult) != 0 )
+    {
+        MenuCommand id ;
+        GetMenuItemCommandID( GetMenuHandle(HiWord(menuResult)) , LoWord(menuResult) , &id ) ;
+        wxMenuItem* item = NULL ;
+        wxMenu* realmenu ;
+        item = menu->FindItem(id, &realmenu) ;
+        if (item->IsCheckable())
+        {
+            item->Check( !item->IsChecked() ) ;
+        }
+        menu->SendEvent( id , item->IsCheckable() ? item->IsChecked() : -1 ) ;
+    }
+    menu->MacAfterDisplay( true ) ;
+

     menu->SetInvokingWindow(NULL);
 
   return TRUE;
     menu->SetInvokingWindow(NULL);
 
   return TRUE;


@@ -344,7 +398,7 @@ void wxWindowMac::DoScreenToClient(int *x, int *y) const
     if(x)   localwhere.h = * x ;
     if(y)   localwhere.v = * y ;
 
     if(x)   localwhere.h = * x ;
     if(y)   localwhere.v = * y ;
 

-    GrafPtr     port ;  
+    GrafPtr     port ;

     ::GetPort( &port ) ;
     ::SetPort( UMAGetWindowPort( window ) ) ;
     ::GlobalToLocal( &localwhere ) ;
     ::GetPort( &port ) ;
     ::SetPort( UMAGetWindowPort( window ) ) ;
     ::GlobalToLocal( &localwhere ) ;


@@ -352,30 +406,30 @@ void wxWindowMac::DoScreenToClient(int *x, int *y) const
 
     if(x)   *x = localwhere.h ;
     if(y)   *y = localwhere.v ;
 
     if(x)   *x = localwhere.h ;
     if(y)   *y = localwhere.v ;

-    
+

     MacRootWindowToWindow( x , y ) ;
     if ( x )
     MacRootWindowToWindow( x , y ) ;
     if ( x )

-            x -= MacGetLeftBorderSize() ;
+        *x -= MacGetLeftBorderSize() ;

     if ( y )
     if ( y )

-            y -= MacGetTopBorderSize() ;
+        *y -= MacGetTopBorderSize() ;

 }
 
 void wxWindowMac::DoClientToScreen(int *x, int *y) const
 {
     WindowRef window = (WindowRef) MacGetRootWindow() ;
 }
 
 void wxWindowMac::DoClientToScreen(int *x, int *y) const
 {
     WindowRef window = (WindowRef) MacGetRootWindow() ;

-    
+

     if ( x )
     if ( x )

-            x += MacGetLeftBorderSize() ;
+        *x += MacGetLeftBorderSize() ;

     if ( y )
     if ( y )

-            y += MacGetTopBorderSize() ;
-            
+        *y += MacGetTopBorderSize() ;
+

     MacWindowToRootWindow( x , y ) ;
     MacWindowToRootWindow( x , y ) ;

-    
+

     Point       localwhere = { 0,0 };
     if(x)   localwhere.h = * x ;
     if(y)   localwhere.v = * y ;
     Point       localwhere = { 0,0 };
     if(x)   localwhere.h = * x ;
     if(y)   localwhere.v = * y ;

-    
-    GrafPtr     port ;  
+
+    GrafPtr     port ;

     ::GetPort( &port ) ;
     ::SetPort( UMAGetWindowPort( window ) ) ;
 
     ::GetPort( &port ) ;
     ::SetPort( UMAGetWindowPort( window ) ) ;
 


@@ -390,7 +444,7 @@ void wxWindowMac::MacClientToRootWindow( int *x , int *y ) const
     wxPoint origin = GetClientAreaOrigin() ;
     if(x)   *x += origin.x ;
     if(y)   *y += origin.y ;
     wxPoint origin = GetClientAreaOrigin() ;
     if(x)   *x += origin.x ;
     if(y)   *y += origin.y ;

-    
+

     MacWindowToRootWindow( x , y ) ;
 }
 
     MacWindowToRootWindow( x , y ) ;
 }
 


@@ -425,37 +479,37 @@ void wxWindowMac::MacRootWindowToWindow( int *x , int *y ) const
 bool wxWindowMac::SetCursor(const wxCursor& cursor)
 {
     if (m_cursor == cursor)
 bool wxWindowMac::SetCursor(const wxCursor& cursor)
 {
     if (m_cursor == cursor)

-       return FALSE;
+        return FALSE;

 
     if (wxNullCursor == cursor)
     {
 
     if (wxNullCursor == cursor)
     {

-       if ( ! wxWindowBase::SetCursor( *wxSTANDARD_CURSOR ) )
-        return FALSE ;
+        if ( ! wxWindowBase::SetCursor( *wxSTANDARD_CURSOR ) )
+            return FALSE ;

     }
     else
     {
     }
     else
     {

-       if ( ! wxWindowBase::SetCursor( cursor ) )
-        return FALSE ;
+        if ( ! wxWindowBase::SetCursor( cursor ) )
+            return FALSE ;

     }
 
     }
 

-  wxASSERT_MSG( m_cursor.Ok(),
-                  wxT("cursor must be valid after call to the base version"));
+    wxASSERT_MSG( m_cursor.Ok(),
+        wxT("cursor must be valid after call to the base version"));
+
+    Point pt ;
+    wxWindowMac *mouseWin ;
+    GetMouse( &pt ) ;

 
 

-  Point pt ;
-  wxWindowMac *mouseWin ;
-  GetMouse( &pt ) ;
-  
-  // Change the cursor NOW if we're within the correct window
+    // Change the cursor NOW if we're within the correct window

 
 

-  if ( MacGetWindowFromPoint( wxPoint( pt.h , pt.v ) , &mouseWin ) )
-  {
-    if ( mouseWin == this && !wxIsBusy() )
+    if ( MacGetWindowFromPoint( wxPoint( pt.h , pt.v ) , &mouseWin ) )

     {
     {

-        m_cursor.MacInstall() ;
+        if ( mouseWin == this && !wxIsBusy() )
+        {
+            m_cursor.MacInstall() ;
+        }

     }
     }

-  }

 
 

-  return TRUE ;
+    return TRUE ;

 }
 
 
 }
 
 


@@ -468,51 +522,51 @@ void wxWindowMac::DoGetClientSize(int *x, int *y) const
 
     ww -= MacGetLeftBorderSize(  )  + MacGetRightBorderSize(  ) ;
     hh -= MacGetTopBorderSize(  ) + MacGetBottomBorderSize( );
 
     ww -= MacGetLeftBorderSize(  )  + MacGetRightBorderSize(  ) ;
     hh -= MacGetTopBorderSize(  ) + MacGetBottomBorderSize( );

-    
-  if ( (m_vScrollBar && m_vScrollBar->IsShown()) || (m_hScrollBar  && m_hScrollBar->IsShown()) )
-  {
-    int x1 = 0 ; 
-    int y1 = 0 ;
-    int w = m_width ;
-    int h = m_height ;
-    
-    MacClientToRootWindow( &x1 , &y1 ) ;
-    MacClientToRootWindow( &w , &h ) ;
-    
-    wxWindowMac *iter = (wxWindowMac*)this ;
-    
-    int totW = 10000 , totH = 10000;
-    while( iter )
+
+    if ( (m_vScrollBar && m_vScrollBar->IsShown()) || (m_hScrollBar  && m_hScrollBar->IsShown()) )

     {
     {

-        if ( iter->IsTopLevel() )
+        int x1 = 0 ;
+        int y1 = 0 ;
+        int w = m_width ;
+        int h = m_height ;
+
+        MacClientToRootWindow( &x1 , &y1 ) ;
+        MacClientToRootWindow( &w , &h ) ;
+
+        wxWindowMac *iter = (wxWindowMac*)this ;
+
+        int totW = 10000 , totH = 10000;
+        while( iter )

         {
         {

-            totW = iter->m_width ;
-            totH = iter->m_height ;
-            break ;
+            if ( iter->IsTopLevel() )
+            {
+                totW = iter->m_width ;
+                totH = iter->m_height ;
+                break ;
+            }
+
+            iter = iter->GetParent() ;

         }
 
         }
 

-        iter = iter->GetParent() ;
-    } 
-    
-    if (m_hScrollBar  && m_hScrollBar->IsShown() )
-    {
-        hh -= MAC_SCROLLBAR_SIZE;
-        if ( h-y1 >= totH )
+        if (m_hScrollBar  && m_hScrollBar->IsShown() )

         {
         {

-            hh += 1 ;
+            hh -= MAC_SCROLLBAR_SIZE;
+            if ( h-y1 >= totH )
+            {
+                hh += 1 ;
+            }

         }
         }

-    }
-    if (m_vScrollBar  && m_vScrollBar->IsShown() )
-    {
-        ww -= MAC_SCROLLBAR_SIZE;
-        if ( w-x1 >= totW )
+        if (m_vScrollBar  && m_vScrollBar->IsShown() )

         {
         {

-            ww += 1 ;
+            ww -= MAC_SCROLLBAR_SIZE;
+            if ( w-x1 >= totW )
+            {
+                ww += 1 ;
+            }

         }
     }
         }
     }

-  }
-  if(x)   *x = ww;
-  if(y)   *y = hh;
+    if(x)   *x = ww;
+    if(y)   *y = hh;

 }
 
 
 }
 
 


@@ -538,24 +592,24 @@ void wxWindowMac::DoMoveWindow(int x, int y, int width, int height)
     int former_y = m_y ;
     int former_w = m_width ;
     int former_h = m_height ;
     int former_y = m_y ;
     int former_w = m_width ;
     int former_h = m_height ;

-    
-  int actualWidth = width;
-  int actualHeight = height;
-  int actualX = x;
-  int actualY = y;
-  
-    if ((m_minWidth != -1) && (actualWidth < m_minWidth)) 
+
+    int actualWidth = width;
+    int actualHeight = height;
+    int actualX = x;
+    int actualY = y;
+
+    if ((m_minWidth != -1) && (actualWidth < m_minWidth))

         actualWidth = m_minWidth;
         actualWidth = m_minWidth;

-    if ((m_minHeight != -1) && (actualHeight < m_minHeight)) 
+    if ((m_minHeight != -1) && (actualHeight < m_minHeight))

         actualHeight = m_minHeight;
         actualHeight = m_minHeight;

-    if ((m_maxWidth != -1) && (actualWidth > m_maxWidth)) 
+    if ((m_maxWidth != -1) && (actualWidth > m_maxWidth))

         actualWidth = m_maxWidth;
         actualWidth = m_maxWidth;

-    if ((m_maxHeight != -1) && (actualHeight > m_maxHeight)) 
+    if ((m_maxHeight != -1) && (actualHeight > m_maxHeight))

         actualHeight = m_maxHeight;
 
     bool doMove = false ;
     bool doResize = false ;
         actualHeight = m_maxHeight;
 
     bool doMove = false ;
     bool doResize = false ;

-    
+

     if ( actualX != former_x || actualY != former_y )
     {
         doMove = true ;
     if ( actualX != former_x || actualY != former_y )
     {
         doMove = true ;


@@ -569,16 +623,76 @@ void wxWindowMac::DoMoveWindow(int x, int y, int width, int height)
     {
         // erase former position
 
     {
         // erase former position
 

-        Refresh() ;
+        bool partialRepaint = false ;
+
+        if ( !HasFlag(wxFULL_REPAINT_ON_RESIZE) )
+        {
+            wxPoint oldPos( m_x , m_y ) ;
+            wxPoint newPos( actualX , actualY ) ;
+            MacWindowToRootWindow( &oldPos.x , &oldPos.y ) ;
+            MacWindowToRootWindow( &newPos.x , &newPos.y ) ;
+            if ( oldPos == newPos )
+            {
+                partialRepaint = true ;
+                RgnHandle oldRgn,newRgn,diffRgn ;
+                oldRgn = NewRgn() ;
+                newRgn = NewRgn() ;
+                diffRgn = NewRgn() ;
+                
+                // invalidate the differences between the old and the new area
+                
+                SetRectRgn(oldRgn , oldPos.x , oldPos.y , oldPos.x + m_width , oldPos.y + m_height ) ;
+                SetRectRgn(newRgn , newPos.x , newPos.y , newPos.x + actualWidth , newPos.y + actualHeight ) ;
+                DiffRgn( newRgn , oldRgn , diffRgn ) ;
+                InvalWindowRgn( (WindowRef) MacGetRootWindow() , diffRgn ) ;
+                DiffRgn( oldRgn , newRgn , diffRgn ) ;
+                InvalWindowRgn( (WindowRef) MacGetRootWindow() , diffRgn ) ;
+                
+                // we also must invalidate the border areas, someone might optimize this one day to invalidate only the really
+                // changing pixels...
+                
+                if ( MacGetLeftBorderSize() != 0 || MacGetRightBorderSize() != 0 || 
+                       MacGetTopBorderSize() != 0 || MacGetBottomBorderSize() != 0 )
+                {
+                       RgnHandle innerOldRgn, innerNewRgn ;
+                       innerOldRgn = NewRgn() ;
+                       innerNewRgn = NewRgn() ;
+                       
+                       SetRectRgn(innerOldRgn , oldPos.x + MacGetLeftBorderSize()  , oldPos.y + MacGetTopBorderSize() , 
+                               oldPos.x + m_width - MacGetRightBorderSize() , oldPos.y + m_height - MacGetBottomBorderSize() ) ;
+                   DiffRgn( oldRgn , innerOldRgn , diffRgn ) ;
+                       InvalWindowRgn( (WindowRef) MacGetRootWindow() , diffRgn ) ;
+
+                       SetRectRgn(innerNewRgn , newPos.x + MacGetLeftBorderSize()  , newPos.y + MacGetTopBorderSize() , 
+                               newPos.x + actualWidth - MacGetRightBorderSize() , newPos.y + actualHeight - MacGetBottomBorderSize() ) ;
+                   DiffRgn( newRgn , innerNewRgn , diffRgn ) ;
+                       InvalWindowRgn( (WindowRef) MacGetRootWindow() , diffRgn ) ;
+                       
+                       DisposeRgn( innerOldRgn ) ;
+                       DisposeRgn( innerNewRgn ) ;
+                }
+                
+                DisposeRgn(oldRgn) ;
+                DisposeRgn(newRgn) ;
+                DisposeRgn(diffRgn) ;
+            }
+        }
+
+        if ( !partialRepaint )
+            Refresh() ;

 
         m_x = actualX ;
         m_y = actualY ;
         m_width = actualWidth ;
         m_height = actualHeight ;
 
 
         m_x = actualX ;
         m_y = actualY ;
         m_width = actualWidth ;
         m_height = actualHeight ;
 

+        // update any low-level frame-relative positions
+
+        MacUpdateDimensions() ;

         // erase new position
 
         // erase new position
 

-        Refresh() ;
+        if ( !partialRepaint )
+            Refresh() ;

         if ( doMove )
             wxWindowMac::MacSuperChangedPosition() ; // like this only children will be notified
 
         if ( doMove )
             wxWindowMac::MacSuperChangedPosition() ; // like this only children will be notified
 


@@ -592,14 +706,14 @@ void wxWindowMac::DoMoveWindow(int x, int y, int width, int height)
         }
         if ( doResize )
         {
         }
         if ( doResize )
         {

-             MacRepositionScrollBars() ;
-             wxSize size(m_width, m_height);
-             wxSizeEvent event(size, 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,
 }
 
 // set the size of the window: if the dimensions are positive, just use them,


@@ -615,13 +729,13 @@ 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);
     // 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 &&
     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 )
+        width == currentW && height == currentH )

     {
         MacRepositionScrollBars() ; // we might have a real position shift
         return;
     {
         MacRepositionScrollBars() ; // we might have a real position shift
         return;


@@ -694,65 +808,49 @@ bool wxWindowMac::Show(bool show)
     if ( !wxWindowBase::Show(show) )
         return FALSE;
 
     if ( !wxWindowBase::Show(show) )
         return FALSE;
 

-/*
-    WindowRef window = (WindowRef) MacGetRootWindow() ;
-    wxWindowMac* win = wxFindWinFromMacWindow( window ) ;
-    if ( win == NULL && win->m_isBeingDeleted )
-        return FALSE ;
-*/       

     MacSuperShown( show ) ;
     MacSuperShown( show ) ;

-    Refresh() ; 
-/*      
-    if ( !show )
-    {
-        if ( win && !win->m_isBeingDeleted )
-            Refresh() ; 
-    }
-    else
-    {
-        Refresh() ; 
-    }
-*/
+    Refresh() ;
+

     return TRUE;
 }
 
     return TRUE;
 }
 

-void wxWindowMac::MacSuperShown( bool show ) 
+void wxWindowMac::MacSuperShown( bool show )

 {
 {

-    wxNode *node = GetChildren().First();
+    wxWindowListNode *node = GetChildren().GetFirst();

     while ( node )
     {
     while ( node )
     {

-        wxWindowMac *child = (wxWindowMac *)node->Data();
+        wxWindowMac *child = node->GetData();

         if ( child->m_isShown )
             child->MacSuperShown( show ) ;
         if ( child->m_isShown )
             child->MacSuperShown( show ) ;

-        node = node->Next();
+        node = node->GetNext();

     }
 }
 
     }
 }
 

-void wxWindowMac::MacSuperEnabled( bool enabled ) 
+void wxWindowMac::MacSuperEnabled( bool enabled )

 {
     if ( !IsTopLevel() )
     {
 {
     if ( !IsTopLevel() )
     {

-      // to be absolutely correct we'd have to invalidate (with eraseBkground 
+      // to be absolutely correct we'd have to invalidate (with eraseBkground

       // because unter MacOSX the frames are drawn with an addXXX mode)
       // the borders area
     }
       // because unter MacOSX the frames are drawn with an addXXX mode)
       // the borders area
     }

-    wxNode *node = GetChildren().First();
+    wxWindowListNode *node = GetChildren().GetFirst();

     while ( node )
     {
     while ( node )
     {

-        wxWindowMac *child = (wxWindowMac *)node->Data();
+        wxWindowMac *child = (wxWindowMac *)node->GetData();

         if ( child->m_isShown )
             child->MacSuperEnabled( enabled ) ;
         if ( child->m_isShown )
             child->MacSuperEnabled( enabled ) ;

-        node = node->Next();
+        node = node->GetNext();

     }
 }
 
     }
 }
 

-bool wxWindowMac::MacIsReallyShown() const 
+bool wxWindowMac::MacIsReallyShown() const

 {
 {

-    if ( m_isShown && (m_parent != NULL) ) {
+    if ( m_isShown && (m_parent != NULL && !IsTopLevel() ) ) {

         return m_parent->MacIsReallyShown();
     }
     return m_isShown;
         return m_parent->MacIsReallyShown();
     }
     return m_isShown;

-/*  
+/*

     bool status = m_isShown ;
     wxWindowMac * win = this ;
     while ( status && win->m_parent != NULL )
     bool status = m_isShown ;
     wxWindowMac * win = this ;
     while ( status && win->m_parent != NULL )


@@ -782,7 +880,7 @@ void wxWindowMac::GetTextExtent(const wxString& string, int *x, int *y,
     const wxFont *fontToUse = theFont;
     if ( !fontToUse )
         fontToUse = &m_font;
     const wxFont *fontToUse = theFont;
     if ( !fontToUse )
         fontToUse = &m_font;

-        
+

     wxClientDC dc( (wxWindowMac*) this ) ;
     long lx,ly,ld,le ;
     dc.GetTextExtent( string , &lx , &ly , &ld, &le, (wxFont *)fontToUse ) ;
     wxClientDC dc( (wxWindowMac*) this ) ;
     long lx,ly,ld,le ;
     dc.GetTextExtent( string , &lx , &ly , &ld, &le, (wxFont *)fontToUse ) ;


@@ -797,76 +895,52 @@ void wxWindowMac::GetTextExtent(const wxString& string, int *x, int *y,
 }
 
 /*
 }
 
 /*

- * Rect is given in client coordinates, for further reading, read wxTopLevelWindowMac::InvalidateRect 
+ * Rect is given in client coordinates, for further reading, read wxTopLevelWindowMac::InvalidateRect

  * we always intersect with the entire window, not only with the client area
  */
  * we always intersect with the entire window, not only with the client area
  */

- 
+

 void wxWindowMac::Refresh(bool eraseBack, const wxRect *rect)
 {
     if ( MacGetTopLevelWindow() == NULL )
 void wxWindowMac::Refresh(bool eraseBack, const wxRect *rect)
 {
     if ( MacGetTopLevelWindow() == NULL )

-      return ;
-      
-    wxPoint client ;
-    client = GetClientAreaOrigin( ) ;
-    Rect clientrect = { -client.y , -client.x , m_height - client.y , m_width - client.x} ;
+        return ;
+
+    if ( !MacIsReallyShown() )
+       return ;
+ 
+     wxPoint client = GetClientAreaOrigin();
+    int x1 = -client.x;
+    int y1 = -client.y;
+    int x2 = m_width - client.x;
+    int y2 = m_height - client.y;
+
+    if (IsKindOf( CLASSINFO(wxButton)))
+    {
+        // buttons have an "aura"
+        y1 -= 5;
+        x1 -= 5;
+        y2 += 5;
+        x2 += 5;
+    }
+
+    Rect clientrect = { y1, x1, y2, x2 };
+

     if ( rect )
     {
         Rect r = { rect->y , rect->x , rect->y + rect->height , rect->x + rect->width } ;
     if ( rect )
     {
         Rect r = { rect->y , rect->x , rect->y + rect->height , rect->x + rect->width } ;

-        SectRect( &clientrect , &r , &clientrect ) ;        
+        SectRect( &clientrect , &r , &clientrect ) ;

     }
     }

+

     if ( !EmptyRect( &clientrect ) )
     {
       int top = 0 , left = 0 ;
     if ( !EmptyRect( &clientrect ) )
     {
       int top = 0 , left = 0 ;

-      
+

       MacClientToRootWindow( &left , &top ) ;
       OffsetRect( &clientrect , left , top ) ;
       MacClientToRootWindow( &left , &top ) ;
       OffsetRect( &clientrect , left , top ) ;

-      
+

       MacGetTopLevelWindow()->MacInvalidate( &clientrect , eraseBack ) ;
     }
 }
 
       MacGetTopLevelWindow()->MacInvalidate( &clientrect , eraseBack ) ;
     }
 }
 

-#if wxUSE_CARET && WXWIN_COMPATIBILITY
-// ---------------------------------------------------------------------------
-// Caret manipulation
-// ---------------------------------------------------------------------------
-
-void wxWindowMac::CreateCaret(int w, int h)
-{
-    SetCaret(new wxCaret(this, w, h));
-}
-
-void wxWindowMac::CreateCaret(const wxBitmap *WXUNUSED(bitmap))
-{
-    wxFAIL_MSG("not implemented");
-}
-
-void wxWindowMac::ShowCaret(bool show)
-{
-    wxCHECK_RET( m_caret, "no caret to show" );
-
-    m_caret->Show(show);
-}
-
-void wxWindowMac::DestroyCaret()
-{
-    SetCaret(NULL);
-}
-
-void wxWindowMac::SetCaretPos(int x, int y)
-{
-    wxCHECK_RET( m_caret, "no caret to move" );
-
-    m_caret->Move(x, y);
-}
-
-void wxWindowMac::GetCaretPos(int *x, int *y) const
-{
-    wxCHECK_RET( m_caret, "no caret to get position of" );
-
-    m_caret->GetPosition(x, y);
-}
-#endif // wxUSE_CARET
-

 wxWindowMac *wxGetActiveWindow()
 {
     // actually this is a windows-only concept
 wxWindowMac *wxGetActiveWindow()
 {
     // actually this is a windows-only concept


@@ -876,10 +950,10 @@ wxWindowMac *wxGetActiveWindow()
 // Coordinates relative to the window
 void wxWindowMac::WarpPointer (int x_pos, int y_pos)
 {
 // Coordinates relative to the window
 void wxWindowMac::WarpPointer (int x_pos, int y_pos)
 {

-    // We really dont move the mouse programmatically under mac
+    // We really don't move the mouse programmatically under Mac.

 }
 
 }
 

-const wxBrush& wxWindowMac::MacGetBackgroundBrush() 
+const wxBrush& wxWindowMac::MacGetBackgroundBrush()

 {
     if ( m_backgroundColour == wxSystemSettings::GetColour(wxSYS_COLOUR_APPWORKSPACE) )
     {
 {
     if ( m_backgroundColour == wxSystemSettings::GetColour(wxSYS_COLOUR_APPWORKSPACE) )
     {


@@ -890,50 +964,50 @@ const wxBrush& wxWindowMac::MacGetBackgroundBrush()
         // on mac we have the difficult situation, that 3dface gray can be different colours, depending whether
         // 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
         // on mac we have the difficult situation, that 3dface gray can be different colours, depending whether
         // 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

-        
-            WindowRef window = (WindowRef) MacGetRootWindow() ;
-            
-            wxWindowMac* parent = GetParent() ;
-            while( parent )
+
+        WindowRef window = (WindowRef) MacGetRootWindow() ;
+
+        wxWindowMac* parent = GetParent() ;
+        while( parent )
+        {
+            if ( parent->MacGetRootWindow() != window )
+            {
+                // we are in a different window on the mac system
+                parent = NULL ;
+                break ;
+            }
+

             {
             {

-                if ( parent->MacGetRootWindow() != window )
+                if ( parent->m_backgroundColour != wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE )
+                    && parent->m_backgroundColour != wxSystemSettings::GetColour(wxSYS_COLOUR_APPWORKSPACE) )

                 {
                 {

-                    // we are in a different window on the mac system
-                    parent = NULL ;
+                    // if we have any other colours in the hierarchy
+                    m_macBackgroundBrush.SetColour( parent->m_backgroundColour ) ;

                     break ;
                 }
                     break ;
                 }

-
+                // if we have the normal colours in the hierarchy but another control etc. -> use it's background
+                if ( parent->IsKindOf( CLASSINFO( wxNotebook ) ) || parent->IsKindOf( CLASSINFO( wxTabCtrl ) ))

                 {
                 {

-                    if ( parent->m_backgroundColour != wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE ) 
-                      && parent->m_backgroundColour != wxSystemSettings::GetColour(wxSYS_COLOUR_APPWORKSPACE) )
-                    {
-                        // if we have any other colours in the hierarchy
-                        m_macBackgroundBrush.SetColour( parent->m_backgroundColour ) ;
-                        break ;
-                    }
-                    // if we have the normal colours in the hierarchy but another control etc. -> use it's background
-                    if ( parent->IsKindOf( CLASSINFO( wxNotebook ) ) || parent->IsKindOf( CLASSINFO( wxTabCtrl ) ))
-                    {
-                        Rect extent = { 0 , 0 , 0 , 0 } ;
-                        int x , y ;
-                        x = y = 0 ;
-                        wxSize size = parent->GetSize() ;
-                        parent->MacClientToRootWindow( &x , &y ) ;
-                        extent.left = x ;
-                        extent.top = y ;
-                        extent.top-- ;
-                        extent.right = x + size.x ;
-                        extent.bottom = y + size.y ;
-                        m_macBackgroundBrush.SetMacThemeBackground( kThemeBackgroundTabPane , (WXRECTPTR) &extent ) ; // todo eventually change for inactive
-                        break ;
-                    }
+                    Rect extent = { 0 , 0 , 0 , 0 } ;
+                    int x , y ;
+                    x = y = 0 ;
+                    wxSize size = parent->GetSize() ;
+                    parent->MacClientToRootWindow( &x , &y ) ;
+                    extent.left = x ;
+                    extent.top = y ;
+                    extent.top-- ;
+                    extent.right = x + size.x ;
+                    extent.bottom = y + size.y ;
+                    m_macBackgroundBrush.SetMacThemeBackground( kThemeBackgroundTabPane , (WXRECTPTR) &extent ) ; // todo eventually change for inactive
+                    break ;

                 }
                 }

-                parent = parent->GetParent() ;
-            }
-            if ( !parent )
-            {
-              m_macBackgroundBrush.SetMacTheme( kThemeBrushDialogBackgroundActive ) ; // todo eventually change for inactive

             }
             }

+            parent = parent->GetParent() ;
+        }
+        if ( !parent )
+        {
+            m_macBackgroundBrush.SetMacTheme( kThemeBrushDialogBackgroundActive ) ; // todo eventually change for inactive
+        }

     }
     else
     {
     }
     else
     {


@@ -941,7 +1015,6 @@ const wxBrush& wxWindowMac::MacGetBackgroundBrush()
     }
 
     return m_macBackgroundBrush ;
     }
 
     return m_macBackgroundBrush ;

-  

 }
 
 void wxWindowMac::OnEraseBackground(wxEraseEvent& event)
 }
 
 void wxWindowMac::OnEraseBackground(wxEraseEvent& event)


@@ -953,7 +1026,7 @@ void wxWindowMac::OnNcPaint( wxNcPaintEvent& event )
 {
     wxWindowDC dc(this) ;
     wxMacPortSetter helper(&dc) ;
 {
     wxWindowDC dc(this) ;
     wxMacPortSetter helper(&dc) ;

-    
+

     MacPaintBorders( dc.m_macLocalOrigin.x , dc.m_macLocalOrigin.y) ;
 }
 
     MacPaintBorders( dc.m_macLocalOrigin.x , dc.m_macLocalOrigin.y) ;
 }
 


@@ -1018,28 +1091,43 @@ void wxWindowMac::SetScrollPos(int orient, int pos, bool refresh)
     }
 }
 
     }
 }
 

-void wxWindowMac::MacPaintBorders( int left , int top ) 
+void wxWindowMac::MacPaintBorders( int left , int top )

 {
     if( IsTopLevel() )
         return ;
         
 {
     if( IsTopLevel() )
         return ;
         

+    int major,minor;
+    wxGetOsVersion( &major, &minor );
+

     RGBColor white = { 0xFFFF, 0xFFFF , 0xFFFF } ;
     RGBColor white = { 0xFFFF, 0xFFFF , 0xFFFF } ;

-    RGBColor black = { 0x0000, 0x0000 , 0x0000 } ;

     RGBColor face = { 0xDDDD, 0xDDDD , 0xDDDD } ;
     RGBColor face = { 0xDDDD, 0xDDDD , 0xDDDD } ;

-    RGBColor shadow = { 0x4444, 0x4444 , 0x4444 } ;
+    
+    RGBColor darkShadow = { 0x0000, 0x0000 , 0x0000 } ;
+    RGBColor lightShadow = { 0x4444, 0x4444 , 0x4444 } ;
+    // OS X has lighter border edges than classic:
+    if (major >= 10) 
+    {
+        darkShadow.red                 = 0x8E8E;
+        darkShadow.green       = 0x8E8E;
+        darkShadow.blue        = 0x8E8E;
+        lightShadow.red        = 0xBDBD;
+        lightShadow.green      = 0xBDBD;
+        lightShadow.blue       = 0xBDBD;
+       }
+    

     PenNormal() ;
 
     if (HasFlag(wxRAISED_BORDER) || HasFlag( wxSUNKEN_BORDER) || HasFlag(wxDOUBLE_BORDER) )
     {
 #if wxMAC_USE_THEME_BORDER
     PenNormal() ;
 
     if (HasFlag(wxRAISED_BORDER) || HasFlag( wxSUNKEN_BORDER) || HasFlag(wxDOUBLE_BORDER) )
     {
 #if wxMAC_USE_THEME_BORDER

-          Rect rect = { top , left , m_height + top , m_width + left } ;
-          SInt32 border = 0 ;
-          /*
-          GetThemeMetric( kThemeMetricListBoxFrameOutset , &border ) ;
-          InsetRect( &rect , border , border );
-      DrawThemeListBoxFrame(&rect,IsEnabled() ? kThemeStateActive : kThemeStateInactive) ;
-      */
-        
+        Rect rect = { top , left , m_height + top , m_width + left } ;
+        SInt32 border = 0 ;
+        /*
+        GetThemeMetric( kThemeMetricListBoxFrameOutset , &border ) ;
+        InsetRect( &rect , border , border );
+        DrawThemeListBoxFrame(&rect,IsEnabled() ? kThemeStateActive : kThemeStateInactive) ;
+        */
+

         DrawThemePrimaryGroup(&rect  ,IsEnabled() ? kThemeStateActive : kThemeStateInactive) ;
 #else
         bool sunken = HasFlag( wxSUNKEN_BORDER ) ;
         DrawThemePrimaryGroup(&rect  ,IsEnabled() ? kThemeStateActive : kThemeStateInactive) ;
 #else
         bool sunken = HasFlag( wxSUNKEN_BORDER ) ;


@@ -1052,22 +1140,22 @@ void wxWindowMac::MacPaintBorders( int left , int top )
         LineTo( left + m_width - 3 , top + m_height - 3 );
         LineTo( left + m_width - 3 , top + 2 );
 
         LineTo( left + m_width - 3 , top + m_height - 3 );
         LineTo( left + m_width - 3 , top + 2 );
 

-        RGBForeColor( sunken ? &face : &black );
+        RGBForeColor( sunken ? &face : &darkShadow );

         MoveTo( left + 0 , top + m_height - 1 );
         LineTo( left + m_width - 1 , top + m_height - 1 );
         LineTo( left + m_width - 1 , top + 0 );
 
         MoveTo( left + 0 , top + m_height - 1 );
         LineTo( left + m_width - 1 , top + m_height - 1 );
         LineTo( left + m_width - 1 , top + 0 );
 

-        RGBForeColor( sunken ? &shadow : &white );
+        RGBForeColor( sunken ? &lightShadow : &white );

         MoveTo( left + 1 , top + m_height - 3 );
         LineTo( left + 1, top + 1 );
         LineTo( left + m_width - 3 , top + 1 );
 
         MoveTo( left + 1 , top + m_height - 3 );
         LineTo( left + 1, top + 1 );
         LineTo( left + m_width - 3 , top + 1 );
 

-        RGBForeColor( sunken ? &white : &shadow );
+        RGBForeColor( sunken ? &white : &lightShadow );

         MoveTo( left + 1 , top + m_height - 2 );
         LineTo( left + m_width - 2 , top + m_height - 2 );
         LineTo( left + m_width - 2 , top + 1 );
 
         MoveTo( left + 1 , top + m_height - 2 );
         LineTo( left + m_width - 2 , top + m_height - 2 );
         LineTo( left + m_width - 2 , top + 1 );
 

-        RGBForeColor( sunken ? &black : &face );
+        RGBForeColor( sunken ? &darkShadow : &face );

         MoveTo( left + 2 , top + m_height - 4 );
         LineTo( left + 2 , top + 2 );
         LineTo( left + m_width - 4 , top + 2 );
         MoveTo( left + 2 , top + m_height - 4 );
         LineTo( left + 2 , top + 2 );
         LineTo( left + m_width - 4 , top + 2 );


@@ -1075,8 +1163,8 @@ void wxWindowMac::MacPaintBorders( int left , int top )
     }
     else if (HasFlag(wxSIMPLE_BORDER))
     {
     }
     else if (HasFlag(wxSIMPLE_BORDER))
     {

-            Rect rect = { top , left , m_height + top , m_width + left } ;
-        RGBForeColor( &black ) ;
+        Rect rect = { top , left , m_height + top , m_width + left } ;
+        RGBForeColor( &darkShadow ) ;

         FrameRect( &rect ) ;
     }
 }
         FrameRect( &rect ) ;
     }
 }


@@ -1087,7 +1175,7 @@ void wxWindowMac::RemoveChild( wxWindowBase *child )
         m_hScrollBar = NULL ;
     if ( child == m_vScrollBar )
         m_vScrollBar = NULL ;
         m_hScrollBar = NULL ;
     if ( child == m_vScrollBar )
         m_vScrollBar = NULL ;

-      
+

     wxWindowBase::RemoveChild( child ) ;
 }
 
     wxWindowBase::RemoveChild( child ) ;
 }
 


@@ -1095,50 +1183,54 @@ void wxWindowMac::RemoveChild( wxWindowBase *child )
 void wxWindowMac::SetScrollbar(int orient, int pos, int thumbVisible,
     int range, bool refresh)
 {
 void wxWindowMac::SetScrollbar(int orient, int pos, int thumbVisible,
     int range, bool refresh)
 {

-        if ( orient == wxHORIZONTAL )
+    if ( orient == wxHORIZONTAL )
+    {
+        if ( m_hScrollBar )

         {
         {

-            if ( m_hScrollBar )
+            if ( range == 0 || thumbVisible >= range )

             {
             {

-                if ( range == 0 || thumbVisible >= range )
-                {
-                    if ( m_hScrollBar->IsShown() )
-                        m_hScrollBar->Show(false) ;
-                }
-                else
-                {
-                    if ( !m_hScrollBar->IsShown() )
-                        m_hScrollBar->Show(true) ;
-                    m_hScrollBar->SetScrollbar( pos , thumbVisible , range , thumbVisible , refresh ) ;
-                }
+                if ( m_hScrollBar->IsShown() )
+                    m_hScrollBar->Show(false) ;
+            }
+            else
+            {
+                if ( !m_hScrollBar->IsShown() )
+                    m_hScrollBar->Show(true) ;
+                m_hScrollBar->SetScrollbar( pos , thumbVisible , range , thumbVisible , refresh ) ;

             }
         }
             }
         }

-        else
+    }
+    else
+    {
+        if ( m_vScrollBar )

         {
         {

-            if ( m_vScrollBar )
+            if ( range == 0 || thumbVisible >= range )

             {
             {

-                if ( range == 0 || thumbVisible >= range )
-                {
-                    if ( m_vScrollBar->IsShown() )
-                        m_vScrollBar->Show(false) ;
-                }
-                else
-                {
-                    if ( !m_vScrollBar->IsShown() )
-                        m_vScrollBar->Show(true) ;
-                    m_vScrollBar->SetScrollbar( pos , thumbVisible , range , thumbVisible , refresh ) ;
-                }
+                if ( m_vScrollBar->IsShown() )
+                    m_vScrollBar->Show(false) ;
+            }
+            else
+            {
+                if ( !m_vScrollBar->IsShown() )
+                    m_vScrollBar->Show(true) ;
+                m_vScrollBar->SetScrollbar( pos , thumbVisible , range , thumbVisible , refresh ) ;

             }
         }
             }
         }

-        MacRepositionScrollBars() ;
+    }
+    MacRepositionScrollBars() ;

 }
 
 // Does a physical scroll
 void wxWindowMac::ScrollWindow(int dx, int dy, const wxRect *rect)
 {
 }
 
 // Does a physical scroll
 void wxWindowMac::ScrollWindow(int dx, int dy, const wxRect *rect)
 {

-    wxClientDC dc(this) ;
-    wxMacPortSetter helper(&dc) ;
+    if( dx == 0 && dy ==0 )
+        return ;
+        

 
     {
 
     {

+        wxClientDC dc(this) ;
+        wxMacPortSetter helper(&dc) ;
+

         int width , height ;
         GetClientSize( &width , &height ) ;
 
         int width , height ;
         GetClientSize( &width , &height ) ;
 


@@ -1147,28 +1239,59 @@ void wxWindowMac::ScrollWindow(int dx, int dy, const wxRect *rect)
         ClipRect( &scrollrect ) ;
         if ( rect )
         {
         ClipRect( &scrollrect ) ;
         if ( rect )
         {

-            Rect r = { dc.YLOG2DEVMAC(rect->y) , dc.XLOG2DEVMAC(rect->x) , dc.YLOG2DEVMAC(rect->y + rect->height) , 
-              dc.XLOG2DEVMAC(rect->x + rect->width) } ;
-            SectRect( &scrollrect , &r , &scrollrect ) ;        
+            Rect r = { dc.YLOG2DEVMAC(rect->y) , dc.XLOG2DEVMAC(rect->x) , dc.YLOG2DEVMAC(rect->y + rect->height) ,
+                dc.XLOG2DEVMAC(rect->x + rect->width) } ;
+            SectRect( &scrollrect , &r , &scrollrect ) ;

         }
         ScrollRect( &scrollrect , dx , dy , updateRgn ) ;
         }
         ScrollRect( &scrollrect , dx , dy , updateRgn ) ;

-        InvalWindowRgn( (WindowRef) MacGetRootWindow() ,  updateRgn ) ;
+        // we also have to scroll the update rgn in this rectangle 
+        // in order not to loose updates
+        WindowRef rootWindow = (WindowRef) MacGetRootWindow() ;
+        RgnHandle formerUpdateRgn = NewRgn() ;
+        RgnHandle scrollRgn = NewRgn() ;
+        RectRgn( scrollRgn , &scrollrect ) ;
+        GetWindowUpdateRgn( rootWindow , formerUpdateRgn ) ;
+        Point pt = {0,0} ;
+        LocalToGlobal( &pt ) ;
+        OffsetRgn( formerUpdateRgn , -pt.h , -pt.v ) ;
+        SectRgn( formerUpdateRgn , scrollRgn , formerUpdateRgn ) ;
+        if ( !EmptyRgn( formerUpdateRgn ) )
+        {
+            MacOffsetRgn( formerUpdateRgn , dx , dy ) ;
+            SectRgn( formerUpdateRgn , scrollRgn , formerUpdateRgn ) ;
+            InvalWindowRgn(rootWindow  ,  formerUpdateRgn ) ;
+        }
+        InvalWindowRgn(rootWindow  ,  updateRgn ) ;

         DisposeRgn( updateRgn ) ;
         DisposeRgn( updateRgn ) ;

+        DisposeRgn( formerUpdateRgn ) ;
+        DisposeRgn( scrollRgn ) ;

     }
     }

-    
-    for (wxNode *node = GetChildren().First(); node; node = node->Next())
+
+    for (wxWindowListNode *node = GetChildren().GetFirst(); node; node = node->GetNext())

     {
     {

-        wxWindowMac *child = (wxWindowMac*)node->Data();
+        wxWindowMac *child = node->GetData();

         if (child == m_vScrollBar) continue;
         if (child == m_hScrollBar) continue;
         if (child->IsTopLevel()) continue;
         if (child == m_vScrollBar) continue;
         if (child == m_hScrollBar) continue;
         if (child->IsTopLevel()) continue;

+

         int x,y;
         child->GetPosition( &x, &y );
         int w,h;
         child->GetSize( &w, &h );
         int x,y;
         child->GetPosition( &x, &y );
         int w,h;
         child->GetSize( &w, &h );

-        child->SetSize( x+dx, y+dy, w, h );
+        if (rect)
+        {
+            wxRect rc(x,y,w,h);
+            if (rect->Intersects(rc))
+                child->SetSize( x+dx, y+dy, w, h );
+        }
+        else
+        {
+            child->SetSize( x+dx, y+dy, w, h );                
+        }        

     }
     
     }
     

+    Update() ;
+

 }
 
 void wxWindowMac::MacOnScroll(wxScrollEvent &event )
 }
 
 void wxWindowMac::MacOnScroll(wxScrollEvent &event )


@@ -1179,29 +1302,24 @@ void wxWindowMac::MacOnScroll(wxScrollEvent &event )
         wevent.SetPosition(event.GetPosition());
         wevent.SetOrientation(event.GetOrientation());
         wevent.m_eventObject = this;
         wevent.SetPosition(event.GetPosition());
         wevent.SetOrientation(event.GetOrientation());
         wevent.m_eventObject = this;

-    
-        if (event.m_eventType == wxEVT_SCROLL_TOP) {
+
+        if (event.m_eventType == wxEVT_SCROLL_TOP)

             wevent.m_eventType = wxEVT_SCROLLWIN_TOP;
             wevent.m_eventType = wxEVT_SCROLLWIN_TOP;

-        } else
-        if (event.m_eventType == wxEVT_SCROLL_BOTTOM) {
+        else if (event.m_eventType == wxEVT_SCROLL_BOTTOM)

             wevent.m_eventType = wxEVT_SCROLLWIN_BOTTOM;
             wevent.m_eventType = wxEVT_SCROLLWIN_BOTTOM;

-        } else
-        if (event.m_eventType == wxEVT_SCROLL_LINEUP) {
+        else if (event.m_eventType == wxEVT_SCROLL_LINEUP)

             wevent.m_eventType = wxEVT_SCROLLWIN_LINEUP;
             wevent.m_eventType = wxEVT_SCROLLWIN_LINEUP;

-        } else
-        if (event.m_eventType == wxEVT_SCROLL_LINEDOWN) {
+        else if (event.m_eventType == wxEVT_SCROLL_LINEDOWN)

             wevent.m_eventType = wxEVT_SCROLLWIN_LINEDOWN;
             wevent.m_eventType = wxEVT_SCROLLWIN_LINEDOWN;

-        } else
-        if (event.m_eventType == wxEVT_SCROLL_PAGEUP) {
+        else if (event.m_eventType == wxEVT_SCROLL_PAGEUP)

             wevent.m_eventType = wxEVT_SCROLLWIN_PAGEUP;
             wevent.m_eventType = wxEVT_SCROLLWIN_PAGEUP;

-        } else
-        if (event.m_eventType == wxEVT_SCROLL_PAGEDOWN) {
+        else if (event.m_eventType == wxEVT_SCROLL_PAGEDOWN)

             wevent.m_eventType = wxEVT_SCROLLWIN_PAGEDOWN;
             wevent.m_eventType = wxEVT_SCROLLWIN_PAGEDOWN;

-        } else
-        if (event.m_eventType == wxEVT_SCROLL_THUMBTRACK) {
+        else if (event.m_eventType == wxEVT_SCROLL_THUMBTRACK)

             wevent.m_eventType = wxEVT_SCROLLWIN_THUMBTRACK;
             wevent.m_eventType = wxEVT_SCROLLWIN_THUMBTRACK;

-        }
-        
+        else if (event.m_eventType == wxEVT_SCROLL_THUMBRELEASE)
+            wevent.m_eventType = wxEVT_SCROLLWIN_THUMBRELEASE;
+

         GetEventHandler()->ProcessEvent(wevent);
     }
 }
         GetEventHandler()->ProcessEvent(wevent);
     }
 }


@@ -1212,37 +1330,6 @@ wxWindowMac *wxWindowBase::FindFocus()
     return gFocusWindow ;
 }
 
     return gFocusWindow ;
 }
 

-#if WXWIN_COMPATIBILITY
-// 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 wxWindowMac::OnCommand(wxWindowMac& win, wxCommandEvent& event)
-{
-    if ( GetEventHandler()->ProcessEvent(event)  )
-        return;
-    if ( m_parent )
-        m_parent->GetEventHandler()->OnCommand(win, event);
-}
-#endif // WXWIN_COMPATIBILITY_2
-
-#if WXWIN_COMPATIBILITY
-wxObject* wxWindowMac::GetChild(int number) const
-{
-    // Return a pointer to the Nth object in the Panel
-    wxNode *node = GetChildren().First();
-    int n = number;
-    while (node && n--)
-        node = node->Next();
-    if ( node )
-    {
-        wxObject *obj = (wxObject *)node->Data();
-        return(obj);
-    }
-    else
-        return NULL;
-}
-#endif // WXWIN_COMPATIBILITY
-

 void wxWindowMac::OnSetFocus(wxFocusEvent& event)
 {
     // panel wants to track the window which was the last to have focus in it,
 void wxWindowMac::OnSetFocus(wxFocusEvent& event)
 {
     // panel wants to track the window which was the last to have focus in it,


@@ -1251,7 +1338,7 @@ void wxWindowMac::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
     // 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

-    
+

     // CS:don't know if this is still needed:
     //wxChildFocusEvent eventFocus(this);
     //(void)GetEventHandler()->ProcessEvent(eventFocus);
     // CS:don't know if this is still needed:
     //wxChildFocusEvent eventFocus(this);
     //(void)GetEventHandler()->ProcessEvent(eventFocus);


@@ -1259,14 +1346,6 @@ void wxWindowMac::OnSetFocus(wxFocusEvent& event)
     event.Skip();
 }
 
     event.Skip();
 }
 

-void wxWindowMac::Clear()
-{
-    wxClientDC dc(this);
-    wxBrush brush(GetBackgroundColour(), wxSOLID);
-    dc.SetBackground(brush);
-    dc.Clear();
-}
-

 // Setup background and foreground colours correctly
 void wxWindowMac::SetupColours()
 {
 // Setup background and foreground colours correctly
 void wxWindowMac::SetupColours()
 {


@@ -1274,26 +1353,12 @@ void wxWindowMac::SetupColours()
         SetBackgroundColour(GetParent()->GetBackgroundColour());
 }
 
         SetBackgroundColour(GetParent()->GetBackgroundColour());
 }
 

-void wxWindowMac::OnIdle(wxIdleEvent& event)
+void wxWindowMac::OnInternalIdle()

 {
 {

-/*
-   // Check if we need to send a LEAVE event
-   if (m_mouseInWindow)
-   {
-       POINT pt;
-       ::GetCursorPos(&pt);
-       if (::WindowFromPoint(pt) != (HWND) GetHWND())
-       {
-           // Generate a LEAVE event
-           m_mouseInWindow = FALSE;
-           MSWOnMouseLeave(pt.x, pt.y, 0);
-       }
-    }
-*/
-

     // This calls the UI-update mechanism (querying windows for
     // menu/toolbar/control state information)
     // This calls the UI-update mechanism (querying windows for
     // menu/toolbar/control state information)

-    UpdateWindowUI();
+    if (wxUpdateUIEvent::CanUpdate(this))
+        UpdateWindowUI(wxUPDATE_UI_FROMIDLE);

 }
 
 // Raise the window to the top of the Z order
 }
 
 // Raise the window to the top of the Z order


@@ -1310,7 +1375,7 @@ void wxWindowMac::DoSetClientSize(int width, int height)
 {
     if ( width != -1 || height != -1 )
     {
 {
     if ( width != -1 || height != -1 )
     {

-        
+

         if ( width != -1 && m_vScrollBar )
             width += MAC_SCROLLBAR_SIZE ;
         if ( height != -1 && m_vScrollBar )
         if ( width != -1 && m_vScrollBar )
             width += MAC_SCROLLBAR_SIZE ;
         if ( height != -1 && m_vScrollBar )


@@ -1326,34 +1391,34 @@ void wxWindowMac::DoSetClientSize(int width, int height)
 
 wxWindowMac* wxWindowMac::s_lastMouseWindow = NULL ;
 
 
 wxWindowMac* wxWindowMac::s_lastMouseWindow = NULL ;
 

-bool wxWindowMac::MacGetWindowFromPointSub( const wxPoint &point , wxWindowMac** outWin ) 
+bool wxWindowMac::MacGetWindowFromPointSub( const wxPoint &point , wxWindowMac** outWin )

 {
     if ( IsTopLevel() )
     {
 {
     if ( IsTopLevel() )
     {

-      if ((point.x < 0) || (point.y < 0) ||
-          (point.x > (m_width)) || (point.y > (m_height)))
-          return FALSE;
+        if ((point.x < 0) || (point.y < 0) ||
+            (point.x > (m_width)) || (point.y > (m_height)))
+            return FALSE;

     }
     else
     {
     }
     else
     {

-      if ((point.x < m_x) || (point.y < m_y) ||
-          (point.x > (m_x + m_width)) || (point.y > (m_y + m_height)))
-          return FALSE;
+        if ((point.x < m_x) || (point.y < m_y) ||
+            (point.x > (m_x + m_width)) || (point.y > (m_y + m_height)))
+            return FALSE;

     }
     }

-    
+

     WindowRef window = (WindowRef) MacGetRootWindow() ;
 
     wxPoint newPoint( point ) ;
 
     if ( !IsTopLevel() )
     {
     WindowRef window = (WindowRef) MacGetRootWindow() ;
 
     wxPoint newPoint( point ) ;
 
     if ( !IsTopLevel() )
     {

-      newPoint.x -= m_x;
-      newPoint.y -= m_y;
+        newPoint.x -= m_x;
+        newPoint.y -= m_y;

     }
     }

-    
-    for (wxNode *node = GetChildren().First(); node; node = node->Next())
+
+    for (wxWindowListNode *node = GetChildren().GetFirst(); node; node = node->GetNext())

     {
     {

-        wxWindowMac *child = (wxWindowMac*)node->Data();
+        wxWindowMac *child = node->GetData();

         // added the m_isShown test --dmazzoni
         if ( child->MacGetRootWindow() == window && child->m_isShown )
         {
         // added the m_isShown test --dmazzoni
         if ( child->MacGetRootWindow() == window && child->m_isShown )
         {


@@ -1366,58 +1431,99 @@ bool wxWindowMac::MacGetWindowFromPointSub( const wxPoint &point , wxWindowMac**
     return TRUE;
 }
 
     return TRUE;
 }
 

-bool wxWindowMac::MacGetWindowFromPoint( const wxPoint &screenpoint , wxWindowMac** outWin ) 
+bool wxWindowMac::MacGetWindowFromPoint( const wxPoint &screenpoint , wxWindowMac** outWin )

 {
     WindowRef window ;
 {
     WindowRef window ;

-    
+

     Point pt = { screenpoint.y , screenpoint.x } ;
     if ( ::FindWindow( pt , &window ) == 3 )
     {
     Point pt = { screenpoint.y , screenpoint.x } ;
     if ( ::FindWindow( pt , &window ) == 3 )
     {

-        
+

         wxWindowMac* win = wxFindWinFromMacWindow( window ) ;
         if ( win )
         {
             // No, this yields the CLIENT are, we need the whole frame. RR.
             // point = win->ScreenToClient( point ) ;
         wxWindowMac* win = wxFindWinFromMacWindow( window ) ;
         if ( win )
         {
             // No, this yields the CLIENT are, we need the whole frame. RR.
             // point = win->ScreenToClient( point ) ;

-            
-            GrafPtr     port;  
+
+            GrafPtr     port;

             ::GetPort( &port ) ;
             ::SetPort( UMAGetWindowPort( window ) ) ;
             ::GlobalToLocal( &pt ) ;
             ::SetPort( port ) ;
 
             wxPoint point( pt.h, pt.v ) ;
             ::GetPort( &port ) ;
             ::SetPort( UMAGetWindowPort( window ) ) ;
             ::GlobalToLocal( &pt ) ;
             ::SetPort( port ) ;
 
             wxPoint point( pt.h, pt.v ) ;

-            
+

             return win->MacGetWindowFromPointSub( point , outWin ) ;
         }
     }
     return FALSE ;
 }
 
             return win->MacGetWindowFromPointSub( point , outWin ) ;
         }
     }
     return FALSE ;
 }
 

-extern int wxBusyCursorCount ;

 static wxWindow *gs_lastWhich = NULL;
 
 static wxWindow *gs_lastWhich = NULL;
 

-bool wxWindowMac::MacDispatchMouseEvent(wxMouseEvent& event)
+bool wxWindowMac::MacSetupCursor( const wxPoint& pt)

 {
 {

+    // first trigger a set cursor event
+
+    wxPoint clientorigin = GetClientAreaOrigin() ;
+    wxSize clientsize = GetClientSize() ;
+    wxCursor cursor ;
+    if ( wxRect2DInt( clientorigin.x , clientorigin.y , clientsize.x , clientsize.y ).Contains( wxPoint2DInt( pt ) ) )
+    {
+        wxSetCursorEvent event( pt.x , pt.y );
+
+        bool processedEvtSetCursor = GetEventHandler()->ProcessEvent(event);
+        if ( processedEvtSetCursor && event.HasCursor() )
+        {
+            cursor = event.GetCursor() ;
+        }
+        else
+        {
+
+            // the test for processedEvtSetCursor is here to prevent using m_cursor
+            // if the user code caught EVT_SET_CURSOR() and returned nothing from
+            // it - this is a way to say that our cursor shouldn't be used for this
+            // point
+            if ( !processedEvtSetCursor && m_cursor.Ok() )
+            {
+                cursor = m_cursor ;
+            }
+            if ( wxIsBusy() )
+            {
+            }
+            else
+            {
+                if ( !GetParent() )
+                    cursor = *wxSTANDARD_CURSOR  ;
+            }
+        }
+        if ( cursor.Ok() )
+            cursor.MacInstall() ;
+    }
+    return cursor.Ok() ;
+}
+
+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)))
         return FALSE;
     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)))
         return FALSE;

-    

 
 

-    if ( IsKindOf( CLASSINFO ( wxStaticBox ) ) || IsKindOf( CLASSINFO( wxSpinCtrl ) ))
-        return FALSE ; 
-    
+
+    if ( IsKindOf( CLASSINFO ( wxStaticBox ) ) /* || IsKindOf( CLASSINFO( wxSpinCtrl ) ) */)
+        return FALSE ;
+

     WindowRef window = (WindowRef) MacGetRootWindow() ;
 
     event.m_x -= m_x;
     event.m_y -= m_y;
     WindowRef window = (WindowRef) MacGetRootWindow() ;
 
     event.m_x -= m_x;
     event.m_y -= m_y;

-    
+

     int x = event.m_x ;
     int y = event.m_y ;
 
     int x = event.m_x ;
     int y = event.m_y ;
 

-    for (wxNode *node = GetChildren().First(); node; node = node->Next())
+    for (wxWindowListNode *node = GetChildren().GetFirst(); node; node = node->GetNext())

     {
     {

-        wxWindowMac *child = (wxWindowMac*)node->Data();
+        wxWindowMac *child = node->GetData();

         if ( child->MacGetRootWindow() == window && child->IsShown() && child->IsEnabled() )
         {
             if (child->MacDispatchMouseEvent(event))
         if ( child->MacGetRootWindow() == window && child->IsShown() && child->IsEnabled() )
         {
             if (child->MacDispatchMouseEvent(event))


@@ -1425,39 +1531,43 @@ bool wxWindowMac::MacDispatchMouseEvent(wxMouseEvent& event)
         }
     }
 
         }
     }
 

+    wxWindow* cursorTarget = this ;
+    wxPoint cursorPoint( x , y ) ;
+
+    while( cursorTarget && !cursorTarget->MacSetupCursor( cursorPoint ) )
+    {
+        cursorTarget = cursorTarget->GetParent() ;
+        if ( cursorTarget )
+            cursorPoint += cursorTarget->GetPosition() ;
+    }

     event.m_x = x ;
     event.m_y = y ;
     event.SetEventObject( this ) ;
     event.m_x = x ;
     event.m_y = y ;
     event.SetEventObject( this ) ;

-    
-    if ( wxBusyCursorCount == 0 )
-    {
-        m_cursor.MacInstall() ;
-    }
-    
+

     if ( event.GetEventType() == wxEVT_LEFT_DOWN )
     {
         // set focus to this window
         if (AcceptsFocus() && FindFocus()!=this)
             SetFocus();
     }
     if ( event.GetEventType() == wxEVT_LEFT_DOWN )
     {
         // set focus to this window
         if (AcceptsFocus() && FindFocus()!=this)
             SetFocus();
     }

-    
+

 #if wxUSE_TOOLTIPS
 #if wxUSE_TOOLTIPS

-    if ( event.GetEventType() == wxEVT_MOTION 
-            || event.GetEventType() == wxEVT_ENTER_WINDOW
-            || event.GetEventType() == wxEVT_LEAVE_WINDOW )
+    if ( event.GetEventType() == wxEVT_MOTION
+        || event.GetEventType() == wxEVT_ENTER_WINDOW
+        || event.GetEventType() == wxEVT_LEAVE_WINDOW )

         wxToolTip::RelayEvent( this , event);
 #endif // wxUSE_TOOLTIPS
 
     if (gs_lastWhich != this)
     {
         gs_lastWhich = this;
         wxToolTip::RelayEvent( this , event);
 #endif // wxUSE_TOOLTIPS
 
     if (gs_lastWhich != this)
     {
         gs_lastWhich = this;

-        
+

         // Double clicks must always occur on the same window
         if (event.GetEventType() == wxEVT_LEFT_DCLICK)
             event.SetEventType( wxEVT_LEFT_DOWN );
         if (event.GetEventType() == wxEVT_RIGHT_DCLICK)
             event.SetEventType( wxEVT_RIGHT_DOWN );
         // Double clicks must always occur on the same window
         if (event.GetEventType() == wxEVT_LEFT_DCLICK)
             event.SetEventType( wxEVT_LEFT_DOWN );
         if (event.GetEventType() == wxEVT_RIGHT_DCLICK)
             event.SetEventType( wxEVT_RIGHT_DOWN );

-            
+

         // Same for mouse up events
         if (event.GetEventType() == wxEVT_LEFT_UP)
             return TRUE;
         // Same for mouse up events
         if (event.GetEventType() == wxEVT_LEFT_UP)
             return TRUE;


@@ -1476,110 +1586,162 @@ wxString wxWindowMac::MacGetToolTipString( wxPoint &pt )
     {
         return m_tooltip->GetTip() ;
     }
     {
         return m_tooltip->GetTip() ;
     }

-    return "" ;
+    return wxEmptyString ;

 }
 
 void wxWindowMac::Update()
 {
 }
 
 void wxWindowMac::Update()
 {

-    wxTopLevelWindowMac* win = MacGetTopLevelWindow(  ) ;
-    if ( win )
-    {
-      win->MacUpdate( 0 ) ;
+    wxRegion visRgn = MacGetVisibleRegion( false ) ;
+    int top = 0 , left = 0 ;
+    MacWindowToRootWindow( &left , &top ) ;
+    WindowRef rootWindow = (WindowRef) MacGetRootWindow() ;
+    RgnHandle updateRgn = NewRgn() ;    
+    // getting the update region in macos local coordinates
+    GetWindowUpdateRgn( rootWindow , updateRgn ) ;
+    GrafPtr     port ;
+    ::GetPort( &port ) ;
+    ::SetPort( UMAGetWindowPort( rootWindow ) ) ;
+    Point pt = {0,0} ;
+    LocalToGlobal( &pt ) ;
+    ::SetPort( port ) ;
+    OffsetRgn( updateRgn , -pt.h , -pt.v ) ;
+    // translate to window local coordinates
+    OffsetRgn( updateRgn , -left , -top ) ;
+    SectRgn( updateRgn , (RgnHandle) visRgn.GetWXHRGN() , updateRgn ) ;
+    MacRedraw( updateRgn , 0 , true ) ;
+    // for flushing and validating we need macos-local coordinates again
+    OffsetRgn( updateRgn , left , top ) ;

 #if TARGET_API_MAC_CARBON
 #if TARGET_API_MAC_CARBON

-        if ( QDIsPortBuffered( GetWindowPort( (WindowRef) win->MacGetWindowRef() ) ) )
-        {
-                QDFlushPortBuffer( GetWindowPort( (WindowRef) win->MacGetWindowRef() ) , NULL ) ;
-        }
+    if ( QDIsPortBuffered( GetWindowPort( rootWindow ) ) )
+    {
+        QDFlushPortBuffer( GetWindowPort( rootWindow ) , updateRgn ) ;
+    }

 #endif
 #endif

-      }
+    ValidWindowRgn( rootWindow , updateRgn ) ;
+    DisposeRgn( updateRgn ) ;

 }
 
 }
 

-wxTopLevelWindowMac* wxWindowMac::MacGetTopLevelWindow() const 
+wxTopLevelWindowMac* wxWindowMac::MacGetTopLevelWindow() const

 {
     wxTopLevelWindowMac* win = NULL ;
     WindowRef window = (WindowRef) MacGetRootWindow() ;
     if ( window )
     {
         win = wxFindWinFromMacWindow( window ) ;
 {
     wxTopLevelWindowMac* win = NULL ;
     WindowRef window = (WindowRef) MacGetRootWindow() ;
     if ( window )
     {
         win = wxFindWinFromMacWindow( window ) ;

-    }  
+    }

     return win ;
 }
 
     return win ;
 }
 

-const wxRegion& wxWindowMac::MacGetVisibleRegion()
+const wxRegion& wxWindowMac::MacGetVisibleRegion( bool respectChildrenAndSiblings )

 {
 {

-  RgnHandle visRgn = NewRgn() ;
-  RgnHandle tempRgn = NewRgn() ;
-  
-  SetRectRgn( visRgn , 0 , 0 , m_width , m_height ) ;
+    RgnHandle visRgn = NewRgn() ;
+    RgnHandle tempRgn = NewRgn() ;
+    RgnHandle tempStaticBoxRgn = NewRgn() ;

 
 

-  //TODO : as soon as the new scheme has proven to work correctly, move this to wxStaticBox
-  if ( IsKindOf( CLASSINFO( wxStaticBox ) ) )
-  {
-    int borderTop = 14 ;
-    int borderOther = 4 ;
-    
-    SetRectRgn( tempRgn , borderOther , borderTop , m_width - borderOther , m_height - borderOther ) ;
-    DiffRgn( visRgn , tempRgn , visRgn ) ;
-  }
-
-  if ( !IsTopLevel() )
-  {
-    wxWindow* parent = GetParent() ;
-    while( parent )
-    {
-      wxSize size = parent->GetSize() ;
-      int x , y ;
-      x = y = 0 ;
-      parent->MacWindowToRootWindow( &x, &y ) ;
-      MacRootWindowToWindow( &x , &y ) ;
-      SetRectRgn( tempRgn , x , y , x + size.x , y + size.y ) ;
-      SectRgn( visRgn , tempRgn , visRgn ) ;
-      if ( parent->IsTopLevel() )
-        break ;
-      parent = parent->GetParent() ;
-    }
-  }
-  if ( GetWindowStyle() & wxCLIP_CHILDREN )
-  {
-    for (wxNode *node = GetChildren().First(); node; node = node->Next())
-    {
-        wxWindowMac *child = (wxWindowMac*)node->Data();
-
-        if ( !child->IsTopLevel() && child->IsShown() )
+    if ( MacIsReallyShown() )
+    {
+        SetRectRgn( visRgn , 0 , 0 , m_width , m_height ) ;
+
+        //TODO : as soon as the new scheme has proven to work correctly, move this to wxStaticBox
+        if ( IsKindOf( CLASSINFO( wxStaticBox ) ) )

         {
         {

-            SetRectRgn( tempRgn , child->m_x , child->m_y , child->m_x + child->m_width ,  child->m_y + child->m_height ) ;
-            DiffRgn( visRgn , tempRgn , visRgn ) ;
+            int borderTop = 14 ;
+            int borderOther = 4 ;
+            if ( UMAGetSystemVersion() >= 0x1030 )
+                borderTop += 2 ;
+
+            SetRectRgn( tempStaticBoxRgn , borderOther , borderTop , m_width - borderOther , m_height - borderOther ) ;
+            DiffRgn( visRgn , tempStaticBoxRgn , visRgn ) ;

         }
         }

-    }       
-  }
-  
-  if ( (GetWindowStyle() & wxCLIP_SIBLINGS) && GetParent() )
-  {
-    bool thisWindowThrough = false ;
-    for (wxNode *node = GetParent()->GetChildren().First(); node; node = node->Next())
-    {
-        wxWindowMac *sibling = (wxWindowMac*)node->Data();
-        if ( sibling == this )
+
+        if ( !IsTopLevel() )

         {
         {

-          thisWindowThrough = true ;
-          continue ;
+            wxWindow* parent = GetParent() ;
+            while( parent )
+            {
+                wxSize size = parent->GetSize() ;
+                int x , y ;
+                x = y = 0 ;
+                parent->MacWindowToRootWindow( &x, &y ) ;
+                MacRootWindowToWindow( &x , &y ) ;
+
+                SetRectRgn( tempRgn ,
+                    x + parent->MacGetLeftBorderSize() , y + parent->MacGetTopBorderSize() ,
+                    x + size.x - parent->MacGetRightBorderSize(),
+                    y + size.y - parent->MacGetBottomBorderSize()) ;
+
+                SectRgn( visRgn , tempRgn , visRgn ) ;
+                if ( parent->IsTopLevel() )
+                    break ;
+                parent = parent->GetParent() ;
+            }

         }
         }

-        if( !thisWindowThrough )
+        if ( respectChildrenAndSiblings )

         {
         {

-          continue ;
-        }
+            if ( GetWindowStyle() & wxCLIP_CHILDREN )
+            {
+                for (wxWindowListNode *node = GetChildren().GetFirst(); node; node = node->GetNext())
+                {
+                    wxWindowMac *child = node->GetData();

 
 

-        if ( !sibling->IsTopLevel() && sibling->IsShown() )
-        {
-            SetRectRgn( tempRgn , sibling->m_x - m_x , sibling->m_y - m_y , sibling->m_x + sibling->m_width - m_x ,  sibling->m_y + sibling->m_height - m_y ) ;
-            DiffRgn( visRgn , tempRgn , visRgn ) ;
+                    if ( !child->IsTopLevel() && child->IsShown() )
+                    {
+                        SetRectRgn( tempRgn , child->m_x , child->m_y , child->m_x + child->m_width ,  child->m_y + child->m_height ) ;
+                        if ( child->IsKindOf( CLASSINFO( wxStaticBox ) ) )
+                        {
+                            int borderTop = 14 ;
+                            int borderOther = 4 ;
+                            if ( UMAGetSystemVersion() >= 0x1030 )
+                                borderTop += 2 ;
+                            
+                            SetRectRgn( tempStaticBoxRgn , child->m_x + borderOther , child->m_y + borderTop , child->m_x + child->m_width - borderOther , child->m_y + child->m_height - borderOther ) ;
+                            DiffRgn( tempRgn , tempStaticBoxRgn , tempRgn ) ;
+                        }
+                        DiffRgn( visRgn , tempRgn , visRgn ) ;
+                    }
+                }
+            }
+
+            if ( (GetWindowStyle() & wxCLIP_SIBLINGS) && GetParent() )
+            {
+                bool thisWindowThrough = false ;
+                for (wxWindowListNode *node = GetParent()->GetChildren().GetFirst(); node; node = node->GetNext())
+                {
+                    wxWindowMac *sibling = node->GetData();
+                    if ( sibling == this )
+                    {
+                        thisWindowThrough = true ;
+                        continue ;
+                    }
+                    if( !thisWindowThrough )
+                    {
+                        continue ;
+                    }
+
+                    if ( !sibling->IsTopLevel() && sibling->IsShown() )
+                    {
+                        SetRectRgn( tempRgn , sibling->m_x - m_x , sibling->m_y - m_y , sibling->m_x + sibling->m_width - m_x ,  sibling->m_y + sibling->m_height - m_y ) ;
+                        if ( sibling->IsKindOf( CLASSINFO( wxStaticBox ) ) )
+                        {
+                            int borderTop = 14 ;
+                            int borderOther = 4 ;
+                            if ( UMAGetSystemVersion() >= 0x1030 )
+                                borderTop += 2 ;
+
+                            SetRectRgn( tempStaticBoxRgn , sibling->m_x - m_x + borderOther , sibling->m_y - m_y + borderTop , sibling->m_x + sibling->m_width - m_x - borderOther , sibling->m_y + sibling->m_height - m_y - borderOther ) ;
+                            DiffRgn( tempRgn , tempStaticBoxRgn , tempRgn ) ;
+                        }
+                        DiffRgn( visRgn , tempRgn , visRgn ) ;
+                    }
+                }
+            }

         }
         }

-    }  
-  }
-  m_macVisibleRegion = visRgn ;
-  DisposeRgn( visRgn ) ;
-  DisposeRgn( tempRgn ) ;
-  return m_macVisibleRegion ;
+    }
+    m_macVisibleRegion = visRgn ;
+    DisposeRgn( visRgn ) ;
+    DisposeRgn( tempRgn ) ;
+    DisposeRgn( tempStaticBoxRgn ) ;
+    return m_macVisibleRegion ;

 }
 
 void wxWindowMac::MacRedraw( WXHRGN updatergnr , long time, bool erase)
 }
 
 void wxWindowMac::MacRedraw( WXHRGN updatergnr , long time, bool erase)


@@ -1587,16 +1749,16 @@ void wxWindowMac::MacRedraw( WXHRGN updatergnr , long time, bool erase)
     RgnHandle updatergn = (RgnHandle) updatergnr ;
     // updatergn is always already clipped to our boundaries
     // it is in window coordinates, not in client coordinates
     RgnHandle updatergn = (RgnHandle) updatergnr ;
     // updatergn is always already clipped to our boundaries
     // it is in window coordinates, not in client coordinates

-    
+

     WindowRef window = (WindowRef) MacGetRootWindow() ;
 
     {
         // ownUpdateRgn is the area that this window has to repaint, it is in window coordinates
         RgnHandle ownUpdateRgn = NewRgn() ;
         CopyRgn( updatergn , ownUpdateRgn ) ;
     WindowRef window = (WindowRef) MacGetRootWindow() ;
 
     {
         // ownUpdateRgn is the area that this window has to repaint, it is in window coordinates
         RgnHandle ownUpdateRgn = NewRgn() ;
         CopyRgn( updatergn , ownUpdateRgn ) ;

-                
+

         SectRgn( ownUpdateRgn , (RgnHandle) MacGetVisibleRegion().GetWXHRGN() , ownUpdateRgn ) ;
         SectRgn( ownUpdateRgn , (RgnHandle) MacGetVisibleRegion().GetWXHRGN() , ownUpdateRgn ) ;

-        
+

         // newupdate is the update region in client coordinates
         RgnHandle newupdate = NewRgn() ;
         wxSize point = GetClientSize() ;
         // newupdate is the update region in client coordinates
         RgnHandle newupdate = NewRgn() ;
         wxSize point = GetClientSize() ;


@@ -1606,37 +1768,60 @@ void wxWindowMac::MacRedraw( WXHRGN updatergnr , long time, bool erase)
         OffsetRgn( newupdate , -origin.x , -origin.y ) ;
         m_updateRegion = newupdate ;
         DisposeRgn( newupdate ) ; // it's been cloned to m_updateRegion
         OffsetRgn( newupdate , -origin.x , -origin.y ) ;
         m_updateRegion = newupdate ;
         DisposeRgn( newupdate ) ; // it's been cloned to m_updateRegion

-        
+

         if ( erase && !EmptyRgn(ownUpdateRgn) )
         if ( erase && !EmptyRgn(ownUpdateRgn) )

-        { 
-          wxWindowDC dc(this);
-          dc.SetClippingRegion(wxRegion(ownUpdateRgn));
-          wxEraseEvent eevent( GetId(), &dc );
-          eevent.SetEventObject( this );
-          GetEventHandler()->ProcessEvent( eevent );
-
-          wxNcPaintEvent eventNc( GetId() );
-          eventNc.SetEventObject( this );
-          GetEventHandler()->ProcessEvent( eventNc );
+        {
+            wxWindowDC dc(this);
+            if (!EmptyRgn(ownUpdateRgn))
+                dc.SetClippingRegion(wxRegion(ownUpdateRgn));
+            wxEraseEvent eevent( GetId(), &dc );
+            eevent.SetEventObject( this );
+            GetEventHandler()->ProcessEvent( eevent );
+
+            wxNcPaintEvent eventNc( GetId() );
+            eventNc.SetEventObject( this );
+            GetEventHandler()->ProcessEvent( eventNc );

         }
         }

-        DisposeRgn( ownUpdateRgn ) ; 
+        DisposeRgn( ownUpdateRgn ) ;

         if ( !m_updateRegion.Empty() )
         {
         if ( !m_updateRegion.Empty() )
         {

-          wxPaintEvent event;
-          event.m_timeStamp = time ;
-          event.SetEventObject(this);
-          GetEventHandler()->ProcessEvent(event); 
-        }       
+            wxWindowList hiddenWindows ;
+            for (wxWindowListNode *node = GetChildren().GetFirst(); node; node = node->GetNext())
+            {
+                wxControl *child = wxDynamicCast( ( wxWindow*)node->GetData() , wxControl ) ;
+
+                if ( child && child->MacGetRootWindow() == window && child->IsShown() && child->GetMacControl() )
+                {
+                    SetControlVisibility( (ControlHandle) child->GetMacControl() , false , false ) ;
+                    hiddenWindows.Append( child ) ;
+                }
+            }
+            
+            wxPaintEvent event;
+            event.m_timeStamp = time ;
+            event.SetEventObject(this);
+            GetEventHandler()->ProcessEvent(event);
+ 
+            for (wxWindowListNode *node = hiddenWindows.GetFirst(); node; node = node->GetNext())
+            {
+                wxControl *child = wxDynamicCast( ( wxWindow*)node->GetData() , wxControl ) ;
+
+                if ( child && child->GetMacControl() )
+                {
+                    SetControlVisibility( (ControlHandle) child->GetMacControl() , true , false ) ;
+                }
+            }
+        }

     }
     }

-    
+

     // now intersect for each of the children their rect with the updateRgn and call MacRedraw recursively
     // now intersect for each of the children their rect with the updateRgn and call MacRedraw recursively

-    
-    RgnHandle childupdate = NewRgn() ;            
-    for (wxNode *node = GetChildren().First(); node; node = node->Next())
+
+    RgnHandle childupdate = NewRgn() ;
+    for (wxWindowListNode *node = GetChildren().GetFirst(); node; node = node->GetNext())

     {
         // calculate the update region for the child windows by intersecting the window rectangle with our own
         // passed in update region and then offset it to be client-wise window coordinates again
     {
         // calculate the update region for the child windows by intersecting the window rectangle with our own
         // passed in update region and then offset it to be client-wise window coordinates again

-        wxWindowMac *child = (wxWindowMac*)node->Data();
+        wxWindowMac *child = node->GetData();

         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 ) ;
         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 ) ;


@@ -1648,50 +1833,50 @@ void wxWindowMac::MacRedraw( WXHRGN updatergnr , long time, bool erase)
     }
     DisposeRgn( childupdate ) ;
     // eventually a draw grow box here
     }
     DisposeRgn( childupdate ) ;
     // eventually a draw grow box here

- 
+

 }
 
 WXHWND wxWindowMac::MacGetRootWindow() const
 {
     wxWindowMac *iter = (wxWindowMac*)this ;
 }
 
 WXHWND wxWindowMac::MacGetRootWindow() const
 {
     wxWindowMac *iter = (wxWindowMac*)this ;

-    
+

     while( iter )
     {
         if ( iter->IsTopLevel() )
             return ((wxTopLevelWindow*)iter)->MacGetWindowRef() ;
 
         iter = iter->GetParent() ;
     while( iter )
     {
         if ( iter->IsTopLevel() )
             return ((wxTopLevelWindow*)iter)->MacGetWindowRef() ;
 
         iter = iter->GetParent() ;

-    } 
-    wxASSERT_MSG( 1 , "No valid mac root window" ) ;
+    }
+    wxASSERT_MSG( 1 , wxT("No valid mac root window") ) ;

     return NULL ;
 }
 
     return NULL ;
 }
 

-void wxWindowMac::MacCreateScrollBars( long style ) 
+void wxWindowMac::MacCreateScrollBars( long style )

 {
 {

-    wxASSERT_MSG( m_vScrollBar == NULL && m_hScrollBar == NULL , "attempt to create window twice" ) ;
-    
+    wxASSERT_MSG( m_vScrollBar == NULL && m_hScrollBar == NULL , wxT("attempt to create window twice") ) ;
+

     bool hasBoth = ( style & wxVSCROLL ) && ( style & wxHSCROLL ) ;
     int adjust = hasBoth ? MAC_SCROLLBAR_SIZE - 1: 0 ;
     int width, height ;
     GetClientSize( &width , &height ) ;
     bool hasBoth = ( style & wxVSCROLL ) && ( style & wxHSCROLL ) ;
     int adjust = hasBoth ? MAC_SCROLLBAR_SIZE - 1: 0 ;
     int width, height ;
     GetClientSize( &width , &height ) ;

-    
+

     wxPoint vPoint(width-MAC_SCROLLBAR_SIZE, 0) ;
     wxSize vSize(MAC_SCROLLBAR_SIZE, height - adjust) ;
     wxPoint hPoint(0 , height-MAC_SCROLLBAR_SIZE ) ;
     wxSize hSize( width - adjust, MAC_SCROLLBAR_SIZE) ;
     wxPoint vPoint(width-MAC_SCROLLBAR_SIZE, 0) ;
     wxSize vSize(MAC_SCROLLBAR_SIZE, height - adjust) ;
     wxPoint hPoint(0 , height-MAC_SCROLLBAR_SIZE ) ;
     wxSize hSize( width - adjust, MAC_SCROLLBAR_SIZE) ;

-    
-    m_vScrollBar = new wxScrollBar(this, wxWINDOW_VSCROLL, vPoint, 
+
+    m_vScrollBar = new wxScrollBar(this, wxWINDOW_VSCROLL, vPoint,

         vSize , wxVERTICAL);
 
     if ( style & wxVSCROLL )
     {
         vSize , wxVERTICAL);
 
     if ( style & wxVSCROLL )
     {

-        
+

     }
     else
     {
         m_vScrollBar->Show(false) ;
     }
     }
     else
     {
         m_vScrollBar->Show(false) ;
     }

-    m_hScrollBar = new wxScrollBar(this, wxWINDOW_HSCROLL, hPoint, 
+    m_hScrollBar = new wxScrollBar(this, wxWINDOW_HSCROLL, hPoint,

         hSize , wxHORIZONTAL);
     if ( style  & wxHSCROLL )
     {
         hSize , wxHORIZONTAL);
     if ( style  & wxHSCROLL )
     {


@@ -1700,7 +1885,7 @@ void wxWindowMac::MacCreateScrollBars( long style )
     {
         m_hScrollBar->Show(false) ;
     }
     {
         m_hScrollBar->Show(false) ;
     }

-    
+

     // because the create does not take into account the client area origin
     MacRepositionScrollBars() ; // we might have a real position shift
 }
     // because the create does not take into account the client area origin
     MacRepositionScrollBars() ; // we might have a real position shift
 }


@@ -1709,30 +1894,30 @@ void wxWindowMac::MacRepositionScrollBars()
 {
     bool hasBoth = ( m_hScrollBar && m_hScrollBar->IsShown()) && ( m_vScrollBar && m_vScrollBar->IsShown()) ;
     int adjust = hasBoth ? MAC_SCROLLBAR_SIZE - 1 : 0 ;
 {
     bool hasBoth = ( m_hScrollBar && m_hScrollBar->IsShown()) && ( m_vScrollBar && m_vScrollBar->IsShown()) ;
     int adjust = hasBoth ? MAC_SCROLLBAR_SIZE - 1 : 0 ;

-    
+

     // get real client area
     // get real client area

-    
-    int width = m_width ; 
+
+    int width = m_width ;

     int height = m_height ;
 
     width -= MacGetLeftBorderSize() + MacGetRightBorderSize();
     height -= MacGetTopBorderSize() + MacGetBottomBorderSize();
     int height = m_height ;
 
     width -= MacGetLeftBorderSize() + MacGetRightBorderSize();
     height -= MacGetTopBorderSize() + MacGetBottomBorderSize();

-    
+

     wxPoint vPoint(width-MAC_SCROLLBAR_SIZE, 0) ;
     wxSize vSize(MAC_SCROLLBAR_SIZE, height - adjust) ;
     wxPoint hPoint(0 , height-MAC_SCROLLBAR_SIZE ) ;
     wxSize hSize( width - adjust, MAC_SCROLLBAR_SIZE) ;
     wxPoint vPoint(width-MAC_SCROLLBAR_SIZE, 0) ;
     wxSize vSize(MAC_SCROLLBAR_SIZE, height - adjust) ;
     wxPoint hPoint(0 , height-MAC_SCROLLBAR_SIZE ) ;
     wxSize hSize( width - adjust, MAC_SCROLLBAR_SIZE) ;

-    
-    int x = 0 ; 
+
+    int x = 0 ;

     int y = 0 ;
     int w = m_width ;
     int h = m_height ;
     int y = 0 ;
     int w = m_width ;
     int h = m_height ;

-    
+

     MacClientToRootWindow( &x , &y ) ;
     MacClientToRootWindow( &w , &h ) ;
     MacClientToRootWindow( &x , &y ) ;
     MacClientToRootWindow( &w , &h ) ;

-    
+

     wxWindowMac *iter = (wxWindowMac*)this ;
     wxWindowMac *iter = (wxWindowMac*)this ;

-    
+

     int totW = 10000 , totH = 10000;
     while( iter )
     {
     int totW = 10000 , totH = 10000;
     while( iter )
     {


@@ -1744,8 +1929,8 @@ void wxWindowMac::MacRepositionScrollBars()
         }
 
         iter = iter->GetParent() ;
         }
 
         iter = iter->GetParent() ;

-    } 
-    
+    }
+

     if ( x == 0 )
     {
         hPoint.x = -1 ;
     if ( x == 0 )
     {
         hPoint.x = -1 ;


@@ -1756,13 +1941,13 @@ void wxWindowMac::MacRepositionScrollBars()
         vPoint.y = -1 ;
         vSize.y += 1 ;
     }
         vPoint.y = -1 ;
         vSize.y += 1 ;
     }

-    
+

     if ( w-x >= totW )
     {
         hSize.x += 1 ;
         vPoint.x += 1 ;
     }
     if ( w-x >= totW )
     {
         hSize.x += 1 ;
         vPoint.x += 1 ;
     }

-    
+

     if ( h-y >= totH )
     {
         vSize.y += 1 ;
     if ( h-y >= totH )
     {
         vSize.y += 1 ;


@@ -1784,34 +1969,34 @@ bool wxWindowMac::AcceptsFocus() const
     return MacCanFocus() && wxWindowBase::AcceptsFocus();
 }
 
     return MacCanFocus() && wxWindowBase::AcceptsFocus();
 }
 

-WXWidget wxWindowMac::MacGetContainerForEmbedding() 
+WXWidget wxWindowMac::MacGetContainerForEmbedding()

 {
     return GetParent()->MacGetContainerForEmbedding() ;
 }
 
 {
     return GetParent()->MacGetContainerForEmbedding() ;
 }
 

-void wxWindowMac::MacSuperChangedPosition() 
+void wxWindowMac::MacSuperChangedPosition()

 {
     // only window-absolute structures have to be moved i.e. controls
 
 {
     // only window-absolute structures have to be moved i.e. controls
 

-    wxNode *node = GetChildren().First();
+    wxWindowListNode *node = GetChildren().GetFirst();

     while ( node )
     {
     while ( node )
     {

-        wxWindowMac *child = (wxWindowMac *)node->Data();
+        wxWindowMac *child = node->GetData();

         child->MacSuperChangedPosition() ;
         child->MacSuperChangedPosition() ;

-        node = node->Next();
+        node = node->GetNext();

     }
 }
 
     }
 }
 

-void wxWindowMac::MacTopLevelWindowChangedPosition() 
+void wxWindowMac::MacTopLevelWindowChangedPosition()

 {
     // only screen-absolute structures have to be moved i.e. glcanvas
 
 {
     // only screen-absolute structures have to be moved i.e. glcanvas
 

-    wxNode *node = GetChildren().First();
+    wxWindowListNode *node = GetChildren().GetFirst();

     while ( node )
     {
     while ( node )
     {

-        wxWindowMac *child = (wxWindowMac *)node->Data();
+        wxWindowMac *child = node->GetData();

         child->MacTopLevelWindowChangedPosition() ;
         child->MacTopLevelWindowChangedPosition() ;

-        node = node->Next();
+        node = node->GetNext();

     }
 }
 long wxWindowMac::MacGetLeftBorderSize( ) const
     }
 }
 long wxWindowMac::MacGetLeftBorderSize( ) const


@@ -1823,7 +2008,7 @@ long wxWindowMac::MacGetLeftBorderSize( ) const
     {
         SInt32 border = 3 ;
 #if wxMAC_USE_THEME_BORDER
     {
         SInt32 border = 3 ;
 #if wxMAC_USE_THEME_BORDER

-#if TARGET_CARBON       
+#if TARGET_CARBON

           GetThemeMetric( kThemeMetricListBoxFrameOutset , &border ) ;
 #endif
 #endif
           GetThemeMetric( kThemeMetricListBoxFrameOutset , &border ) ;
 #endif
 #endif


@@ -1833,7 +2018,7 @@ long wxWindowMac::MacGetLeftBorderSize( ) const
     {
           SInt32 border = 3 ;
 #if wxMAC_USE_THEME_BORDER
     {
           SInt32 border = 3 ;
 #if wxMAC_USE_THEME_BORDER

-#if TARGET_CARBON       
+#if TARGET_CARBON

           GetThemeMetric( kThemeMetricListBoxFrameOutset , &border ) ;
 #endif
 #endif
           GetThemeMetric( kThemeMetricListBoxFrameOutset , &border ) ;
 #endif
 #endif


@@ -1864,7 +2049,7 @@ long wxWindowMac::MacGetBottomBorderSize( ) const
     return MacGetLeftBorderSize() ;
 }
 
     return MacGetLeftBorderSize() ;
 }
 

-long wxWindowMac::MacRemoveBordersFromStyle( long style ) 
+long wxWindowMac::MacRemoveBordersFromStyle( long style )

 {
     return style & ~( wxDOUBLE_BORDER | wxSUNKEN_BORDER | wxRAISED_BORDER | wxBORDER | wxSTATIC_BORDER ) ;
 }
 {
     return style & ~( wxDOUBLE_BORDER | wxSUNKEN_BORDER | wxRAISED_BORDER | wxBORDER | wxSTATIC_BORDER ) ;
 }


@@ -1886,3 +2071,26 @@ wxPoint wxGetMousePosition()
     return wxPoint(x, y);
 }
 
     return wxPoint(x, y);
 }
 

+void wxWindowMac::OnMouseEvent( wxMouseEvent &event )
+{
+       if ( event.GetEventType() == wxEVT_RIGHT_DOWN )
+       {
+               // copied from wxGTK : CS
+        // generate a "context menu" event: this is similar to wxEVT_RIGHT_DOWN
+        // except that:
+        //
+        // (a) it's a command event and so is propagated to the parent
+        // (b) under MSW it can be generated from kbd too
+        // (c) it uses screen coords (because of (a))
+        wxContextMenuEvent evtCtx(wxEVT_CONTEXT_MENU,
+                                  this->GetId(),
+                                  this->ClientToScreen(event.GetPosition()));
+        if ( ! GetEventHandler()->ProcessEvent(evtCtx) )
+            event.Skip() ;
+       }
+       else
+       {
+               event.Skip() ;
+       }
+}
+