Don't use focus if NULL

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

diff --git a/src/mac/carbon/window.cpp b/src/mac/carbon/window.cpp
index 29b6fc6f0f0c03b3a81fff79239de1d3e4dd36bd..9f7a20f4e7a0be3afa0b3844757d33b1002d5032 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"


@@ -35,7 +35,9 @@
 #include "wx/tooltip.h"
 #include "wx/statusbr.h"
 #include "wx/menuitem.h"
 #include "wx/tooltip.h"
 #include "wx/statusbr.h"
 #include "wx/menuitem.h"

+#include "wx/spinctrl.h"

 #include "wx/log.h"
 #include "wx/log.h"

+#include "wx/geometry.h"

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


@@ -46,6 +48,10 @@
 #define MAC_SCROLLBAR_SIZE 16
 
 #include "wx/mac/uma.h"
 #define MAC_SCROLLBAR_SIZE 16
 
 #include "wx/mac/uma.h"

+#ifndef __DARWIN__
+#include <Windows.h>
+#include <ToolUtils.h>
+#endif

 
 #if  wxUSE_DRAG_AND_DROP
 #include "wx/dnd.h"
 
 #if  wxUSE_DRAG_AND_DROP
 #include "wx/dnd.h"


@@ -71,10 +77,16 @@ BEGIN_EVENT_TABLE(wxWindowMac, wxWindowBase)
   EVT_INIT_DIALOG(wxWindowMac::OnInitDialog)
   EVT_IDLE(wxWindowMac::OnIdle)
   EVT_SET_FOCUS(wxWindowMac::OnSetFocus)
   EVT_INIT_DIALOG(wxWindowMac::OnInitDialog)
   EVT_IDLE(wxWindowMac::OnIdle)
   EVT_SET_FOCUS(wxWindowMac::OnSetFocus)

+  EVT_MOUSE_EVENTS(wxWindowMac::OnMouseEvent)

 END_EVENT_TABLE()
 
 #endif
 
 END_EVENT_TABLE()
 
 #endif
 

+#define wxMAC_DEBUG_REDRAW 0
+#ifndef wxMAC_DEBUG_REDRAW
+#define wxMAC_DEBUG_REDRAW 0
+#endif
+

 #define wxMAC_USE_THEME_BORDER 0
 
 
 #define wxMAC_USE_THEME_BORDER 0
 
 


@@ -109,21 +121,21 @@ void wxWindowMac::Init()
     m_isShown = TRUE;
 
     m_x = 0;
     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 ;
 

-#if  wxUSE_DRAG_AND_DROP
-  m_pDropTarget = NULL;
-#endif
+    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 ;


@@ -134,26 +146,62 @@ 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 ;
     }
 

+       // CS: copied from MSW :
+    // VS: destroy children first and _then_ detach *this from its parent.
+    //     If we'd do it the other way around, children wouldn't be able
+    //     find their parent frame (see above).
+    DestroyChildren();
+

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

-    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


@@ -165,6 +213,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;
 


@@ -176,7 +235,9 @@ 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 ) ;
     }
     {
         MacCreateScrollBars( style ) ;
     }


@@ -188,29 +249,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() )
             {
             wxControl* control = wxDynamicCast( gFocusWindow , wxControl ) ;
             if ( control && control->GetMacControl() )
             {

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

                 control->MacRedrawControl() ;
             }
                 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 ;
         {


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

-                UMASetKeyboardFocus( gFocusWindow->MacGetRootWindow() , 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);


@@ -249,7 +318,7 @@ bool wxWindowMac::Enable(bool enable)
     return TRUE;
 }
 
     return TRUE;
 }
 

-void wxWindowMac::CaptureMouse()
+void wxWindowMac::DoCaptureMouse()

 {
     wxTheApp->s_captureWindow = this ;
 }
 {
     wxTheApp->s_captureWindow = this ;
 }


@@ -259,7 +328,7 @@ wxWindow* wxWindowBase::GetCapture()
     return wxTheApp->s_captureWindow ;
 }
 
     return wxTheApp->s_captureWindow ;
 }
 

-void wxWindowMac::ReleaseMouse()
+void wxWindowMac::DoReleaseMouse()

 {
     wxTheApp->s_captureWindow = NULL ;
 }
 {
     wxTheApp->s_captureWindow = NULL ;
 }


@@ -268,15 +337,15 @@ void wxWindowMac::ReleaseMouse()
 
 void wxWindowMac::SetDropTarget(wxDropTarget *pDropTarget)
 {
 
 void wxWindowMac::SetDropTarget(wxDropTarget *pDropTarget)
 {

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

 }
 
 #endif
 }
 
 #endif


@@ -297,7 +366,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())


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

-    ::InsertMenu( menu->GetHMenu() , -1 ) ;
-    long menuResult = ::PopUpMenuSelect(menu->GetHMenu() ,y,x, 0) ;
-    menu->MacMenuSelect( this , TickCount() , HiWord(menuResult) , LoWord(menuResult) ) ;
-    ::DeleteMenu( menu->MacGetMenuId() ) ;
+    menu->MacBeforeDisplay( true ) ;
+    long menuResult = ::PopUpMenuSelect((MenuHandle) menu->GetHMenu() ,y,x, 0) ;
+    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;


@@ -329,14 +411,14 @@ bool wxWindowMac::DoPopupMenu(wxMenu *menu, int x, int y)
 
 void wxWindowMac::DoScreenToClient(int *x, int *y) const
 {
 
 void wxWindowMac::DoScreenToClient(int *x, int *y) const
 {

-    WindowRef window = MacGetRootWindow() ;
+    WindowRef window = (WindowRef) MacGetRootWindow() ;

 
     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 ) ) ;
     ::GlobalToLocal( &localwhere ) ;
     ::GetPort( &port ) ;
     ::SetPort( UMAGetWindowPort( window ) ) ;
     ::GlobalToLocal( &localwhere ) ;


@@ -345,23 +427,32 @@ 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 ;
     

-    MacRootWindowToClient( x , y ) ;
+    MacRootWindowToWindow( x , y ) ;
+    if ( x )
+        *x -= MacGetLeftBorderSize() ;
+    if ( y )
+        *y -= MacGetTopBorderSize() ;

 }
 
 void wxWindowMac::DoClientToScreen(int *x, int *y) const
 {
 }
 
 void wxWindowMac::DoClientToScreen(int *x, int *y) const
 {

-    WindowRef window = MacGetRootWindow() ;
-    
-    MacClientToRootWindow( x , y ) ;
-    
+    WindowRef window = (WindowRef) MacGetRootWindow() ;
+
+    if ( x )
+        *x += MacGetLeftBorderSize() ;
+    if ( y )
+        *y += MacGetTopBorderSize() ;
+
+    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 ) ) ;

-    ::SetOrigin( 0 , 0 ) ;
+

     ::LocalToGlobal( &localwhere ) ;
     ::SetPort( port ) ;
     if(x)   *x = localwhere.h ;
     ::LocalToGlobal( &localwhere ) ;
     ::SetPort( port ) ;
     if(x)   *x = localwhere.h ;


@@ -373,7 +464,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 ) ;
 }
 


@@ -408,37 +499,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"));
-
-  Point pt ;
-  wxWindowMac *mouseWin ;
-  GetMouse( &pt ) ;
-  
-  // Change the cursor NOW if we're within the correct window
-
-  if ( MacGetWindowFromPoint( wxPoint( pt.h , pt.v ) , &mouseWin ) )
-  {
-    if ( mouseWin == this && !wxIsBusy() )
+    
+    wxASSERT_MSG( m_cursor.Ok(),
+        wxT("cursor must be valid after call to the base version"));
+    
+    Point pt ;
+    wxWindowMac *mouseWin ;
+    GetMouse( &pt ) ;
+    
+    // Change the cursor NOW if we're within the correct window
+    
+    if ( MacGetWindowFromPoint( wxPoint( pt.h , pt.v ) , &mouseWin ) )

     {
     {

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

     }
     }

-  }
-
-  return TRUE ;
+    
+    return TRUE ;

 }
 
 
 }
 
 


@@ -448,54 +539,54 @@ void wxWindowMac::DoGetClientSize(int *x, int *y) const
     int ww, hh;
     ww = m_width ;
     hh = m_height ;
     int ww, hh;
     ww = m_width ;
     hh = m_height ;

-
+    

     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;

 }
 
 
 }
 
 


@@ -508,7 +599,7 @@ void wxWindowMac::DoGetClientSize(int *x, int *y) const
 void wxWindowMac::DoSetToolTip(wxToolTip *tooltip)
 {
     wxWindowBase::DoSetToolTip(tooltip);
 void wxWindowMac::DoSetToolTip(wxToolTip *tooltip)
 {
     wxWindowBase::DoSetToolTip(tooltip);

-
+    

     if ( m_tooltip )
         m_tooltip->SetWindow(this);
 }
     if ( m_tooltip )
         m_tooltip->SetWindow(this);
 }


@@ -522,20 +613,20 @@ void wxWindowMac::DoMoveWindow(int x, int y, int width, int height)
     int former_w = m_width ;
     int former_h = m_height ;
     
     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;
         actualHeight = m_maxHeight;

-
+    

     bool doMove = false ;
     bool doResize = false ;
     
     bool doMove = false ;
     bool doResize = false ;
     


@@ -547,37 +638,56 @@ void wxWindowMac::DoMoveWindow(int x, int y, int width, int height)
     {
         doResize = true ;
     }
     {
         doResize = true ;
     }

-
+    

     if ( doMove || doResize )
     {
         // erase former position
     if ( doMove || doResize )
     {
         // erase former position

-        wxMacDrawingHelper focus( this ) ;
-        if ( focus.Ok() )
+        
+        bool partialRepaint = false ;
+        
+        if ( HasFlag(wxNO_FULL_REPAINT_ON_RESIZE) )

         {
         {

-            Rect clientrect = { 0 , 0 , m_height , m_width } ;
-            // ClipRect( &clientrect ) ;
-            InvalWindowRect( MacGetRootWindow() , &clientrect ) ;
+            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() ;
+                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 ) ;
+                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 ;

-        // erase new position

         
         

-        {
-            wxMacDrawingHelper focus( this ) ;
-            if ( focus.Ok() )
-            {
-                Rect clientrect = { 0 , 0 , m_height , m_width } ;
-                // ClipRect( &clientrect ) ;
-                InvalWindowRect( MacGetRootWindow() , &clientrect ) ;
-            }
-        }
+        // update any low-level frame-relative positions
+        
+        MacUpdateDimensions() ;
+        // erase new position

         
         

+        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

-
+        

         MacRepositionScrollBars() ;
         if ( doMove )
         {
         MacRepositionScrollBars() ;
         if ( doMove )
         {


@@ -588,11 +698,11 @@ 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);

         }
     }
     
         }
     }
     


@@ -614,22 +724,22 @@ void wxWindowMac::DoSetSize(int x, int y, int width, int height, int sizeFlags)
     
     int currentW,currentH;
     GetSize(&currentW, &currentH);
     
     int currentW,currentH;
     GetSize(&currentW, &currentH);

-
+    

     // ... and don't do anything (avoiding flicker) if it's already ok
     if ( x == currentX && y == currentY &&
     // ... 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;
     }

-
+    

     if ( x == -1 && !(sizeFlags & wxSIZE_ALLOW_MINUS_ONE) )
         x = currentX;
     if ( y == -1 && !(sizeFlags & wxSIZE_ALLOW_MINUS_ONE) )
         y = currentY;
     if ( x == -1 && !(sizeFlags & wxSIZE_ALLOW_MINUS_ONE) )
         x = currentX;
     if ( y == -1 && !(sizeFlags & wxSIZE_ALLOW_MINUS_ONE) )
         y = currentY;

-
+    

     AdjustForParentClientOrigin(x, y, sizeFlags);
     AdjustForParentClientOrigin(x, y, sizeFlags);

-
+    

     wxSize size(-1, -1);
     if ( width == -1 )
     {
     wxSize size(-1, -1);
     if ( width == -1 )
     {


@@ -644,7 +754,7 @@ void wxWindowMac::DoSetSize(int x, int y, int width, int height, int sizeFlags)
             width = currentW;
         }
     }
             width = currentW;
         }
     }

-
+    

     if ( height == -1 )
     {
         if ( sizeFlags & wxSIZE_AUTO_HEIGHT )
     if ( height == -1 )
     {
         if ( sizeFlags & wxSIZE_AUTO_HEIGHT )


@@ -654,7 +764,7 @@ void wxWindowMac::DoSetSize(int x, int y, int width, int height, int sizeFlags)
                 size = DoGetBestSize();
             }
             //else: already called DoGetBestSize() above
                 size = DoGetBestSize();
             }
             //else: already called DoGetBestSize() above

-
+            

             height = size.y;
         }
         else
             height = size.y;
         }
         else


@@ -663,9 +773,9 @@ void wxWindowMac::DoSetSize(int x, int y, int width, int height, int sizeFlags)
             height = currentH;
         }
     }
             height = currentH;
         }
     }

-
+    

     DoMoveWindow(x, y, width, height);
     DoMoveWindow(x, y, width, height);

-
+    

 }
 // For implementation purposes - sometimes decorations make the client area
 // smaller
 }
 // For implementation purposes - sometimes decorations make the client area
 // smaller


@@ -675,14 +785,14 @@ wxPoint wxWindowMac::GetClientAreaOrigin() const
     return wxPoint(MacGetLeftBorderSize(  ) , MacGetTopBorderSize(  ) );
 }
 
     return wxPoint(MacGetLeftBorderSize(  ) , MacGetTopBorderSize(  ) );
 }
 

-void wxWindow::SetTitle(const wxString& title)
+void wxWindowMac::SetTitle(const wxString& title)

 {
 {

-       m_label = title ;
+    m_label = title ;

 }
 
 }
 

-wxString wxWindow::GetTitle() const
+wxString wxWindowMac::GetTitle() const

 {
 {

-       return m_label ;
+    return m_label ;

 }
 
 bool wxWindowMac::Show(bool show)
 }
 
 bool wxWindowMac::Show(bool show)


@@ -690,59 +800,65 @@ 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 ( !show )
     {

-        WindowRef window = MacGetRootWindow() ;
-        wxWindowMac* win = wxFindWinFromMacWindow( window ) ;

         if ( win && !win->m_isBeingDeleted )
         if ( win && !win->m_isBeingDeleted )

-            Refresh() ; 
+            Refresh() ;

     }
     else
     {
     }
     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 = (wxWindowMac *)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) ) {
         return m_parent->MacIsReallyShown();
     }
     return m_isShown;
 {
     if ( m_isShown && (m_parent != NULL) ) {
         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 )


@@ -772,7 +888,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 ) ;


@@ -787,27 +903,45 @@ 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)
 {
 void wxWindowMac::Refresh(bool eraseBack, const wxRect *rect)
 {

-    wxPoint client ;
-    client = GetClientAreaOrigin( ) ;
-    Rect clientrect = { -client.y , -client.x , m_height - client.y , m_width - client.x} ;
+    if ( MacGetTopLevelWindow() == NULL )
+        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 ) ;
     }
 }


@@ -863,89 +997,84 @@ 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.

 }
 
 }
 

-void wxWindowMac::OnEraseBackground(wxEraseEvent& event)
+const wxBrush& wxWindowMac::MacGetBackgroundBrush()

 {
 {

-    wxMacDrawingHelper focus( this ) ;
-    if ( focus.Ok() )
+    if ( m_backgroundColour == wxSystemSettings::GetColour(wxSYS_COLOUR_APPWORKSPACE) )

     {
     {

-      WindowRef window = MacGetRootWindow() ;
-      Rect rect = {0, 0 , m_height  , m_width } ;
-      RgnHandle updateRgn = GetUpdateRegion().GetWXHRGN() ;
-      SetClip( event.GetDC()->MacGetCurrentClipRgn() ) ;
-
-      if ( m_backgroundColour == wxSystemSettings::GetSystemColour(wxSYS_COLOUR_APPWORKSPACE) )
-      {
-          SetThemeWindowBackground( window , kThemeBrushDocumentWindowBackground , false ) ;
-      }
-      else if (  m_backgroundColour == wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DFACE ) )
-      {
-          // 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
-          
-              wxWindowMac* parent = GetParent() ;
-              while( parent )
-              {
-                  if ( parent->MacGetRootWindow() != window )
-                  {
-                      // we are in a different window on the mac system
-                      parent = NULL ;
-                      break ;
-                  }
-                 //if( parent->IsKindOf( CLASSINFO( wxControl ) ) && ((wxControl*)parent)->GetMacControl() )
-                  {
-                      if ( parent->m_backgroundColour != wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DFACE ) 
-                        && parent->m_backgroundColour != wxSystemSettings::GetSystemColour(wxSYS_COLOUR_APPWORKSPACE) )
-                      {
-                          // if we have any other colours in the hierarchy
-                          RGBBackColor( &parent->m_backgroundColour.GetPixel()) ;
-                          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 box ;
-                          GetRegionBounds( updateRgn , &box) ;
-                          ::ApplyThemeBackground(kThemeBackgroundTabPane, &box , kThemeStateActive,8,true);
-                          break ;
-                      }
-                  }
-                  /*
-                 else
-                  {
-                      // we have arrived at a non control item
-                      parent = NULL ;
-                      break ;
-                  }
-                  */
-                  parent = parent->GetParent() ;
-              }
-              if ( !parent )
-              {
-                  // if there is nothing special -> use default
-                  SetThemeWindowBackground( window , kThemeBrushDialogBackgroundActive , false ) ;
-              }
-      }
-      else
-      {
-          RGBBackColor( &m_backgroundColour.GetPixel()) ;
-      }
-      EraseRect( &rect ) ; 
+        m_macBackgroundBrush.SetMacTheme( kThemeBrushDocumentWindowBackground ) ;
+    }
+    else if (  m_backgroundColour == wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE ) )
+    {
+        // 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 )
+        {
+            if ( parent->MacGetRootWindow() != window )
+            {
+                // we are in a different window on the mac system
+                parent = NULL ;
+                break ;
+            }
+            
+            {
+                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 ;
+                }
+            }
+            parent = parent->GetParent() ;
+        }
+        if ( !parent )
+        {
+            m_macBackgroundBrush.SetMacTheme( kThemeBrushDialogBackgroundActive ) ; // todo eventually change for inactive
+        }
+    }
+    else
+    {
+        m_macBackgroundBrush.SetColour( m_backgroundColour ) ;

     }
     }

-  
-//  event.GetDC()->Clear() ;
+    
+    return m_macBackgroundBrush ;    
+}
+
+void wxWindowMac::OnEraseBackground(wxEraseEvent& event)
+{
+    event.GetDC()->Clear() ;

 }
 
 void wxWindowMac::OnNcPaint( wxNcPaintEvent& event )
 {
 }
 
 void wxWindowMac::OnNcPaint( wxNcPaintEvent& event )
 {

-    wxMacDrawingHelper focus( this ) ;
-    if ( focus.Ok() )
-    {
-      MacPaintBorders() ;
-    }
+    wxWindowDC dc(this) ;
+    wxMacPortSetter helper(&dc) ;
+
+    MacPaintBorders( dc.m_macLocalOrigin.x , dc.m_macLocalOrigin.y) ;

 }
 
 int wxWindowMac::GetScrollPos(int orient) const
 }
 
 int wxWindowMac::GetScrollPos(int orient) const


@@ -1009,11 +1138,11 @@ void wxWindowMac::SetScrollPos(int orient, int pos, bool refresh)
     }
 }
 
     }
 }
 

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

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

-        
+

     RGBColor white = { 0xFFFF, 0xFFFF , 0xFFFF } ;
     RGBColor black = { 0x0000, 0x0000 , 0x0000 } ;
     RGBColor face = { 0xDDDD, 0xDDDD , 0xDDDD } ;
     RGBColor white = { 0xFFFF, 0xFFFF , 0xFFFF } ;
     RGBColor black = { 0x0000, 0x0000 , 0x0000 } ;
     RGBColor face = { 0xDDDD, 0xDDDD , 0xDDDD } ;


@@ -1023,125 +1152,137 @@ void wxWindowMac::MacPaintBorders( )
     if (HasFlag(wxRAISED_BORDER) || HasFlag( wxSUNKEN_BORDER) || HasFlag(wxDOUBLE_BORDER) )
     {
 #if wxMAC_USE_THEME_BORDER
     if (HasFlag(wxRAISED_BORDER) || HasFlag( wxSUNKEN_BORDER) || HasFlag(wxDOUBLE_BORDER) )
     {
 #if wxMAC_USE_THEME_BORDER

-                 Rect rect = { 0 , 0 , m_height , m_width } ;
-                 SInt32 border = 0 ;
-                 /*
-                 GetThemeMetric( kThemeMetricListBoxFrameOutset , &border ) ;
-                 InsetRect( &rect , border , 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) ;
       */
       DrawThemeListBoxFrame(&rect,IsEnabled() ? kThemeStateActive : kThemeStateInactive) ;
       */

-        
+

         DrawThemePrimaryGroup(&rect  ,IsEnabled() ? kThemeStateActive : kThemeStateInactive) ;
 #else
         DrawThemePrimaryGroup(&rect  ,IsEnabled() ? kThemeStateActive : kThemeStateInactive) ;
 #else

-       bool sunken = HasFlag( wxSUNKEN_BORDER ) ;
+        bool sunken = HasFlag( wxSUNKEN_BORDER ) ;

         RGBForeColor( &face );
         RGBForeColor( &face );

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

 
 

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

 
         RGBForeColor( sunken ? &face : &black );
 
         RGBForeColor( sunken ? &face : &black );

-        MoveTo( 0 , m_height - 1 );
-        LineTo( m_width - 1 , m_height - 1 );
-        LineTo( m_width - 1 , 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 ? &shadow : &white );

-        MoveTo( 1 , m_height - 3 );
-        LineTo( 1, 1 );
-        LineTo( m_width - 3 , 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 : &shadow );

-        MoveTo( 1 , m_height - 2 );
-        LineTo( m_width - 2 , m_height - 2 );
-        LineTo( m_width - 2 , 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 ? &black : &face );

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

 #endif
     }
     else if (HasFlag(wxSIMPLE_BORDER))
     {
 #endif
     }
     else if (HasFlag(wxSIMPLE_BORDER))
     {

-        Rect rect = { 0 , 0 , m_height , m_width } ;
+            Rect rect = { top , left , m_height + top , m_width + left } ;

         RGBForeColor( &black ) ;
         FrameRect( &rect ) ;
     }
 }
 
         RGBForeColor( &black ) ;
         FrameRect( &rect ) ;
     }
 }
 

+void wxWindowMac::RemoveChild( wxWindowBase *child )
+{
+    if ( child == m_hScrollBar )
+        m_hScrollBar = NULL ;
+    if ( child == m_vScrollBar )
+        m_vScrollBar = NULL ;
+
+    wxWindowBase::RemoveChild( child ) ;
+}
+

 // New function that will replace some of the above.
 void wxWindowMac::SetScrollbar(int orient, int pos, int thumbVisible,
     int range, bool refresh)
 {
 // New function that will replace some of the above.
 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)
 {

-    wxMacDrawingClientHelper focus( this ) ;
-    if ( focus.Ok() )
+    wxClientDC dc(this) ;
+    wxMacPortSetter helper(&dc) ;
+    

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

-
-        Rect scrollrect = { 0 , 0 , height , width } ;
-    
+        
+        Rect scrollrect = { dc.YLOG2DEVMAC(0) , dc.XLOG2DEVMAC(0) , dc.YLOG2DEVMAC(height) , dc.XLOG2DEVMAC(width) } ;

         RgnHandle updateRgn = NewRgn() ;
         ClipRect( &scrollrect ) ;
         if ( rect )
         {
         RgnHandle updateRgn = NewRgn() ;
         ClipRect( &scrollrect ) ;
         if ( rect )
         {

-            Rect r = { rect->y , rect->x , rect->y + rect->height , 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( MacGetRootWindow() ,  updateRgn ) ;
+        InvalWindowRgn( (WindowRef) MacGetRootWindow() ,  updateRgn ) ;

         DisposeRgn( updateRgn ) ;
     }
     
         DisposeRgn( updateRgn ) ;
     }
     

-    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 = (wxWindowMac*)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;
         int x,y;
         child->GetPosition( &x, &y );
         int w,h;


@@ -1159,30 +1300,30 @@ 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) {
             wevent.m_eventType = wxEVT_SCROLLWIN_TOP;
         } else
         if (event.m_eventType == wxEVT_SCROLL_TOP) {
             wevent.m_eventType = wxEVT_SCROLLWIN_TOP;
         } else

-        if (event.m_eventType == wxEVT_SCROLL_BOTTOM) {
-            wevent.m_eventType = wxEVT_SCROLLWIN_BOTTOM;
-        } else
-        if (event.m_eventType == wxEVT_SCROLL_LINEUP) {
-            wevent.m_eventType = wxEVT_SCROLLWIN_LINEUP;
-        } else
-        if (event.m_eventType == wxEVT_SCROLL_LINEDOWN) {
-            wevent.m_eventType = wxEVT_SCROLLWIN_LINEDOWN;
-        } else
-        if (event.m_eventType == wxEVT_SCROLL_PAGEUP) {
-            wevent.m_eventType = wxEVT_SCROLLWIN_PAGEUP;
-        } else
-        if (event.m_eventType == wxEVT_SCROLL_PAGEDOWN) {
-            wevent.m_eventType = wxEVT_SCROLLWIN_PAGEDOWN;
-        } else
-        if (event.m_eventType == wxEVT_SCROLL_THUMBTRACK) {
-            wevent.m_eventType = wxEVT_SCROLLWIN_THUMBTRACK;
-        }
-        
-        GetEventHandler()->ProcessEvent(wevent);
+            if (event.m_eventType == wxEVT_SCROLL_BOTTOM) {
+                wevent.m_eventType = wxEVT_SCROLLWIN_BOTTOM;
+            } else
+                if (event.m_eventType == wxEVT_SCROLL_LINEUP) {
+                    wevent.m_eventType = wxEVT_SCROLLWIN_LINEUP;
+                } else
+                    if (event.m_eventType == wxEVT_SCROLL_LINEDOWN) {
+                        wevent.m_eventType = wxEVT_SCROLLWIN_LINEDOWN;
+                    } else
+                        if (event.m_eventType == wxEVT_SCROLL_PAGEUP) {
+                            wevent.m_eventType = wxEVT_SCROLLWIN_PAGEUP;
+                        } else
+                            if (event.m_eventType == wxEVT_SCROLL_PAGEDOWN) {
+                                wevent.m_eventType = wxEVT_SCROLLWIN_PAGEDOWN;
+                            } else
+                                if (event.m_eventType == wxEVT_SCROLL_THUMBTRACK) {
+                                    wevent.m_eventType = wxEVT_SCROLLWIN_THUMBTRACK;
+                                }
+                                
+                                GetEventHandler()->ProcessEvent(wevent);

     }
 }
 
     }
 }
 


@@ -1209,13 +1350,13 @@ void wxWindowMac::OnCommand(wxWindowMac& win, wxCommandEvent& event)
 wxObject* wxWindowMac::GetChild(int number) const
 {
     // Return a pointer to the Nth object in the Panel
 wxObject* wxWindowMac::GetChild(int number) const
 {
     // Return a pointer to the Nth object in the Panel

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

     int n = number;
     while (node && n--)
     int n = number;
     while (node && n--)

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

     if ( node )
     {
     if ( node )
     {

-        wxObject *obj = (wxObject *)node->Data();
+        wxObject *obj = (wxObject *)node->GetData();

         return(obj);
     }
     else
         return(obj);
     }
     else


@@ -1290,7 +1431,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 )


@@ -1306,22 +1447,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 ((point.x < m_x) || (point.y < m_y) ||
-        (point.x > (m_x + m_width)) || (point.y > (m_y + m_height)))
-        return FALSE;
+    if ( IsTopLevel() )
+    {
+        if ((point.x < 0) || (point.y < 0) ||
+            (point.x > (m_width)) || (point.y > (m_height)))
+            return FALSE;
+    }
+    else
+    {
+        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() ;

     
     

-    WindowRef window = MacGetRootWindow() ;
-

     wxPoint newPoint( point ) ;
     wxPoint newPoint( point ) ;

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

     
     

-    for (wxNode *node = GetChildren().First(); node; node = node->Next())
+    if ( !IsTopLevel() )

     {
     {

-        wxWindowMac *child = (wxWindowMac*)node->Data();
+        newPoint.x -= m_x;
+        newPoint.y -= m_y;
+    }
+    
+    for (wxWindowListNode *node = GetChildren().GetFirst(); node; node = node->GetNext())
+    {
+        wxWindowMac *child = (wxWindowMac*)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 )
         {


@@ -1329,29 +1482,82 @@ bool wxWindowMac::MacGetWindowFromPointSub( const wxPoint &point , wxWindowMac**
                 return TRUE;
         }
     }
                 return TRUE;
         }
     }

-
+    

     *outWin = this ;
     return TRUE;
 }
 
     *outWin = this ;
     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 )
     {

-            wxPoint point( screenpoint ) ;
-            wxWindowMac* win = wxFindWinFromMacWindow( window ) ;
-            if ( win )
-            {
-            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;
+            ::GetPort( &port ) ;
+            ::SetPort( UMAGetWindowPort( window ) ) ;
+            ::GlobalToLocal( &pt ) ;
+            ::SetPort( port ) ;
+            
+            wxPoint point( pt.h, pt.v ) ;
+            

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

-    }
+        }

     }
     return FALSE ;
 }
 
     }
     return FALSE ;
 }
 

-extern int wxBusyCursorCount ;
+static wxWindow *gs_lastWhich = NULL;
+
+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)
 {
 
 bool wxWindowMac::MacDispatchMouseEvent(wxMouseEvent& event)
 {


@@ -1359,35 +1565,40 @@ bool wxWindowMac::MacDispatchMouseEvent(wxMouseEvent& event)
         (event.m_x > (m_x + m_width)) || (event.m_y > (m_y + m_height)))
         return FALSE;
     
         (event.m_x > (m_x + m_width)) || (event.m_y > (m_y + m_height)))
         return FALSE;
     

-
-    if ( IsKindOf( CLASSINFO ( wxStaticBox ) ) )
-        return FALSE ; 

     
     

-    WindowRef window = MacGetRootWindow() ;
-
+    if ( IsKindOf( CLASSINFO ( wxStaticBox ) ) /* || IsKindOf( CLASSINFO( wxSpinCtrl ) ) */)
+        return FALSE ;
+    
+    WindowRef window = (WindowRef) MacGetRootWindow() ;
+    

     event.m_x -= m_x;
     event.m_y -= m_y;
     
     int x = event.m_x ;
     int y = event.m_y ;
     event.m_x -= m_x;
     event.m_y -= 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 = (wxWindowMac*)node->GetData();

         if ( child->MacGetRootWindow() == window && child->IsShown() && child->IsEnabled() )
         {
             if (child->MacDispatchMouseEvent(event))
                 return TRUE;
         }
     }
         if ( child->MacGetRootWindow() == window && child->IsShown() && child->IsEnabled() )
         {
             if (child->MacDispatchMouseEvent(event))
                 return TRUE;
         }
     }

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

     
     

-    if ( wxBusyCursorCount == 0 )
+    wxWindow* cursorTarget = this ;
+    wxPoint cursorPoint( x , y ) ;
+    
+    while( cursorTarget && !cursorTarget->MacSetupCursor( cursorPoint ) )

     {
     {

-        m_cursor.MacInstall() ;
+        cursorTarget = cursorTarget->GetParent() ;
+        if ( cursorTarget )
+            cursorPoint += cursorTarget->GetPosition() ;

     }
     }

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

     
     if ( event.GetEventType() == wxEVT_LEFT_DOWN )
     {
     
     if ( event.GetEventType() == wxEVT_LEFT_DOWN )
     {


@@ -1397,12 +1608,31 @@ bool wxWindowMac::MacDispatchMouseEvent(wxMouseEvent& event)
     }
     
 #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
         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 );
+        
+        // Same for mouse up events
+        if (event.GetEventType() == wxEVT_LEFT_UP)
+            return TRUE;
+        if (event.GetEventType() == wxEVT_RIGHT_UP)
+            return TRUE;
+    }
+    

     GetEventHandler()->ProcessEvent( event ) ;
     GetEventHandler()->ProcessEvent( event ) ;

+    

     return TRUE;
 }
 
     return TRUE;
 }
 


@@ -1412,94 +1642,194 @@ wxString wxWindowMac::MacGetToolTipString( wxPoint &pt )
     {
         return m_tooltip->GetTip() ;
     }
     {
         return m_tooltip->GetTip() ;
     }

-    return "" ;
+    return wxEmptyString ;

 }
 
 void wxWindowMac::Update()
 {
     wxTopLevelWindowMac* win = MacGetTopLevelWindow(  ) ;
     if ( win )
 }
 
 void wxWindowMac::Update()
 {
     wxTopLevelWindowMac* win = MacGetTopLevelWindow(  ) ;
     if ( win )

+    {

       win->MacUpdate( 0 ) ;
       win->MacUpdate( 0 ) ;

+#if TARGET_API_MAC_CARBON
+        if ( QDIsPortBuffered( GetWindowPort( (WindowRef) win->MacGetWindowRef() ) ) )
+        {
+                QDFlushPortBuffer( GetWindowPort( (WindowRef) win->MacGetWindowRef() ) , NULL ) ;
+        }
+#endif
+      }

 }
 
 }
 

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

 {
     wxTopLevelWindowMac* win = NULL ;
 {
     wxTopLevelWindowMac* win = NULL ;

-    WindowRef window = MacGetRootWindow() ;
+    WindowRef window = (WindowRef) MacGetRootWindow() ;

     if ( window )
     {
         win = wxFindWinFromMacWindow( window ) ;
     if ( window )
     {
         win = wxFindWinFromMacWindow( window ) ;

-    }  
+    }

     return win ;
 }
 
     return win ;
 }
 

-void wxWindowMac::MacRedraw( RgnHandle updatergn , long time, bool erase)
+const wxRegion& wxWindowMac::MacGetVisibleRegion( bool respectChildrenAndSiblings )

 {
 {

-    // updatergn is always already clipped to our boundaries
-    // it is in nc-coordinates
+    RgnHandle visRgn = NewRgn() ;
+    RgnHandle tempRgn = NewRgn() ;
+    RgnHandle tempStaticBoxRgn = NewRgn() ;

     
     

-    WindowRef window = MacGetRootWindow() ;
-
+    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 ) ) )

     {
     {

-        // ownUpdateRgn is the area that this window has to invalidate i.e. its own area without its children
-        RgnHandle ownUpdateRgn = NewRgn() ;
-        CopyRgn( updatergn , ownUpdateRgn ) ;
-        // subtract all children from updatergn, as soon as we start with transparent windows, these should
-        // not be subtracted
-
-        RgnHandle childarea = NewRgn() ;
-        for (wxNode *node = GetChildren().First(); node; node = node->Next())
+        int borderTop = 14 ;
+        int borderOther = 4 ;
+        
+        SetRectRgn( tempStaticBoxRgn , borderOther , borderTop , m_width - borderOther , m_height - borderOther ) ;
+        DiffRgn( visRgn , tempStaticBoxRgn , visRgn ) ;
+    }
+    
+    if ( !IsTopLevel() )
+    {
+        wxWindow* parent = GetParent() ;
+        while( parent )

         {
         {

-            wxWindowMac *child = (wxWindowMac*)node->Data();
-
-            if ( child->MacGetRootWindow() == window && child->IsShown() )
+            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 ( respectChildrenAndSiblings )
+    {
+        if ( GetWindowStyle() & wxCLIP_CHILDREN )
+        {
+            for (wxWindowListNode *node = GetChildren().GetFirst(); node; node = node->GetNext())

             {
             {

-                SetRectRgn( childarea , child->m_x , child->m_y , child->m_x + child->m_width ,  child->m_y + child->m_height ) ;
-                DiffRgn( ownUpdateRgn , childarea , ownUpdateRgn ) ;
+                wxWindowMac *child = (wxWindowMac*)node->GetData();
+                
+                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 ;
+                        
+                        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 ) ;
+                }

             }
             }

-        }       
-        DisposeRgn( childarea ) ;
+        }
+        
+        if ( (GetWindowStyle() & wxCLIP_SIBLINGS) && GetParent() )
+        {
+            bool thisWindowThrough = false ;
+            for (wxWindowListNode *node = GetParent()->GetChildren().GetFirst(); node; node = node->GetNext())
+            {
+                wxWindowMac *sibling = (wxWindowMac*)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 ;
+                        
+                        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 ) ;
+    DisposeRgn( tempStaticBoxRgn ) ;
+    return m_macVisibleRegion ;
+}

 
 

-        // now intersect this with the client area
-        // and shift it to client coordinates
+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
+    
+    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 ) ;

         
         

+        // newupdate is the update region in client coordinates

         RgnHandle newupdate = NewRgn() ;
         wxSize point = GetClientSize() ;
         wxPoint origin = GetClientAreaOrigin() ;
         RgnHandle newupdate = NewRgn() ;
         wxSize point = GetClientSize() ;
         wxPoint origin = GetClientAreaOrigin() ;

-

         SetRectRgn( newupdate , origin.x , origin.y , origin.x + point.x , origin.y+point.y ) ;
         SectRgn( newupdate , ownUpdateRgn , newupdate ) ;
         OffsetRgn( newupdate , -origin.x , -origin.y ) ;
         m_updateRegion = newupdate ;
         DisposeRgn( newupdate ) ; // it's been cloned to m_updateRegion
         SetRectRgn( newupdate , origin.x , origin.y , origin.x + point.x , origin.y+point.y ) ;
         SectRgn( newupdate , ownUpdateRgn , newupdate ) ;
         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); 
-        }       
+            wxPaintEvent event;
+            event.m_timeStamp = time ;
+            event.SetEventObject(this);
+            GetEventHandler()->ProcessEvent(event);
+        }

     }
     
     // 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())

     {
     {

-        wxWindowMac *child = (wxWindowMac*)node->Data();
+        // 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->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 ) ;


@@ -1511,50 +1841,50 @@ void wxWindowMac::MacRedraw( RgnHandle updatergn , long time, bool erase)
     }
     DisposeRgn( childupdate ) ;
     // eventually a draw grow box here
     }
     DisposeRgn( childupdate ) ;
     // eventually a draw grow box here

- 
+    

 }
 
 }
 

-WindowRef wxWindowMac::MacGetRootWindow() const
+WXHWND wxWindowMac::MacGetRootWindow() const

 {
     wxWindowMac *iter = (wxWindowMac*)this ;
 {
     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 )
     {


@@ -1563,7 +1893,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
 }


@@ -1572,30 +1902,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 )
     {


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

-    } 
-    
+    }
+

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


@@ -1619,13 +1949,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 ;


@@ -1647,135 +1977,36 @@ bool wxWindowMac::AcceptsFocus() const
     return MacCanFocus() && wxWindowBase::AcceptsFocus();
 }
 
     return MacCanFocus() && wxWindowBase::AcceptsFocus();
 }
 

-ControlHandle 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 = (wxWindowMac *)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 = (wxWindowMac *)node->GetData();

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

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

     }
 }
     }
 }

-
-bool wxWindowMac::MacSetPortFocusParams( const Point & localOrigin, const Rect & clipRect, WindowRef window , wxWindowMac* win ) 
-{
-    if ( window == NULL )
-        return false ;
-        
-    GrafPtr currPort;
-    GrafPtr port ;
-
-    ::GetPort(&currPort);
-    port = UMAGetWindowPort( window) ;
-    if (currPort != port )
-            ::SetPort(port);
-                
-//  wxASSERT( port->portRect.left == 0 && port->portRect.top == 0 ) ; 
-    ::SetOrigin(-localOrigin.h, -localOrigin.v);
-    return true;            
-}
-
-bool wxWindowMac::MacSetPortDrawingParams( const Point & localOrigin, const Rect & clipRect, WindowRef window , wxWindowMac* win ) 
-{
-    if ( window == NULL )
-        return false ;
-        
-    GrafPtr currPort;
-    GrafPtr port ;
-    ::GetPort(&currPort);
-    port = UMAGetWindowPort( window) ;
-    if (currPort != port )
-            ::SetPort(port);
-//  wxASSERT( port->portRect.left == 0 && port->portRect.top == 0 ) ; 
-    ::SetOrigin(-localOrigin.h, -localOrigin.v);
-    ::ClipRect(&clipRect);
-
-    ::PenNormal() ;
-    ::RGBBackColor(& win->GetBackgroundColour().GetPixel() ) ;
-    ::RGBForeColor(& win->GetForegroundColour().GetPixel() ) ;
-    Pattern whiteColor ;
-    
-    ::BackPat( GetQDGlobalsWhite( &whiteColor) ) ;
-//    ::SetThemeWindowBackground(  win->m_macWindowData->m_macWindow , win->m_macWindowData->m_macWindowBackgroundTheme ,  false ) ;
-    return true;            
-}
-
-void wxWindowMac::MacGetPortParams(Point* localOrigin, Rect* clipRect, WindowRef *window  , wxWindowMac** rootwin) 
-{
-    wxASSERT( GetParent() != NULL ) ;
-    GetParent()->MacGetPortParams( localOrigin , clipRect , window, rootwin) ;
-    localOrigin->h += m_x;
-    localOrigin->v += m_y;
-    OffsetRect(clipRect, -m_x, -m_y);
-
-    Rect myClip;
-    myClip.left = 0;
-    myClip.top = 0;
-    myClip.right = m_width;
-    myClip.bottom = m_height;
-    SectRect(clipRect, &myClip, clipRect);
-}
-
-void wxWindowMac::MacDoGetPortClientParams(Point* localOrigin, Rect* clipRect, WindowRef *window , wxWindowMac** rootwin ) 
-{
-    wxASSERT( GetParent() != NULL ) ;
-
-    GetParent()->MacDoGetPortClientParams( localOrigin , clipRect , window, rootwin) ;
-
-    localOrigin->h += m_x;
-    localOrigin->v += m_y;
-    OffsetRect(clipRect, -m_x, -m_y);
-
-    Rect myClip;
-    myClip.left = 0;
-    myClip.top = 0;
-    myClip.right = m_width ;//width;
-    myClip.bottom = m_height ;// height;
-    SectRect(clipRect, &myClip, clipRect);
-}
-
-void wxWindowMac::MacGetPortClientParams(Point* localOrigin, Rect* clipRect, WindowRef *window , wxWindowMac** rootwin ) 
-{
-    MacDoGetPortClientParams( localOrigin , clipRect , window , rootwin ) ;
-
-    int width , height ;
-    GetClientSize( &width , &height ) ;
-    wxPoint client ;
-    client = GetClientAreaOrigin( ) ;
-    
-    localOrigin->h += client.x;
-    localOrigin->v += client.y;
-    OffsetRect(clipRect, -client.x, -client.y);
-
-    Rect myClip;
-    myClip.left = 0;
-    myClip.top = 0;
-    myClip.right = width;
-    myClip.bottom = height;
-    SectRect(clipRect, &myClip, clipRect);
-}
-

 long wxWindowMac::MacGetLeftBorderSize( ) const
 {
     if( IsTopLevel() )
 long wxWindowMac::MacGetLeftBorderSize( ) const
 {
     if( IsTopLevel() )


@@ -1783,23 +2014,23 @@ long wxWindowMac::MacGetLeftBorderSize( ) const
 
     if (m_windowStyle & wxRAISED_BORDER || m_windowStyle & wxSUNKEN_BORDER )
     {
 
     if (m_windowStyle & wxRAISED_BORDER || m_windowStyle & wxSUNKEN_BORDER )
     {

-               SInt32 border = 3 ;
+        SInt32 border = 3 ;

 #if wxMAC_USE_THEME_BORDER
 #if wxMAC_USE_THEME_BORDER

-#if TARGET_CARBON              
-                 GetThemeMetric( kThemeMetricListBoxFrameOutset , &border ) ;
+#if TARGET_CARBON
+          GetThemeMetric( kThemeMetricListBoxFrameOutset , &border ) ;

 #endif
 #endif
 #endif
 #endif

-                 return border ;
+          return border ;

     }
     else if (  m_windowStyle &wxDOUBLE_BORDER)
     {
     }
     else if (  m_windowStyle &wxDOUBLE_BORDER)
     {

-                 SInt32 border = 3 ;
+          SInt32 border = 3 ;

 #if wxMAC_USE_THEME_BORDER
 #if wxMAC_USE_THEME_BORDER

-#if TARGET_CARBON              
-                 GetThemeMetric( kThemeMetricListBoxFrameOutset , &border ) ;
+#if TARGET_CARBON
+          GetThemeMetric( kThemeMetricListBoxFrameOutset , &border ) ;

 #endif
 #endif
 #endif
 #endif

-                 return border ;
+          return border ;

     }
     else if (m_windowStyle &wxSIMPLE_BORDER)
     {
     }
     else if (m_windowStyle &wxSIMPLE_BORDER)
     {


@@ -1826,89 +2057,11 @@ 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 ) ;
 }
 

-
-wxMacDrawingHelper::wxMacDrawingHelper( wxWindowMac * theWindow ) 
-{
-    m_ok = false ;
-    Point localOrigin ;
-    Rect clipRect ;
-    WindowRef window ;
-    wxWindowMac *rootwin ;
-    m_currentPort = NULL ;
-    
-    GetPort( &m_formerPort ) ;
-    if ( theWindow )
-    {
-        theWindow->MacGetPortParams( &localOrigin , &clipRect , &window , &rootwin) ;
-        m_currentPort = UMAGetWindowPort( window ) ;
-        if ( m_formerPort != m_currentPort )
-            SetPort( m_currentPort ) ;
-        GetPenState( &m_savedPenState ) ;
-        theWindow->MacSetPortDrawingParams( localOrigin, clipRect, window , rootwin ) ; 
-        m_ok = true ;
-    }
-}
-    
-wxMacDrawingHelper::~wxMacDrawingHelper() 
-{
-    if ( m_ok )
-    {
-        SetPort( m_currentPort ) ;
-        SetPenState( &m_savedPenState ) ;
-        SetOrigin( 0 , 0 ) ;
-        Rect portRect ;
-        GetPortBounds( m_currentPort , &portRect ) ;
-        ClipRect( &portRect ) ;
-    }
-        
-    if ( m_formerPort != m_currentPort )
-        SetPort( m_formerPort ) ;
-}
-
-wxMacDrawingClientHelper::wxMacDrawingClientHelper( wxWindowMac * theWindow ) 
-{
-    m_ok = false ;
-    Point localOrigin ;
-    Rect clipRect ;
-    WindowRef window ;
-    wxWindowMac *rootwin ;
-    m_currentPort = NULL ;
-    
-    GetPort( &m_formerPort ) ;
-
-    if ( theWindow )
-    {
-        theWindow->MacGetPortClientParams( &localOrigin , &clipRect , &window , &rootwin) ;
-        m_currentPort = UMAGetWindowPort( window ) ;
-        if ( m_formerPort != m_currentPort )
-            SetPort( m_currentPort ) ;
-        GetPenState( &m_savedPenState ) ;
-        theWindow->MacSetPortDrawingParams( localOrigin, clipRect, window , rootwin ) ; 
-        m_ok = true ;
-    }
-}
-    
-wxMacDrawingClientHelper::~wxMacDrawingClientHelper() 
-{
-    if ( m_ok )
-    {
-        SetPort( m_currentPort ) ;
-        SetPenState( &m_savedPenState ) ;
-        SetOrigin( 0 , 0 ) ;
-        Rect portRect ;
-        GetPortBounds( m_currentPort , &portRect ) ;
-        ClipRect( &portRect ) ;
-    }
-        
-    if ( m_formerPort != m_currentPort )
-        SetPort( m_formerPort ) ;
-}
-

 // Find the wxWindowMac at the current mouse position, returning the mouse
 // position.
 wxWindowMac* wxFindWindowAtPointer(wxPoint& pt)
 // Find the wxWindowMac at the current mouse position, returning the mouse
 // position.
 wxWindowMac* wxFindWindowAtPointer(wxPoint& pt)


@@ -1926,3 +2079,25 @@ 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_UP
+        // 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()));
+        this->GetEventHandler()->ProcessEvent(evtCtx);
+       }
+       else
+       {
+               event.Skip() ;
+       }
+}
+