Missing ;

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

diff --git a/src/mac/window.cpp b/src/mac/window.cpp
index 3a5cfcd895c14d3c66ffcdce024049d65c746f87..af2cb1118d72e1a4c1d17aa71413f958517cafe9 100644 (file)
--- a/src/mac/window.cpp
+++ b/src/mac/window.cpp
@@ -1,12 +1,12 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        windows.cpp
 /////////////////////////////////////////////////////////////////////////////
 // Name:        windows.cpp

-// Purpose:     wxWindow
+// Purpose:     wxWindowMac

 // Author:      AUTHOR
 // Modified by:
 // Created:     ??/??/98
 // RCS-ID:      $Id$
 // Copyright:   (c) AUTHOR
 // Author:      AUTHOR
 // Modified by:
 // Created:     ??/??/98
 // RCS-ID:      $Id$
 // Copyright:   (c) AUTHOR

-// Licence:    wxWindows licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__


@@ -35,6 +35,7 @@
 #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"
 
 #if wxUSE_CARET
 #include "wx/log.h"
 
 #if wxUSE_CARET


@@ -45,7 +46,11 @@
 #define wxWINDOW_VSCROLL 5997
 #define MAC_SCROLLBAR_SIZE 16
 
 #define wxWINDOW_VSCROLL 5997
 #define MAC_SCROLLBAR_SIZE 16
 

-#include <wx/mac/uma.h>
+#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"


@@ -54,69 +59,49 @@
 #include <string.h>
 
 extern wxList wxPendingDelete;
 #include <string.h>
 
 extern wxList wxPendingDelete;

-wxWindow* gFocusWindow = NULL ;
+wxWindowMac* gFocusWindow = NULL ;
+
+#ifdef __WXUNIVERSAL__
+    IMPLEMENT_ABSTRACT_CLASS(wxWindowMac, wxWindowBase)
+#else // __WXMAC__
+    IMPLEMENT_DYNAMIC_CLASS(wxWindow, wxWindowBase)
+#endif // __WXUNIVERSAL__/__WXMAC__

 
 #if !USE_SHARED_LIBRARY
 
 #if !USE_SHARED_LIBRARY

-IMPLEMENT_DYNAMIC_CLASS(wxWindow, wxEvtHandler)
-BEGIN_EVENT_TABLE(wxWindow, wxEvtHandler)
-  EVT_ERASE_BACKGROUND(wxWindow::OnEraseBackground)
-  EVT_SYS_COLOUR_CHANGED(wxWindow::OnSysColourChanged)
-  EVT_INIT_DIALOG(wxWindow::OnInitDialog)
-  EVT_IDLE(wxWindow::OnIdle)
-  EVT_SET_FOCUS(wxWindow::OnSetFocus)
+
+BEGIN_EVENT_TABLE(wxWindowMac, wxWindowBase)
+  EVT_NC_PAINT(wxWindowMac::OnNcPaint)
+  EVT_ERASE_BACKGROUND(wxWindowMac::OnEraseBackground)
+  EVT_SYS_COLOUR_CHANGED(wxWindowMac::OnSysColourChanged)
+  EVT_INIT_DIALOG(wxWindowMac::OnInitDialog)
+  EVT_IDLE(wxWindowMac::OnIdle)
+  EVT_SET_FOCUS(wxWindowMac::OnSetFocus)

 END_EVENT_TABLE()
 
 #endif
 
 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

 
 
 // ===========================================================================
 // implementation
 // ===========================================================================
 
 
 
 // ===========================================================================
 // implementation
 // ===========================================================================
 

-// ---------------------------------------------------------------------------
-// wxWindow utility functions
-// ---------------------------------------------------------------------------
-
-// Find an item given the Macintosh Window Reference
-
-wxList *wxWinMacWindowList = NULL;
-wxWindow *wxFindWinFromMacWindow(WindowRef inWindowRef)
-{
-    wxNode *node = wxWinMacWindowList->Find((long)inWindowRef);
-    if (!node)
-        return NULL;
-    return (wxWindow *)node->Data();
-}
-
-void wxAssociateWinWithMacWindow(WindowRef inWindowRef, wxWindow *win)
-{
-    // adding NULL WindowRef is (first) surely a result of an error and
-    // (secondly) breaks menu command processing
-    wxCHECK_RET( inWindowRef != (WindowRef) NULL, "attempt to add a NULL WindowRef to window list" );
-
-    if ( !wxWinMacWindowList->Find((long)inWindowRef) )
-        wxWinMacWindowList->Append((long)inWindowRef, win);
-}
-
-void wxRemoveMacWindowAssociation(wxWindow *win)
-{
-    wxWinMacWindowList->DeleteObject(win);
-}

 
 // ----------------------------------------------------------------------------
 // constructors and such
 // ----------------------------------------------------------------------------
 
 
 // ----------------------------------------------------------------------------
 // constructors and such
 // ----------------------------------------------------------------------------
 

-WindowRef wxWindow::s_macWindowInUpdate = NULL;
-
-void wxWindow::Init()
+void wxWindowMac::Init()

 {
     // generic
     InitBase();
 
 {
     // generic
     InitBase();
 

-    m_macEraseOnRedraw = true ;
-

     // MSW specific
     m_doubleClickAllowed = 0;
     m_winCaptured = FALSE;
     // MSW specific
     m_doubleClickAllowed = 0;
     m_winCaptured = FALSE;


@@ -133,30 +118,25 @@ void wxWindow::Init()
     // as all windows are created with WS_VISIBLE style...
     m_isShown = TRUE;
 
     // as all windows are created with WS_VISIBLE style...
     m_isShown = TRUE;
 

-       m_macWindowData = NULL ;
-       m_macEraseOnRedraw = true ;
-
-       m_x = 0;
-       m_y = 0 ;       
-       m_width = 0 ;
-       m_height = 0 ;
+    m_x = 0;
+    m_y = 0 ;   
+    m_width = 0 ;
+    m_height = 0 ;

 
 

-       m_hScrollBar = NULL ;
-       m_vScrollBar = NULL ;
+    m_hScrollBar = NULL ;
+    m_vScrollBar = NULL ;

 
 

-#if  wxUSE_DRAG_AND_DROP
-  m_pDropTarget = NULL;
-#endif
+    m_label = wxEmptyString;

 }
 
 // Destructor
 }
 
 // Destructor

-wxWindow::~wxWindow()
+wxWindowMac::~wxWindowMac()

 {
     // deleting a window while it is shown invalidates the region
     if ( IsShown() ) {
 {
     // deleting a window while it is shown invalidates the region
     if ( IsShown() ) {

-        wxWindow* iter = this ;
+        wxWindowMac* iter = this ;

         while( iter ) {
         while( iter ) {

-            if ( iter->m_macWindowData )
+            if ( iter->IsTopLevel() )

             {
                 Refresh() ;
                 break ;
             {
                 Refresh() ;
                 break ;


@@ -168,149 +148,156 @@ wxWindow::~wxWindow()
     
     m_isBeingDeleted = TRUE;
 
     
     m_isBeingDeleted = TRUE;
 

-       if ( s_lastMouseWindow == this )
-       {
-               s_lastMouseWindow = NULL ;
-       }
+#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 ( gFocusWindow == this )
     {
 
     if ( gFocusWindow == this )
     {

-       gFocusWindow = NULL ;
+        gFocusWindow = NULL ;

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

-
-       if ( m_macWindowData )
-       {
-               wxToolTip::NotifyWindowDelete(m_macWindowData->m_macWindow) ;
-       UMADisposeWindow( m_macWindowData->m_macWindow ) ;
-       delete m_macWindowData ;
-       wxRemoveMacWindowAssociation( this ) ;
-    }

 }
 
 // Constructor
 }
 
 // Constructor

-bool wxWindow::Create(wxWindow *parent, wxWindowID id,
+bool wxWindowMac::Create(wxWindowMac *parent, wxWindowID id,

            const wxPoint& pos,
            const wxSize& size,
            long style,
            const wxString& name)
 {
            const wxPoint& pos,
            const wxSize& size,
            long style,
            const wxString& name)
 {

-    wxCHECK_MSG( parent, FALSE, wxT("can't create wxWindow without parent") );
+    wxCHECK_MSG( parent, FALSE, wxT("can't create wxWindowMac without parent") );

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

-       m_x = (int)pos.x;
-       m_y = (int)pos.y;
-       AdjustForParentClientOrigin(m_x, m_y, wxSIZE_USE_EXISTING);
-       m_width = WidthDefault( size.x );
-       m_height = HeightDefault( size.y ) ;
-
-       if ( ! IsKindOf( CLASSINFO ( wxControl ) ) && ! IsKindOf( CLASSINFO( wxStatusBar ) ) )
-       {
-       MacCreateScrollBars( style ) ;
-       }
-
+    m_x = (int)pos.x;
+    m_y = (int)pos.y;
+    AdjustForParentClientOrigin(m_x, m_y, wxSIZE_USE_EXISTING);
+    m_width = WidthDefault( size.x );
+    m_height = HeightDefault( size.y ) ;
+#ifndef __WXUNIVERSAL__
+    if ( ! IsKindOf( CLASSINFO ( wxControl ) ) && ! IsKindOf( CLASSINFO( wxStatusBar ) ) )
+    {
+        MacCreateScrollBars( style ) ;
+    }
+#endif

     return TRUE;
 }
 
     return TRUE;
 }
 

-void wxWindow::SetFocus()
-{
-       if ( gFocusWindow == this )
-               return ;
-               
-       if ( AcceptsFocus() )
-       {
-               if (gFocusWindow )
-               {
-                       #if wxUSE_CARET
-                           // Deal with caret
-                           if ( gFocusWindow->m_caret )
-                           {
-                                 gFocusWindow->m_caret->OnKillFocus();
-                           }
-                       #endif // wxUSE_CARET
-                       wxControl* control = wxDynamicCast( gFocusWindow , wxControl ) ;
-                       if ( control && control->GetMacControl() )
-                       {
-                               UMASetKeyboardFocus( gFocusWindow->GetMacRootWindow() , control->GetMacControl()  , kControlFocusNoPart ) ;
-                               control->MacRedrawControl() ;
-                       }
-               wxFocusEvent event(wxEVT_KILL_FOCUS, gFocusWindow->m_windowId);
-               event.SetEventObject(gFocusWindow);
-                       gFocusWindow->GetEventHandler()->ProcessEvent(event) ;
-               }
-               gFocusWindow = this ;
-               {
-                       #if wxUSE_CARET
-                   // Deal with caret
-                   if ( m_caret )
-                   {
-                       m_caret->OnSetFocus();
-                   }
-                       #endif // wxUSE_CARET
-                       // panel wants to track the window which was the last to have focus in it
-               wxPanel *panel = wxDynamicCast(GetParent(), wxPanel);
-               if ( panel )
-               {
-                       panel->SetLastFocus(this);
-               }
-                       wxControl* control = wxDynamicCast( gFocusWindow , wxControl ) ;
-                       if ( control && control->GetMacControl() )
-                       {
-                               UMASetKeyboardFocus( gFocusWindow->GetMacRootWindow() , control->GetMacControl()  , kControlEditTextPart ) ;
-                       }
-
-               wxFocusEvent event(wxEVT_SET_FOCUS, m_windowId);
-               event.SetEventObject(this);
-                       GetEventHandler()->ProcessEvent(event) ;
-               }
-       }
-}
-
-bool wxWindow::Enable(bool enable)
+void wxWindowMac::SetFocus()
+{
+    if ( gFocusWindow == this )
+        return ;
+    
+    if ( AcceptsFocus() )
+    {
+        if (gFocusWindow )
+        {
+            #if wxUSE_CARET
+                // Deal with caret
+                if ( gFocusWindow->m_caret )
+                {
+                      gFocusWindow->m_caret->OnKillFocus();
+                }
+            #endif // wxUSE_CARET
+      #ifndef __WXUNIVERSAL__
+            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) ;
+        }
+        gFocusWindow = this ;
+        {
+            #if wxUSE_CARET
+            // Deal with caret
+            if ( m_caret )
+            {
+                m_caret->OnSetFocus();
+            }
+            #endif // wxUSE_CARET
+            // panel wants to track the window which was the last to have focus in it
+            wxChildFocusEvent eventFocus(this);
+            GetEventHandler()->ProcessEvent(eventFocus);
+
+      #ifndef __WXUNIVERSAL__
+            wxControl* control = wxDynamicCast( gFocusWindow , wxControl ) ;
+            if ( control && control->GetMacControl() )
+            {
+                UMASetKeyboardFocus( (WindowRef) gFocusWindow->MacGetRootWindow() , (ControlHandle) control->GetMacControl()  , kControlFocusNextPart ) ;
+            }
+      #endif
+            wxFocusEvent event(wxEVT_SET_FOCUS, m_windowId);
+            event.SetEventObject(this);
+            GetEventHandler()->ProcessEvent(event) ;
+        }
+    }
+}
+
+bool wxWindowMac::Enable(bool enable)

 {
     if ( !wxWindowBase::Enable(enable) )
         return FALSE;
 
 {
     if ( !wxWindowBase::Enable(enable) )
         return FALSE;
 

-    wxWindowList::Node *node = GetChildren().GetFirst();
-    while ( node )
-    {
-        wxWindow *child = node->GetData();
-        child->Enable(enable);
-
-        node = node->GetNext();
-    }
+    MacSuperEnabled( enable ) ;

 
     return TRUE;
 }
 
 
     return TRUE;
 }
 

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

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

-void wxWindow::ReleaseMouse()
+wxWindow* wxWindowBase::GetCapture()
+{
+    return wxTheApp->s_captureWindow ;
+}
+
+void wxWindowMac::DoReleaseMouse()

 {
     wxTheApp->s_captureWindow = NULL ;
 }
 
 #if    wxUSE_DRAG_AND_DROP
 
 {
     wxTheApp->s_captureWindow = NULL ;
 }
 
 #if    wxUSE_DRAG_AND_DROP
 

-void wxWindow::SetDropTarget(wxDropTarget *pDropTarget)
+void wxWindowMac::SetDropTarget(wxDropTarget *pDropTarget)

 {
 {

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

   }
 
   }
 

-  m_pDropTarget = pDropTarget;
-  if ( m_pDropTarget != 0 )
+  m_dropTarget = pDropTarget;
+  if ( m_dropTarget != 0 )

   {
     // TODO
   }
   {
     // TODO
   }


@@ -319,113 +306,139 @@ void wxWindow::SetDropTarget(wxDropTarget *pDropTarget)
 #endif
 
 // Old style file-manager drag&drop
 #endif
 
 // Old style file-manager drag&drop

-void wxWindow::DragAcceptFiles(bool accept)
+void wxWindowMac::DragAcceptFiles(bool accept)

 {
     // TODO
 }
 
 // Get total size
 {
     // TODO
 }
 
 // Get total size

-void wxWindow::DoGetSize(int *x, int *y) const
+void wxWindowMac::DoGetSize(int *x, int *y) const

 {
 {

-    *x = m_width ;
-    *y = m_height ;
+     if(x)   *x = m_width ;
+     if(y)   *y = m_height ;

 }
 
 }
 

-void wxWindow::DoGetPosition(int *x, int *y) const
+void wxWindowMac::DoGetPosition(int *x, int *y) const

 {
 {

-    *x = m_x ;
-    *y = m_y ;
-    if (GetParent())
+    int xx,yy;
+ 
+    xx = m_x ;
+    yy = m_y ;
+    if ( !IsTopLevel() && GetParent())

     {
         wxPoint pt(GetParent()->GetClientAreaOrigin());
     {
         wxPoint pt(GetParent()->GetClientAreaOrigin());

-        *x -= pt.x;
-        *y -= pt.y;
+        xx -= pt.x;
+        yy -= pt.y;

     }
     }

+    if(x)   *x = xx;
+    if(y)   *y = yy;

 }
 
 }
 

-
-bool wxWindow::DoPopupMenu(wxMenu *menu, int x, int y)
+#if wxUSE_MENUS
+bool wxWindowMac::DoPopupMenu(wxMenu *menu, int x, int y)

 {
 {

-       menu->SetInvokingWindow(this);
+    menu->SetInvokingWindow(this);

     menu->UpdateUI();
     menu->UpdateUI();

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

 
   return TRUE;
 }
 
   return TRUE;
 }

+#endif

 
 

-void wxWindow::DoScreenToClient(int *x, int *y) const
+void wxWindowMac::DoScreenToClient(int *x, int *y) const

 {
 {

-       WindowRef window = GetMacRootWindow() ;
+    WindowRef window = (WindowRef) MacGetRootWindow() ;
+
+    Point       localwhere = {0,0} ;
+
+    if(x)   localwhere.h = * x ;
+    if(y)   localwhere.v = * y ;
+
+    GrafPtr     port ;  
+    ::GetPort( &port ) ;
+    ::SetPort( UMAGetWindowPort( window ) ) ;
+    ::GlobalToLocal( &localwhere ) ;
+    ::SetPort( port ) ;
+
+    if(x)   *x = localwhere.h ;
+    if(y)   *y = localwhere.v ;
+    
+    MacRootWindowToWindow( x , y ) ;
+    if ( x )
+            x -= MacGetLeftBorderSize() ;
+    if ( y )
+            y -= MacGetTopBorderSize() ;
+}

 
 

-       Point           localwhere ;
-       localwhere.h = * x ;
-       localwhere.v = * y ;
+void wxWindowMac::DoClientToScreen(int *x, int *y) const
+{
+    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 ;
+    
+    GrafPtr     port ;  
+    ::GetPort( &port ) ;
+    ::SetPort( UMAGetWindowPort( window ) ) ;

 
 

-       GrafPtr         port ;  
-       ::GetPort( &port ) ;
-       ::SetPort( UMAGetWindowPort( window ) ) ;
-       ::GlobalToLocal( &localwhere ) ;
-       ::SetPort( port ) ;
+    ::LocalToGlobal( &localwhere ) ;
+    ::SetPort( port ) ;
+    if(x)   *x = localwhere.h ;
+    if(y)   *y = localwhere.v ;
+}

 
 

-       *x = localwhere.h ;
-       *y = localwhere.v ;
-       
-       MacRootWindowToClient( x , y ) ;
+void wxWindowMac::MacClientToRootWindow( int *x , int *y ) const
+{
+    wxPoint origin = GetClientAreaOrigin() ;
+    if(x)   *x += origin.x ;
+    if(y)   *y += origin.y ;
+    
+    MacWindowToRootWindow( x , y ) ;

 }
 
 }
 

-void wxWindow::DoClientToScreen(int *x, int *y) const
+void wxWindowMac::MacRootWindowToClient( int *x , int *y ) const

 {
 {

-       WindowRef window = GetMacRootWindow() ;
-       
-       MacClientToRootWindow( x , y ) ;
-       
-       Point           localwhere ;
-       localwhere.h = * x ;
-       localwhere.v = * y ;
-       
-       GrafPtr         port ;  
-       ::GetPort( &port ) ;
-       ::SetPort( UMAGetWindowPort( window ) ) ;
-       ::SetOrigin( 0 , 0 ) ;
-       ::LocalToGlobal( &localwhere ) ;
-       ::SetPort( port ) ;
-       *x = localwhere.h ;
-       *y = localwhere.v ;
+    wxPoint origin = GetClientAreaOrigin() ;
+    MacRootWindowToWindow( x , y ) ;
+    if(x)   *x -= origin.x ;
+    if(y)   *y -= origin.y ;

 }
 
 }
 

-void wxWindow::MacClientToRootWindow( int *x , int *y ) const
+void wxWindowMac::MacWindowToRootWindow( int *x , int *y ) const

 {
 {

-       if ( m_macWindowData )
-       {
-       }
-       else
-       {
-               *x += m_x ;
-               *y += m_y ;
-               GetParent()->MacClientToRootWindow( x , y ) ;
-       }
+    if ( !IsTopLevel() )
+    {
+        if(x)   *x += m_x ;
+        if(y)   *y += m_y ;
+        GetParent()->MacWindowToRootWindow( x , y ) ;
+    }

 }
 
 }
 

-void wxWindow::MacRootWindowToClient( int *x , int *y ) const
+void wxWindowMac::MacRootWindowToWindow( int *x , int *y ) const

 {
 {

-       if ( m_macWindowData )
-       {
-       }
-       else
-       {
-               *x -= m_x ;
-               *y -= m_y ;
-               GetParent()->MacRootWindowToClient( x , y ) ;
-       }
+    if ( !IsTopLevel() )
+    {
+        if(x)   *x -= m_x ;
+        if(y)   *y -= m_y ;
+        GetParent()->MacRootWindowToWindow( x , y ) ;
+    }

 }
 
 }
 

-bool wxWindow::SetCursor(const wxCursor& cursor)
+bool wxWindowMac::SetCursor(const wxCursor& cursor)

 {
     if (m_cursor == cursor)
        return FALSE;
 {
     if (m_cursor == cursor)
        return FALSE;


@@ -445,17 +458,17 @@ bool wxWindow::SetCursor(const wxCursor& cursor)
                   wxT("cursor must be valid after call to the base version"));
 
   Point pt ;
                   wxT("cursor must be valid after call to the base version"));
 
   Point pt ;

-  wxWindow *mouseWin ;
+  wxWindowMac *mouseWin ;

   GetMouse( &pt ) ;
   
   // Change the cursor NOW if we're within the correct window
 
   if ( MacGetWindowFromPoint( wxPoint( pt.h , pt.v ) , &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() )
-       {
-               m_cursor.MacInstall() ;
-       }
+    if ( mouseWin == this && !wxIsBusy() )
+    {
+        m_cursor.MacInstall() ;
+    }

   }
 
   return TRUE ;
   }
 
   return TRUE ;


@@ -463,57 +476,59 @@ bool wxWindow::SetCursor(const wxCursor& cursor)
 
 
 // Get size *available for subwindows* i.e. excluding menu bar etc.
 
 
 // Get size *available for subwindows* i.e. excluding menu bar etc.

-void wxWindow::DoGetClientSize(int *x, int *y) const
+void wxWindowMac::DoGetClientSize(int *x, int *y) const

 {
 {

-    *x = m_width ;
-    *y = m_height ;
+    int ww, hh;
+    ww = m_width ;
+    hh = m_height ;

 
 

-       *x -= MacGetLeftBorderSize(  )  + MacGetRightBorderSize(  ) ;
-       *y -= MacGetTopBorderSize(  ) + MacGetBottomBorderSize( );
-       
+    ww -= MacGetLeftBorderSize(  )  + MacGetRightBorderSize(  ) ;
+    hh -= MacGetTopBorderSize(  ) + MacGetBottomBorderSize( );
+    

   if ( (m_vScrollBar && m_vScrollBar->IsShown()) || (m_hScrollBar  && m_hScrollBar->IsShown()) )
   {
   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 ) ;
-       
-       WindowRef window = NULL ;
-       wxWindow *iter = (wxWindow*)this ;
-       
-       int totW = 10000 , totH = 10000;
-       while( iter )
-       {
-               if ( iter->m_macWindowData )
-               {
-                       totW = iter->m_width ;
-                       totH = iter->m_height ;
-                       break ;
-               }
-
-               iter = iter->GetParent() ;
-       } 
-       
-       if (m_hScrollBar  && m_hScrollBar->IsShown() )
-       {
-               (*y) -= MAC_SCROLLBAR_SIZE;
-               if ( h-y1 >= totH )
-               {
-                       (*y)+= 1 ;
-               }
-    }
-       if (m_vScrollBar  && m_vScrollBar->IsShown() )
-       {
-       (*x) -= MAC_SCROLLBAR_SIZE;
-               if ( w-x1 >= totW )
-               {
-               (*x) += 1 ;
-       }
-       }
+    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 ( iter->IsTopLevel() )
+        {
+            totW = iter->m_width ;
+            totH = iter->m_height ;
+            break ;
+        }
+
+        iter = iter->GetParent() ;
+    } 
+    
+    if (m_hScrollBar  && m_hScrollBar->IsShown() )
+    {
+        hh -= MAC_SCROLLBAR_SIZE;
+        if ( h-y1 >= totH )
+        {
+            hh += 1 ;
+        }
+    }
+    if (m_vScrollBar  && m_vScrollBar->IsShown() )
+    {
+        ww -= MAC_SCROLLBAR_SIZE;
+        if ( w-x1 >= totW )
+        {
+            ww += 1 ;
+        }
+    }

   }
   }

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

 }
 
 
 }
 
 


@@ -523,19 +538,84 @@ void wxWindow::DoGetClientSize(int *x, int *y) const
 
 #if wxUSE_TOOLTIPS
 
 
 #if wxUSE_TOOLTIPS
 

-void wxWindow::DoSetToolTip(wxToolTip *tooltip)
+void wxWindowMac::DoSetToolTip(wxToolTip *tooltip)

 {
     wxWindowBase::DoSetToolTip(tooltip);
 
 {
     wxWindowBase::DoSetToolTip(tooltip);
 

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

 }
 
 #endif // wxUSE_TOOLTIPS
 
 }
 
 #endif // wxUSE_TOOLTIPS
 

-void wxWindow::DoMoveWindow(int x, int y, int width, int height)
+void wxWindowMac::DoMoveWindow(int x, int y, int width, int height)

 {
 {

-       DoSetSize( x,y, width, height ) ;
+    int former_x = m_x ;
+    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)) 
+        actualWidth = m_minWidth;
+    if ((m_minHeight != -1) && (actualHeight < m_minHeight)) 
+        actualHeight = m_minHeight;
+    if ((m_maxWidth != -1) && (actualWidth > m_maxWidth)) 
+        actualWidth = m_maxWidth;
+    if ((m_maxHeight != -1) && (actualHeight > m_maxHeight)) 
+        actualHeight = m_maxHeight;
+
+    bool doMove = false ;
+    bool doResize = false ;
+    
+    if ( actualX != former_x || actualY != former_y )
+    {
+        doMove = true ;
+    }
+    if ( actualWidth != former_w || actualHeight != former_h )
+    {
+        doResize = true ;
+    }
+
+    if ( doMove || doResize )
+    {
+        // erase former position
+
+        Refresh() ;
+
+        m_x = actualX ;
+        m_y = actualY ;
+        m_width = actualWidth ;
+        m_height = actualHeight ;
+
+        // erase new position
+
+        Refresh() ;
+        if ( doMove )
+            wxWindowMac::MacSuperChangedPosition() ; // like this only children will be notified
+
+        MacRepositionScrollBars() ;
+        if ( doMove )
+        {
+            wxPoint point(m_x, m_y);
+            wxMoveEvent event(point, m_windowId);
+            event.SetEventObject(this);
+            GetEventHandler()->ProcessEvent(event) ;
+        }
+        if ( doResize )
+        {
+             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,


@@ -546,407 +626,233 @@ void wxWindow::DoMoveWindow(int x, int y, int width, int height)
 // If sizeFlags contains wxSIZE_AUTO_WIDTH/HEIGHT flags (default), we calculate
 // the width/height to best suit our contents, otherwise we reuse the current
 // width/height
 // If sizeFlags contains wxSIZE_AUTO_WIDTH/HEIGHT flags (default), we calculate
 // the width/height to best suit our contents, otherwise we reuse the current
 // width/height

-void wxWindow::DoSetSize(int x, int y, int width, int height, int sizeFlags)
+void wxWindowMac::DoSetSize(int x, int y, int width, int height, int sizeFlags)

 {
 {

+    // get the current size and position...
+    int currentX, currentY;
+    GetPosition(&currentX, &currentY);
+    
+    int currentW,currentH;
+    GetSize(&currentW, &currentH);

 
 

-       int former_x = m_x ;
-       int former_y = m_y ;
-       int former_w = m_width ;
-       int former_h = m_height ;
-       
-  int currentX, currentY;
-  GetPosition(&currentX, &currentY);
-  int currentW,currentH;
-  GetSize(&currentW, &currentH);
-
-  int actualWidth = width;
-  int actualHeight = height;
-  int actualX = x;
-  int actualY = y;
-  if (x == -1 && !(sizeFlags & wxSIZE_ALLOW_MINUS_ONE))
-      actualX = currentX;
-  if (y == -1 && !(sizeFlags & wxSIZE_ALLOW_MINUS_ONE))
-      actualY = currentY;
-  
-  wxSize size( -1 , -1 ) ;
-  
-  if (width == -1 || height == -1 )
-  {
-       size = DoGetBestSize() ;
-  }
-  
-  if ( width == -1 )
-  {
-       if ( sizeFlags & wxSIZE_AUTO_WIDTH )
+    // ... and don't do anything (avoiding flicker) if it's already ok
+    if ( x == currentX && y == currentY &&
+         width == currentW && height == currentH )

     {
     {

-      actualWidth = size.x ;   
-      if ( actualWidth == -1 )
-       actualWidth = 80 ;
+        MacRepositionScrollBars() ; // we might have a real position shift
+        return;

     }
     }

-    else
+
+    if ( x == -1 && !(sizeFlags & wxSIZE_ALLOW_MINUS_ONE) )
+        x = currentX;
+    if ( y == -1 && !(sizeFlags & wxSIZE_ALLOW_MINUS_ONE) )
+        y = currentY;
+
+    AdjustForParentClientOrigin(x, y, sizeFlags);
+
+    wxSize size(-1, -1);
+    if ( width == -1 )

     {
     {

-      actualWidth = currentW ;
+        if ( sizeFlags & wxSIZE_AUTO_WIDTH )
+        {
+            size = DoGetBestSize();
+            width = size.x;
+        }
+        else
+        {
+            // just take the current one
+            width = currentW;
+        }

     }
     }

-  }
-  if (height == -1)
-  {
-       if ( sizeFlags & wxSIZE_AUTO_HEIGHT )
-       {
-               actualHeight = size.y ;
-               if ( actualHeight == -1 )
-                       actualHeight = 26 ;
-       }
-       else 
-       {
-      actualHeight = currentH ;
+
+    if ( height == -1 )
+    {
+        if ( sizeFlags & wxSIZE_AUTO_HEIGHT )
+        {
+            if ( size.x == -1 )
+            {
+                size = DoGetBestSize();
+            }
+            //else: already called DoGetBestSize() above
+
+            height = size.y;
+        }
+        else
+        {
+            // just take the current one
+            height = currentH;
+        }

     }
     }

-  }

 
 

-    if ((m_minWidth != -1) && (actualWidth < m_minWidth)) 
-       actualWidth = m_minWidth;
-    if ((m_minHeight != -1) && (actualHeight < m_minHeight)) 
-       actualHeight = m_minHeight;
-    if ((m_maxWidth != -1) && (actualWidth > m_maxWidth)) 
-       actualWidth = m_maxWidth;
-    if ((m_maxHeight != -1) && (actualHeight > m_maxHeight)) 
-       actualHeight = m_maxHeight;
-       if ( actualX == currentX && actualY == currentY && actualWidth == currentW && actualHeight == currentH)
-       {
-               MacRepositionScrollBars() ; // we might have a real position shift
-               return ;
-       }
-
-       AdjustForParentClientOrigin(actualX, actualY, sizeFlags);
-       
-       
-       bool doMove = false ;
-       bool doResize = false ;
-       
-       if ( actualX != former_x || actualY != former_y )
-       {
-               doMove = true ;
-       }
-       if ( actualWidth != former_w || actualHeight != former_h )
-       {
-               doResize = true ;
-       }
-
-       if ( doMove || doResize )
-       {
-               if ( m_macWindowData )
-               {
-               }
-               else
-               {
-                       // erase former position
-                       wxMacDrawingHelper focus( this ) ;
-                       if ( focus.Ok() )
-                       {
-                               Rect clientrect = { 0 , 0 , m_height , m_width } ;
-                               ClipRect( &clientrect ) ;
-                       InvalWindowRect( GetMacRootWindow() , &clientrect ) ;
-                       }
-               }
-               m_x = actualX ;
-               m_y = actualY ;
-               m_width = actualWidth ;
-               m_height = actualHeight ;
-               if ( m_macWindowData )
-               {
-                       if ( doMove )
-                               ::MoveWindow(m_macWindowData->m_macWindow, m_x, m_y  , false); // don't make frontmost
-                       
-                       if ( doResize )
-                               ::SizeWindow(m_macWindowData->m_macWindow, m_width, m_height  , true); 
-                       
-                       // the OS takes care of invalidating and erasing the new area
-                       // we have erased the old one   
-                       
-                       if ( IsKindOf( CLASSINFO( wxFrame ) ) )
-                       {
-                               wxFrame* frame = (wxFrame*) this ;
-                               frame->PositionStatusBar();
-                               frame->PositionToolBar();
-                       }
-               }
-               else
-               {
-                       // erase new position
-                       
-                       {
-                               wxMacDrawingHelper focus( this ) ;
-                               if ( focus.Ok() )
-                               {
-                                       Rect clientrect = { 0 , 0 , m_height , m_width } ;
-                                       ClipRect( &clientrect ) ;
-                               InvalWindowRect( GetMacRootWindow() , &clientrect ) ;
-                               }
-                       }
-                       
-                       if ( doMove )
-                               wxWindow::MacSuperChangedPosition() ; // like this only children will be notified
-               }
-               MacRepositionScrollBars() ;
-               if ( doMove )
-               {
-               wxMoveEvent event(wxPoint(m_x, m_y), m_windowId);
-               event.SetEventObject(this);
-               GetEventHandler()->ProcessEvent(event) ;
-       }
-       if ( doResize )
-       {
-                       MacRepositionScrollBars() ;
-               wxSizeEvent event(wxSize(m_width, m_height), m_windowId);
-               event.SetEventObject(this);
-               GetEventHandler()->ProcessEvent(event);
-       }
-       }
+    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
 

-wxPoint wxWindow::GetClientAreaOrigin() const
+wxPoint wxWindowMac::GetClientAreaOrigin() const

 {
     return wxPoint(MacGetLeftBorderSize(  ) , MacGetTopBorderSize(  ) );
 }
 
 {
     return wxPoint(MacGetLeftBorderSize(  ) , MacGetTopBorderSize(  ) );
 }
 

-// Makes an adjustment to the window position (for example, a frame that has
-// a toolbar that it manages itself).
-void wxWindow::AdjustForParentClientOrigin(int& x, int& y, int sizeFlags)
-{
-       if( !m_macWindowData )
-       {
-    if (((sizeFlags & wxSIZE_NO_ADJUSTMENTS) == 0) && GetParent())
-    {
-        wxPoint pt(GetParent()->GetClientAreaOrigin());
-        x += pt.x; y += pt.y;
-    }
-   }
-}
-
-void wxWindow::SetTitle(const wxString& title)
+void wxWindowMac::SetTitle(const wxString& title)

 {
 {

-       m_label = title ;
-       
-       wxString label ;
-       
-       if( wxApp::s_macDefaultEncodingIsPC )
-               label = wxMacMakeMacStringFromPC( title ) ;
-       else
-               label = title ;
-
-       if ( m_macWindowData )
-       UMASetWTitleC( m_macWindowData->m_macWindow , label ) ;
+    m_label = title ;

 }
 
 }
 

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

 {
 {

-       return m_label ;
+    return m_label ;

 }
 
 }
 

-bool wxWindow::Show(bool show)
+bool wxWindowMac::Show(bool show)

 {
     if ( !wxWindowBase::Show(show) )
         return FALSE;
 
 {
     if ( !wxWindowBase::Show(show) )
         return FALSE;
 

-       if ( m_macWindowData )
-       {
-         if (show)
-         {
-               UMAShowWindow( m_macWindowData->m_macWindow ) ;
-               UMASelectWindow( m_macWindowData->m_macWindow ) ;
-               // no need to generate events here, they will get them triggered by macos
-               // actually they should be , but apparently they are not
-           wxSizeEvent event(wxSize(m_width, m_height), m_windowId);
-           event.SetEventObject(this);
-           GetEventHandler()->ProcessEvent(event);
-         }
-         else
-         {
-               UMAHideWindow( m_macWindowData->m_macWindow ) ;
-         }
-       }
-       MacSuperShown( show ) ;
-       Refresh() ;
-
+/*
+    WindowRef window = (WindowRef) MacGetRootWindow() ;
+    wxWindowMac* win = wxFindWinFromMacWindow( window ) ;
+    if ( win == NULL && win->m_isBeingDeleted )
+        return FALSE ;
+*/       
+    MacSuperShown( show ) ;
+    Refresh() ; 
+/*      
+    if ( !show )
+    {
+        if ( win && !win->m_isBeingDeleted )
+            Refresh() ; 
+    }
+    else
+    {
+        Refresh() ; 
+    }
+*/

     return TRUE;
 }
 
     return TRUE;
 }
 

-void wxWindow::MacSuperShown( bool show ) 
-{
-       wxNode *node = GetChildren().First();
-       while ( node )
-       {
-               wxWindow *child = (wxWindow *)node->Data();
-               if ( child->m_isShown )
-                       child->MacSuperShown( show ) ;
-               node = node->Next();
-       }
-}
-
-bool wxWindow::MacIsReallyShown() const 
-{
-       if ( m_isShown && (m_parent != NULL) ) {
-               return m_parent->MacIsReallyShown();
-       }
-       return m_isShown;
-/*     
-       bool status = m_isShown ;
-       wxWindow * win = this ;
-       while ( status && win->m_parent != NULL )
-       {
-               win = win->m_parent ;
-               status = win->m_isShown ;
-       }
-       return status ;
+void wxWindowMac::MacSuperShown( bool show ) 
+{
+    wxNode *node = GetChildren().First();
+    while ( node )
+    {
+        wxWindowMac *child = (wxWindowMac *)node->Data();
+        if ( child->m_isShown )
+            child->MacSuperShown( show ) ;
+        node = node->Next();
+    }
+}
+
+void wxWindowMac::MacSuperEnabled( bool enabled ) 
+{
+    if ( !IsTopLevel() )
+    {
+      // 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
+    }
+    wxNode *node = GetChildren().First();
+    while ( node )
+    {
+        wxWindowMac *child = (wxWindowMac *)node->Data();
+        if ( child->m_isShown )
+            child->MacSuperEnabled( enabled ) ;
+        node = node->Next();
+    }
+}
+
+bool wxWindowMac::MacIsReallyShown() const 
+{
+    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 )
+    {
+        win = win->m_parent ;
+        status = win->m_isShown ;
+    }
+    return status ;

 */
 }
 
 */
 }
 

-int wxWindow::GetCharHeight() const
+int wxWindowMac::GetCharHeight() const

 {
 {

-       wxClientDC dc ( (wxWindow*)this ) ;
-       return dc.GetCharHeight() ;
+    wxClientDC dc ( (wxWindowMac*)this ) ;
+    return dc.GetCharHeight() ;

 }
 
 }
 

-int wxWindow::GetCharWidth() const
+int wxWindowMac::GetCharWidth() const

 {
 {

-       wxClientDC dc ( (wxWindow*)this ) ;
-       return dc.GetCharWidth() ;
+    wxClientDC dc ( (wxWindowMac*)this ) ;
+    return dc.GetCharWidth() ;

 }
 
 }
 

-void wxWindow::GetTextExtent(const wxString& string, int *x, int *y,
+void wxWindowMac::GetTextExtent(const wxString& string, int *x, int *y,

                            int *descent, int *externalLeading, const wxFont *theFont ) const
 {
     const wxFont *fontToUse = theFont;
     if ( !fontToUse )
         fontToUse = &m_font;
         
                            int *descent, int *externalLeading, const wxFont *theFont ) const
 {
     const wxFont *fontToUse = theFont;
     if ( !fontToUse )
         fontToUse = &m_font;
         

-    wxClientDC dc( (wxWindow*) this ) ;
+    wxClientDC dc( (wxWindowMac*) this ) ;

     long lx,ly,ld,le ;
     dc.GetTextExtent( string , &lx , &ly , &ld, &le, (wxFont *)fontToUse ) ;
     if ( externalLeading )
     long lx,ly,ld,le ;
     dc.GetTextExtent( string , &lx , &ly , &ld, &le, (wxFont *)fontToUse ) ;
     if ( externalLeading )

-       *externalLeading = le ;
+        *externalLeading = le ;

     if ( descent )
     if ( descent )

-       *descent = ld ;
+        *descent = ld ;

     if ( x )
     if ( x )

-       *x = lx ;
+        *x = lx ;

     if ( y )
     if ( y )

-       *y = ly ;
+        *y = ly ;

 }
 
 }
 

-void wxWindow::MacEraseBackground( Rect *rect )
-{

 /*
 /*

-       WindowRef window = GetMacRootWindow() ;
-       if ( m_backgroundColour == wxSystemSettings::GetSystemColour(wxSYS_COLOUR_APPWORKSPACE) )
-       {
-                       UMASetThemeWindowBackground( 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
-               
-                       wxWindow* parent = GetParent() ;
-                       while( parent )
-                       {
-                               if ( parent->m_backgroundColour != wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DFACE ) )
-                               {
-                                       // if we have any other colours in the hierarchy
-                               RGBBackColor( &parent->m_backgroundColour.GetPixel()) ;
-                               break ;
-                               }
-                               if( parent->IsKindOf( CLASSINFO( wxControl ) ) && ((wxControl*)parent)->GetMacControl() )
-                               {
-                                       // 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 ) ))
-                                       {
-                                               UMAApplyThemeBackground(kThemeBackgroundTabPane, rect, 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
-                               UMASetThemeWindowBackground( window , kThemeBrushDialogBackgroundActive , false ) ;
-                       }
-       }
-       else
-       {
-               RGBBackColor( &m_backgroundColour.GetPixel()) ;
-       }
-
-       EraseRect( rect ) ;     
-       
-       for (wxNode *node = GetChildren().First(); node; node = node->Next())
-       {
-               wxWindow *child = (wxWindow*)node->Data();
-               
-               Rect clientrect = { child->m_x , child->m_y , child->m_x +child->m_width , child->m_y + child->m_height } ;
-               SectRect( &clientrect , rect , &clientrect ) ;          
-
-               OffsetRect( &clientrect , -child->m_x , -child->m_y ) ;
-               if ( child->GetMacRootWindow() == window && child->IsShown() )
-               {
-                       wxMacDrawingClientHelper focus( this ) ;
-                       if ( focus.Ok() )
-                       {
-                               child->MacEraseBackground( &clientrect ) ;
-                       }
-               }
-       }
-*/
-}
-
-void wxWindow::Refresh(bool eraseBack, const wxRect *rect)
-{
-//    if ( !IsShown() )
-//        return ;
-        
-       wxMacDrawingHelper focus( this ) ;
-       if ( focus.Ok() )
-       {
-               Rect clientrect = { 0 , 0 , m_height , m_width } ;
-               ClipRect( &clientrect ) ;
-
-       if ( rect )
-       {
-               Rect r = { rect->y , rect->x , rect->y + rect->height , rect->x + rect->width } ;
-                       SectRect( &clientrect , &r , &clientrect ) ;            
-       }
-       InvalWindowRect( GetMacRootWindow() , &clientrect ) ;
-       }
-       if ( !eraseBack )
-               m_macEraseOnRedraw = false ;
-       else
-               m_macEraseOnRedraw = true ;
-}
-
-// Responds to colour changes: passes event on to children.
-void wxWindow::OnSysColourChanged(wxSysColourChangedEvent& event)
-{
-    wxNode *node = GetChildren().First();
-    while ( node )
+ * 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
+ */
+ 
+void wxWindowMac::Refresh(bool eraseBack, const wxRect *rect)
+{
+    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)))

     {
     {

-        // Only propagate to non-top-level windows
-        wxWindow *win = (wxWindow *)node->Data();
-        if ( win->GetParent() )
-        {
-            wxSysColourChangedEvent event2;
-            event.m_eventObject = win;
-            win->GetEventHandler()->ProcessEvent(event2);
-        }
+        // buttons have an "aura"
+        y1 -= 5;
+        x1 -= 5;
+        y2 += 5;
+        x2 += 5;
+    }

 
 

-        node = node->Next();
+    Rect clientrect = { y1, x1, y2, x2 };
+    
+    if ( rect )
+    {
+        Rect r = { rect->y , rect->x , rect->y + rect->height , rect->x + rect->width } ;
+        SectRect( &clientrect , &r , &clientrect ) ;        
+    }
+    
+    if ( !EmptyRect( &clientrect ) )
+    {
+      int top = 0 , left = 0 ;
+      
+      MacClientToRootWindow( &left , &top ) ;
+      OffsetRect( &clientrect , left , top ) ;
+      
+      MacGetTopLevelWindow()->MacInvalidate( &clientrect , eraseBack ) ;

     }
 }
 
     }
 }
 


@@ -955,36 +861,36 @@ void wxWindow::OnSysColourChanged(wxSysColourChangedEvent& event)
 // Caret manipulation
 // ---------------------------------------------------------------------------
 
 // Caret manipulation
 // ---------------------------------------------------------------------------
 

-void wxWindow::CreateCaret(int w, int h)
+void wxWindowMac::CreateCaret(int w, int h)

 {
     SetCaret(new wxCaret(this, w, h));
 }
 
 {
     SetCaret(new wxCaret(this, w, h));
 }
 

-void wxWindow::CreateCaret(const wxBitmap *WXUNUSED(bitmap))
+void wxWindowMac::CreateCaret(const wxBitmap *WXUNUSED(bitmap))

 {
     wxFAIL_MSG("not implemented");
 }
 
 {
     wxFAIL_MSG("not implemented");
 }
 

-void wxWindow::ShowCaret(bool show)
+void wxWindowMac::ShowCaret(bool show)

 {
     wxCHECK_RET( m_caret, "no caret to show" );
 
     m_caret->Show(show);
 }
 
 {
     wxCHECK_RET( m_caret, "no caret to show" );
 
     m_caret->Show(show);
 }
 

-void wxWindow::DestroyCaret()
+void wxWindowMac::DestroyCaret()

 {
     SetCaret(NULL);
 }
 
 {
     SetCaret(NULL);
 }
 

-void wxWindow::SetCaretPos(int x, int y)
+void wxWindowMac::SetCaretPos(int x, int y)

 {
     wxCHECK_RET( m_caret, "no caret to move" );
 
     m_caret->Move(x, y);
 }
 
 {
     wxCHECK_RET( m_caret, "no caret to move" );
 
     m_caret->Move(x, y);
 }
 

-void wxWindow::GetCaretPos(int *x, int *y) const
+void wxWindowMac::GetCaretPos(int *x, int *y) const

 {
     wxCHECK_RET( m_caret, "no caret to get position of" );
 
 {
     wxCHECK_RET( m_caret, "no caret to get position of" );
 


@@ -992,426 +898,356 @@ void wxWindow::GetCaretPos(int *x, int *y) const
 }
 #endif // wxUSE_CARET
 
 }
 #endif // wxUSE_CARET
 

-wxWindow *wxGetActiveWindow()
+wxWindowMac *wxGetActiveWindow()

 {
     // actually this is a windows-only concept
     return NULL;
 }
 
 // Coordinates relative to the window
 {
     // actually this is a windows-only concept
     return NULL;
 }
 
 // Coordinates relative to the window

-void wxWindow::WarpPointer (int x_pos, int y_pos)
+void wxWindowMac::WarpPointer (int x_pos, int y_pos)

 {
     // We really dont move the mouse programmatically under mac
 }
 
 {
     // We really dont move the mouse programmatically under mac
 }
 

-void wxWindow::OnEraseBackground(wxEraseEvent& event)
-{
-    // TODO : probably we would adopt the EraseEvent structure
-}
-
-int wxWindow::GetScrollPos(int orient) const
+const wxBrush& wxWindowMac::MacGetBackgroundBrush() 

 {
 {

-               if ( orient == wxHORIZONTAL )
-               {
-                       if ( m_hScrollBar )
-                               return m_hScrollBar->GetThumbPosition() ;
-               }
-               else
-               {
-                       if ( m_vScrollBar )
-                               return m_vScrollBar->GetThumbPosition() ;
-               }
-    return 0;
-}
+    if ( m_backgroundColour == wxSystemSettings::GetColour(wxSYS_COLOUR_APPWORKSPACE) )
+    {
+        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 ) ;
+    }

 
 

-// This now returns the whole range, not just the number
-// of positions that we can scroll.
-int wxWindow::GetScrollRange(int orient) const
-{
-               if ( orient == wxHORIZONTAL )
-               {
-                       if ( m_hScrollBar )
-                               return m_hScrollBar->GetRange() ;
-               }
-               else
-               {
-                       if ( m_vScrollBar )
-                               return m_vScrollBar->GetRange() ;
-               }
-    return 0;
+    return m_macBackgroundBrush ;
+  

 }
 
 }
 

-int wxWindow::GetScrollThumb(int orient) const
+void wxWindowMac::OnEraseBackground(wxEraseEvent& event)

 {
 {

-               if ( orient == wxHORIZONTAL )
-               {
-                       if ( m_hScrollBar )
-                               return m_hScrollBar->GetThumbSize() ;
-               }
-               else
-               {
-                       if ( m_vScrollBar )
-                               return m_vScrollBar->GetThumbSize() ;
-               }
-    return 0;
+    event.GetDC()->Clear() ;

 }
 
 }
 

-void wxWindow::SetScrollPos(int orient, int pos, bool refresh)
+void wxWindowMac::OnNcPaint( wxNcPaintEvent& event )

 {
 {

-               if ( orient == wxHORIZONTAL )
-               {
-                       if ( m_hScrollBar )
-                               m_hScrollBar->SetThumbPosition( pos ) ;
-               }
-               else
-               {
-                       if ( m_vScrollBar )
-                               m_vScrollBar->SetThumbPosition( pos ) ;
-               }
+    wxWindowDC dc(this) ;
+    wxMacPortSetter helper(&dc) ;
+    
+    MacPaintBorders( dc.m_macLocalOrigin.x , dc.m_macLocalOrigin.y) ;

 }
 
 }
 

-void  wxWindow::MacCreateRealWindow( const wxString& title,
-           const wxPoint& pos,
-           const wxSize& size,
-           long style,
-           const wxString& name ) 
-{
-  SetName(name);
-  m_windowStyle = style;
-  m_isShown = FALSE;
-
-  // create frame.
-
-       Rect theBoundsRect;
-
-  m_x = (int)pos.x;
-  m_y = (int)pos.y;
-  if ( m_y < 50 )
-       m_y = 50 ;
-  if ( m_x < 20 )
-       m_x = 20 ;
-       
-  m_width = size.x;
-       if (m_width == -1) 
-               m_width = 20;
-  m_height = size.y;
-       if (m_height == -1) 
-               m_height = 20;
-
-       m_macWindowData = new MacWindowData() ;
-
-       ::SetRect(&theBoundsRect, m_x, m_y , m_x + m_width, m_y + m_height);
-
-       // translate the window attributes in the appropriate window class and attributes
-
-       WindowClass wclass = 0;
-       WindowAttributes attr = kWindowNoAttributes ;
-       
-       if ( HasFlag(wxTINY_CAPTION_HORIZ) ||  HasFlag(wxTINY_CAPTION_VERT) )
-       {
-               wclass = kFloatingWindowClass ;
-               if ( HasFlag(wxTINY_CAPTION_VERT) )
-               {
-                       attr |= kWindowSideTitlebarAttribute ;
-               }
-       }
-       else if ( HasFlag( wxCAPTION ) )
-       {
-               if ( HasFlag( wxDIALOG_MODAL ) )
-               {
-                       wclass = kMovableModalWindowClass ;
-               }
-               else 
-               {
-                       wclass = kDocumentWindowClass ;
-               }
-       }
-       else
-       {
-               wclass = kModalWindowClass ;
-       }
-       
-       if ( HasFlag( wxMINIMIZE_BOX ) || HasFlag( wxMAXIMIZE_BOX ) )
-       {
-               attr |= kWindowFullZoomAttribute ;
-               attr |= kWindowCollapseBoxAttribute ;
-       }
-       if ( HasFlag( wxRESIZE_BORDER ) )
-       {
-               attr |= kWindowResizableAttribute ;
-       }
-       if ( HasFlag( wxSYSTEM_MENU ) )
-       {
-               attr |= kWindowCloseBoxAttribute ;
-       }
-       
-       UMACreateNewWindow( wclass , attr , &theBoundsRect , &m_macWindowData->m_macWindow ) ;
-       wxAssociateWinWithMacWindow( m_macWindowData->m_macWindow , this ) ;
-       wxString label ;
-       if( wxApp::s_macDefaultEncodingIsPC )
-               label = wxMacMakeMacStringFromPC( title ) ;
-       else
-               label = title ;
-       UMASetWTitleC( m_macWindowData->m_macWindow , label ) ;
-       UMACreateRootControl( m_macWindowData->m_macWindow , &m_macWindowData->m_macRootControl ) ;
-
-       m_macWindowData->m_macFocus = NULL ;
-       m_macWindowData->m_macHasReceivedFirstActivate = true ;
-}
-
-void wxWindow::MacPaint( wxPaintEvent &event ) 
-{
-}
-
-void wxWindow::MacPaintBorders( ) 
-{
-       if( m_macWindowData )
-               return ;
-               
-       RGBColor white = { 0xFFFF, 0xFFFF , 0xFFFF } ;
-       RGBColor black = { 0x0000, 0x0000 , 0x0000 } ;
-       RGBColor face = { 0xDDDD, 0xDDDD , 0xDDDD } ;
-       RGBColor shadow = { 0x4444, 0x4444 , 0x4444 } ;
-       PenNormal() ;
+int wxWindowMac::GetScrollPos(int orient) const
+{
+    if ( orient == wxHORIZONTAL )
+    {
+       if ( m_hScrollBar )
+           return m_hScrollBar->GetThumbPosition() ;
+    }
+    else
+    {
+       if ( m_vScrollBar )
+           return m_vScrollBar->GetThumbPosition() ;
+    }
+    return 0;
+}
+
+// This now returns the whole range, not just the number
+// of positions that we can scroll.
+int wxWindowMac::GetScrollRange(int orient) const
+{
+    if ( orient == wxHORIZONTAL )
+    {
+       if ( m_hScrollBar )
+           return m_hScrollBar->GetRange() ;
+    }
+    else
+    {
+       if ( m_vScrollBar )
+           return m_vScrollBar->GetRange() ;
+    }
+    return 0;
+}
+
+int wxWindowMac::GetScrollThumb(int orient) const
+{
+    if ( orient == wxHORIZONTAL )
+    {
+       if ( m_hScrollBar )
+           return m_hScrollBar->GetThumbSize() ;
+    }
+    else
+    {
+       if ( m_vScrollBar )
+           return m_vScrollBar->GetThumbSize() ;
+    }
+    return 0;
+}
+
+void wxWindowMac::SetScrollPos(int orient, int pos, bool refresh)
+{
+    if ( orient == wxHORIZONTAL )
+    {
+       if ( m_hScrollBar )
+           m_hScrollBar->SetThumbPosition( pos ) ;
+    }
+    else
+    {
+       if ( m_vScrollBar )
+           m_vScrollBar->SetThumbPosition( pos ) ;
+    }
+}
+
+void wxWindowMac::MacPaintBorders( int left , int top ) 
+{
+    if( IsTopLevel() )
+        return ;
+        
+    RGBColor white = { 0xFFFF, 0xFFFF , 0xFFFF } ;
+    RGBColor black = { 0x0000, 0x0000 , 0x0000 } ;
+    RGBColor face = { 0xDDDD, 0xDDDD , 0xDDDD } ;
+    RGBColor shadow = { 0x4444, 0x4444 , 0x4444 } ;
+    PenNormal() ;

 
     if (HasFlag(wxRAISED_BORDER) || HasFlag( wxSUNKEN_BORDER) || HasFlag(wxDOUBLE_BORDER) )
     {
 
     if (HasFlag(wxRAISED_BORDER) || HasFlag( wxSUNKEN_BORDER) || HasFlag(wxDOUBLE_BORDER) )
     {

-       bool sunken = HasFlag( wxSUNKEN_BORDER ) ;
-       RGBColor pen1 = sunken ? white : black ;
-       RGBColor pen2 = sunken ? shadow : face ;
-       RGBColor pen3 = sunken ? face : shadow ;
-       RGBColor pen4 = sunken ? black : white ;
-       
-       RGBForeColor( &pen1 ) ;
-       {
-                       Rect rect = { 0 , 0 , m_height , m_width } ;
-               FrameRect( &rect ) ;
-       }
-       RGBForeColor( &pen2 ) ;
-       {
-                       Rect rect = { 1 , 1 , m_height -1 , m_width -1} ;
-               FrameRect( &rect ) ;
-       }
-       RGBForeColor( &pen3 ) ;
-       {
-                       Rect rect = { 0 , 0 , m_height -2 , m_width -2} ;
-               FrameRect( &rect ) ;
-       }
-       RGBForeColor( &pen4 ) ;
-       {
-               MoveTo( 0 , 0 ) ;
-               LineTo( m_width - 3 , 0 ) ;
-               MoveTo( 0 , 0 ) ;
-               LineTo( 0 , m_height - 3 ) ;
-       }
+#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) ;
+      */
+        
+        DrawThemePrimaryGroup(&rect  ,IsEnabled() ? kThemeStateActive : kThemeStateInactive) ;
+#else
+        bool sunken = HasFlag( wxSUNKEN_BORDER ) ;
+        RGBForeColor( &face );
+        MoveTo( left + 0 , top + m_height - 2 );
+        LineTo( left + 0 , top + 0 );
+        LineTo( left + m_width - 2 , top + 0 );
+
+        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 );
+        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 );
+        MoveTo( left + 1 , top + m_height - 3 );
+        LineTo( left + 1, top + 1 );
+        LineTo( left + m_width - 3 , top + 1 );
+
+        RGBForeColor( sunken ? &white : &shadow );
+        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 );
+        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))
     {
     }
     else if (HasFlag(wxSIMPLE_BORDER))
     {

-               Rect rect = { 0 , 0 , m_height , m_width } ;
-               RGBForeColor( &black ) ;
-       FrameRect( &rect ) ;
-    }
-/*
-       if ( this->GetParent() )
-       {
-           wxPaintDC dc(GetParent());
-           GetParent()->PrepareDC(dc);
-       
-           if (HasFlag(wxRAISED_BORDER) || HasFlag( wxSUNKEN_BORDER) )
-           {
-               bool sunken = HasFlag( wxSUNKEN_BORDER ) ;
-       
-                       wxPen m_penButton3DShadow( wxSystemSettings::GetSystemColour( wxSYS_COLOUR_3DSHADOW ), 1, wxSOLID ) ;
-                       wxPen m_penButton3DFace( wxSystemSettings::GetSystemColour( wxSYS_COLOUR_3DFACE ), 1, wxSOLID ) ;
-               
-                       wxPen wxPen1 = sunken ? *wxWHITE_PEN : *wxBLACK_PEN;
-                       wxPen wxPen2 = sunken ? m_penButton3DShadow : m_penButton3DShadow;
-                       wxPen wxPen3 = sunken ? m_penButton3DFace : m_penButton3DShadow;
-                       wxPen wxPen4 = sunken ? *wxBLACK_PEN : *wxWHITE_PEN;
-               
-                       dc.SetPen(wxPen1);
-                       dc.DrawRectangle(m_x, m_y, m_width, m_height);          // outer - right and button
-               
-                   dc.SetPen(wxPen2);
-                       dc.DrawRectangle(m_x+1, m_y+1, m_width-1, m_height-1);      // outer - left and top
-               
-                   dc.SetPen(wxPen3);
-                       dc.DrawRectangle(m_x, m_y, m_width-2, m_height-2);          // inner - right and button
-               
-                   dc.SetPen(wxPen4);
-                       dc.DrawLine(m_x, m_y, m_x + m_width-3, m_y);                 // inner - left and top
-                       dc.DrawLine(m_x, m_y, m_x, m_y + m_height-3);
-           }
-           else if (HasFlag(wxDOUBLE_BORDER))
-           {
-               bool sunken = HasFlag( wxSUNKEN_BORDER ) ;
-       
-                       wxPen m_penButton3DShadow( wxSystemSettings::GetSystemColour( wxSYS_COLOUR_3DSHADOW ), 1, wxSOLID ) ;
-                       wxPen m_penButton3DFace( wxSystemSettings::GetSystemColour( wxSYS_COLOUR_3DFACE ), 1, wxSOLID ) ;
-               
-                       wxPen wxPen1 = sunken ? *wxWHITE_PEN : *wxBLACK_PEN;
-                       wxPen wxPen2 = sunken ? m_penButton3DShadow : m_penButton3DShadow;
-                       wxPen wxPen3 = sunken ? m_penButton3DFace : m_penButton3DShadow;
-                       wxPen wxPen4 = sunken ? *wxBLACK_PEN : *wxWHITE_PEN;
-               
-                       dc.SetPen(wxPen1);
-                       dc.DrawRectangle(m_x, m_y, m_width, m_height);          // outer - right and button
-               
-                   dc.SetPen(wxPen2);
-                       dc.DrawRectangle(m_x+1, m_y+1, m_width-1, m_height-1);      // outer - left and top
-               
-                   dc.SetPen(wxPen3);
-                       dc.DrawRectangle(m_x, m_y, m_width-2, m_height-2);          // inner - right and button
-               
-                   dc.SetPen(wxPen4);
-                       dc.DrawLine(m_x, m_y, m_x + m_width-3, m_y);                 // inner - left and top
-                       dc.DrawLine(m_x, m_y, m_x, m_y + m_height-3);
-           }
-           else if (HasFlag(wxSIMPLE_BORDER))
-           {
-                       dc.SetPen(*wxBLACK_PEN);
-                       dc.DrawRectangle(m_x, m_y, m_width, m_height);         
-           }
+            Rect rect = { top , left , m_height + top , m_width + left } ;
+        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.
 }
 
 // New function that will replace some of the above.

-void wxWindow::SetScrollbar(int orient, int pos, int thumbVisible,
+void wxWindowMac::SetScrollbar(int orient, int pos, int thumbVisible,

     int range, bool refresh)
 {
     int range, bool refresh)
 {

-               if ( orient == wxHORIZONTAL )
-               {
-                       if ( m_hScrollBar )
-                       {
-                               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 ) ;
-                               }
-                       }
-               }
-               else
-               {
-                       if ( m_vScrollBar )
-                       {
-                               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 ) ;
-                               }
-                       }
-               }
-               MacRepositionScrollBars() ;
+        if ( orient == wxHORIZONTAL )
+        {
+            if ( m_hScrollBar )
+            {
+                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 ) ;
+                }
+            }
+        }
+        else
+        {
+            if ( m_vScrollBar )
+            {
+                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 ) ;
+                }
+            }
+        }
+        MacRepositionScrollBars() ;

 }
 
 // Does a physical scroll
 }
 
 // Does a physical scroll

-void wxWindow::ScrollWindow(int dx, int dy, const wxRect *rect)
-{
-       wxMacDrawingClientHelper focus( this ) ;
-       if ( focus.Ok() )
-       {
-               int width , height ;
-               GetClientSize( &width , &height ) ;
-
-               Rect scrollrect = { 0 , 0 , height , width } ;
-       
-               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 ) ;            
-       }
-               ScrollRect( &scrollrect , dx , dy , updateRgn ) ;
-       InvalWindowRgn( GetMacRootWindow() ,  updateRgn ) ;
-       DisposeRgn( updateRgn ) ;
-       }
-       
-       for (wxNode *node = GetChildren().First(); node; node = node->Next())
-       {
-               wxWindow *child = (wxWindow*)node->Data();
-               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 );
-               child->SetSize( x+dx, y+dy, w, h );
-       }
-       
-}
-
-void wxWindow::MacOnScroll(wxScrollEvent &event )
-{
-       if ( event.m_eventObject == m_vScrollBar || event.m_eventObject == m_hScrollBar )
-       {
-           wxScrollWinEvent wevent;
-           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_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);
-    }
-}
-
-bool wxWindow::SetFont(const wxFont& font)
-{
-    if ( !wxWindowBase::SetFont(font) )
-    {
-        // nothing to do
-        return FALSE;
+void wxWindowMac::ScrollWindow(int dx, int dy, const wxRect *rect)
+{
+    wxClientDC dc(this) ;
+    wxMacPortSetter helper(&dc) ;
+
+    {
+        int width , height ;
+        GetClientSize( &width , &height ) ;
+
+        Rect scrollrect = { dc.YLOG2DEVMAC(0) , dc.XLOG2DEVMAC(0) , dc.YLOG2DEVMAC(height) , dc.XLOG2DEVMAC(width) } ;
+        RgnHandle updateRgn = NewRgn() ;
+        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 ) ;        
+        }
+        ScrollRect( &scrollrect , dx , dy , updateRgn ) ;
+        InvalWindowRgn( (WindowRef) MacGetRootWindow() ,  updateRgn ) ;
+        DisposeRgn( updateRgn ) ;
+    }
+    
+    for (wxNode *node = GetChildren().First(); node; node = node->Next())
+    {
+        wxWindowMac *child = (wxWindowMac*)node->Data();
+        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 );
+        child->SetSize( x+dx, y+dy, w, h );

     }
     }

+    
+}

 
 

-    return TRUE;
+void wxWindowMac::MacOnScroll(wxScrollEvent &event )
+{
+    if ( event.m_eventObject == m_vScrollBar || event.m_eventObject == m_hScrollBar )
+    {
+        wxScrollWinEvent wevent;
+        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_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);
+    }

 }
 
 // Get the window with the focus
 }
 
 // Get the window with the focus

-wxWindow *wxWindowBase::FindFocus()
+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.
 }
 
 #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 wxWindow::OnCommand(wxWindow& win, wxCommandEvent& event)
+void wxWindowMac::OnCommand(wxWindowMac& win, wxCommandEvent& event)

 {
     if ( GetEventHandler()->ProcessEvent(event)  )
         return;
 {
     if ( GetEventHandler()->ProcessEvent(event)  )
         return;


@@ -1421,7 +1257,7 @@ void wxWindow::OnCommand(wxWindow& win, wxCommandEvent& event)
 #endif // WXWIN_COMPATIBILITY_2
 
 #if WXWIN_COMPATIBILITY
 #endif // WXWIN_COMPATIBILITY_2
 
 #if WXWIN_COMPATIBILITY

-wxObject* wxWindow::GetChild(int number) const
+wxObject* wxWindowMac::GetChild(int number) const

 {
     // Return a pointer to the Nth object in the Panel
     wxNode *node = GetChildren().First();
 {
     // Return a pointer to the Nth object in the Panel
     wxNode *node = GetChildren().First();


@@ -1438,7 +1274,7 @@ wxObject* wxWindow::GetChild(int number) const
 }
 #endif // WXWIN_COMPATIBILITY
 
 }
 #endif // WXWIN_COMPATIBILITY
 

-void wxWindow::OnSetFocus(wxFocusEvent& event)
+void wxWindowMac::OnSetFocus(wxFocusEvent& event)

 {
     // panel wants to track the window which was the last to have focus in it,
     // so we want to set ourselves as the window which last had focus
 {
     // panel wants to track the window which was the last to have focus in it,
     // so we want to set ourselves as the window which last had focus


@@ -1446,51 +1282,30 @@ void wxWindow::OnSetFocus(wxFocusEvent& event)
     // notice that it's also important to do it upwards the tree becaus
     // otherwise when the top level panel gets focus, it won't set it back to
     // us, but to some other sibling
     // notice that it's also important to do it upwards the tree becaus
     // otherwise when the top level panel gets focus, it won't set it back to
     // us, but to some other sibling

-    wxWindow *win = this;
-    while ( win )
-    {
-        wxWindow *parent = win->GetParent();
-        wxPanel *panel = wxDynamicCast(parent, wxPanel);
-        if ( panel )
-        {
-            panel->SetLastFocus(win);
-        }
-
-        win = parent;
-    }
+    
+    // CS:don't know if this is still needed:
+    //wxChildFocusEvent eventFocus(this);
+    //(void)GetEventHandler()->ProcessEvent(eventFocus);

 
     event.Skip();
 }
 
 
     event.Skip();
 }
 

-void wxWindow::Clear()
+void wxWindowMac::Clear()

 {
 {

-       if ( m_macWindowData )
-       {
-               wxMacDrawingClientHelper helper ( this ) ;
-               int w ,h ;
-               wxPoint origin = GetClientAreaOrigin() ;
-               GetClientSize( &w , &h ) ;
-               UMASetThemeWindowBackground( m_macWindowData->m_macWindow , m_macWindowData->m_macWindowBackgroundTheme , false ) ;
-               Rect r = { origin.y , origin.x, origin.y+h , origin.x+w } ;
-               EraseRect( &r ) ;
-       }
-       else
-       {
-               wxClientDC dc(this);
-       wxBrush brush(GetBackgroundColour(), wxSOLID);
-       dc.SetBackground(brush);
-       dc.Clear();
-       }
+    wxClientDC dc(this);
+    wxBrush brush(GetBackgroundColour(), wxSOLID);
+    dc.SetBackground(brush);
+    dc.Clear();

 }
 
 // Setup background and foreground colours correctly
 }
 
 // Setup background and foreground colours correctly

-void wxWindow::SetupColours()
+void wxWindowMac::SetupColours()

 {
     if ( GetParent() )
         SetBackgroundColour(GetParent()->GetBackgroundColour());
 }
 
 {
     if ( GetParent() )
         SetBackgroundColour(GetParent()->GetBackgroundColour());
 }
 

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

 {
 /*
    // Check if we need to send a LEAVE event
 {
 /*
    // Check if we need to send a LEAVE event


@@ -1509,961 +1324,588 @@ void wxWindow::OnIdle(wxIdleEvent& event)
 
     // 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();
+    UpdateWindowUI();

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

-void wxWindow::Raise()
+void wxWindowMac::Raise()

 {
 {

-    // TODO

 }
 
 // Lower the window to the bottom of the Z order
 }
 
 // Lower the window to the bottom of the Z order

-void wxWindow::Lower()
+void wxWindowMac::Lower()

 {
 {

-    // TODO

 }
 
 }
 

-void wxWindow::DoSetClientSize(int width, int height)
+void wxWindowMac::DoSetClientSize(int width, int height)

 {
 {

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

 
 

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

 
 

-               DoSetSize( -1 , -1 , width , height ) ;
-       }
+        DoSetSize( -1 , -1 , width , height ) ;
+    }

 }
 
 
 }
 
 

-wxWindow* wxWindow::s_lastMouseWindow = NULL ;
+wxWindowMac* wxWindowMac::s_lastMouseWindow = NULL ;

 
 

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

 {
 {

-       if ((point.x < m_x) || (point.y < m_y) ||
-               (point.x > (m_x + m_width)) || (point.y > (m_y + m_height)))
-               return FALSE;
-       
-       WindowRef window = GetMacRootWindow() ;
+    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() ;

 
 

-       wxPoint newPoint( point ) ;
+    wxPoint newPoint( point ) ;

 
 

-       newPoint.x -= m_x;
-       newPoint.y -= m_y;
-       
-       for (wxNode *node = GetChildren().First(); node; node = node->Next())
-       {
-               wxWindow *child = (wxWindow*)node->Data();
-               // added the m_isShown test --dmazzoni
-               if ( child->GetMacRootWindow() == window && child->m_isShown )
-               {
-                       if (child->MacGetWindowFromPointSub(newPoint , outWin ))
-                               return TRUE;
-               }
-       }
+    if ( !IsTopLevel() )
+    {
+      newPoint.x -= m_x;
+      newPoint.y -= m_y;
+    }
+    
+    for (wxNode *node = GetChildren().First(); node; node = node->Next())
+    {
+        wxWindowMac *child = (wxWindowMac*)node->Data();
+        // added the m_isShown test --dmazzoni
+        if ( child->MacGetRootWindow() == window && child->m_isShown )
+        {
+            if (child->MacGetWindowFromPointSub(newPoint , outWin ))
+                return TRUE;
+        }
+    }

 
 

-       *outWin = this ;
-       return TRUE;
+    *outWin = this ;
+    return TRUE;

 }
 
 }
 

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

 {
 {

-       WindowRef window ;
-       Point pt = { screenpoint.y , screenpoint.x } ;
-       if ( ::FindWindow( pt , &window ) == 3 )
-       {
-                       wxPoint point( screenpoint ) ;
-                       wxWindow* win = wxFindWinFromMacWindow( window ) ;
-                       if ( win )
-                       {
-                       win->ScreenToClient( point ) ;
-                       return win->MacGetWindowFromPointSub( point , outWin ) ;
-       }
-       }
-       return FALSE ;
+    WindowRef window ;
+    
+    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 ) ;
+            
+            GrafPtr     port;  
+            ::GetPort( &port ) ;
+            ::SetPort( UMAGetWindowPort( window ) ) ;
+            ::GlobalToLocal( &pt ) ;
+            ::SetPort( port ) ;
+
+            wxPoint point( pt.h, pt.v ) ;
+            
+            return win->MacGetWindowFromPointSub( point , outWin ) ;
+        }
+    }
+    return FALSE ;

 }
 
 extern int wxBusyCursorCount ;
 }
 
 extern int wxBusyCursorCount ;

+static wxWindow *gs_lastWhich = NULL;

 
 

-bool wxWindow::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 ( IsKindOf( CLASSINFO ( wxStaticBox ) ) )
-               return FALSE ; 
-       
-       WindowRef window = GetMacRootWindow() ;
-
-       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())
-       {
-               wxWindow *child = (wxWindow*)node->Data();
-               if ( child->GetMacRootWindow() == window && child->IsShown() && child->IsEnabled() )
-               {
-                       if (child->MacDispatchMouseEvent(event))
-                               return TRUE;
-               }
-       }
-
-       event.m_x = x ;
-       event.m_y = y ;
-       
-       if ( wxBusyCursorCount == 0 )
-       {
-               m_cursor.MacInstall() ;
-       }
-       
-       if ( event.GetEventType() == wxEVT_LEFT_DOWN )
-       {
-       // set focus to this window
-        if (AcceptsFocus() && FindFocus()!=this)
-               SetFocus();
+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 ( 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 ;
+
+    for (wxNode *node = GetChildren().First(); node; node = node->Next())
+    {
+        wxWindowMac *child = (wxWindowMac*)node->Data();
+        if ( child->MacGetRootWindow() == window && child->IsShown() && child->IsEnabled() )
+        {
+            if (child->MacDispatchMouseEvent(event))
+                return TRUE;
+        }

     }
 
     }
 

+    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 wxUSE_TOOLTIPS
     if ( event.GetEventType() == wxEVT_MOTION 
 #if wxUSE_TOOLTIPS
     if ( event.GetEventType() == wxEVT_MOTION 

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

         wxToolTip::RelayEvent( this , event);
 #endif // wxUSE_TOOLTIPS
         wxToolTip::RelayEvent( this , event);
 #endif // wxUSE_TOOLTIPS

-       GetEventHandler()->ProcessEvent( event ) ;
-       return TRUE;
-}
-
-Point lastWhere ;
-long lastWhen = 0 ;
-
-wxString wxWindow::MacGetToolTipString( wxPoint &pt )
-{
-       if ( m_tooltip )
-       {
-               return m_tooltip->GetTip() ;
-       }
-       return "" ;
-}
-void wxWindow::MacFireMouseEvent( EventRecord *ev )
-{
-       wxMouseEvent event(wxEVT_LEFT_DOWN);
-       bool isDown = !(ev->modifiers & btnState) ; // 1 is for up
-       bool controlDown = ev->modifiers & controlKey ; // for simulating right mouse
-       
-       event.m_leftDown = isDown && !controlDown;
-       event.m_middleDown = FALSE;
-       event.m_rightDown = isDown && controlDown;
-
-       if ( ev->what == mouseDown )
-       {
-               if ( controlDown )
-                       event.SetEventType(wxEVT_RIGHT_DOWN ) ;
-               else
-                       event.SetEventType(wxEVT_LEFT_DOWN ) ;
-       }
-       else if ( ev->what == mouseUp )
-       {
-               if ( controlDown )
-                       event.SetEventType(wxEVT_RIGHT_UP ) ;
-               else
-                       event.SetEventType(wxEVT_LEFT_UP ) ;
-       }
-       else
-       {
-               event.SetEventType(wxEVT_MOTION ) ;
-       }
-
-       event.m_shiftDown = ev->modifiers & shiftKey;
-       event.m_controlDown = ev->modifiers & controlKey;
-       event.m_altDown = ev->modifiers & optionKey;
-       event.m_metaDown = ev->modifiers & cmdKey;
-
-       Point           localwhere = ev->where ;
-               
-       GrafPtr         port ;  
-       ::GetPort( &port ) ;
-       ::SetPort( UMAGetWindowPort( m_macWindowData->m_macWindow ) ) ;
-       ::GlobalToLocal( &localwhere ) ;
-       ::SetPort( port ) ;
-
-       if ( ev->what == mouseDown )
-       {
-               if ( ev->when - lastWhen <= GetDblTime() )
-               {
-                       if ( abs( localwhere.h - lastWhere.h ) < 3 || abs( localwhere.v - lastWhere.v ) < 3 )
-                       {
-                               if ( controlDown )
-                                       event.SetEventType(wxEVT_RIGHT_DCLICK ) ;
-                               else
-                                       event.SetEventType(wxEVT_LEFT_DCLICK ) ;
-                       }
-                   lastWhen = 0 ;
-               }
-               else
-               {
-                   lastWhen = ev->when ;
-               }
-               lastWhere = localwhere ;
-       }
-
-       event.m_x = localwhere.h;
-       event.m_y = localwhere.v;
-       event.m_x += m_x;
-       event.m_y += m_y;

 
 

-/*
-       wxPoint origin = GetClientAreaOrigin() ;
+    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;
+    }

 
 

-       event.m_x += origin.x ;
-       event.m_y += origin.y ;
-*/
-       
-       event.m_timeStamp = ev->when;
-       event.SetEventObject(this);
-       if ( wxTheApp->s_captureWindow )
-       {
-               int x = event.m_x ;
-               int y = event.m_y ;
-               wxTheApp->s_captureWindow->ScreenToClient( &x , &y ) ;
-               event.m_x = x ;
-               event.m_y = y ;
-               wxTheApp->s_captureWindow->GetEventHandler()->ProcessEvent( event ) ;
-               if ( ev->what == mouseUp )
-               {
-                       wxTheApp->s_captureWindow = NULL ;
-                       if ( wxBusyCursorCount == 0 )
-                       {
-                               m_cursor.MacInstall() ;
-                       }
-               }
-       }
-       else
-       {
-               MacDispatchMouseEvent( event ) ;
-       }
-}
-
-void wxWindow::MacMouseDown( EventRecord *ev , short part)
-{
-       MacFireMouseEvent( ev ) ;
-}
-
-void wxWindow::MacMouseUp( EventRecord *ev , short part)
-{
-       WindowPtr frontWindow ;
-       switch (part)
-       {
-               case inContent:         
-                       {
-                               MacFireMouseEvent( ev ) ;
-                       }
-                       break ;
-       }
-}
-
-void wxWindow::MacMouseMoved( EventRecord *ev , short part)
-{
-       WindowPtr frontWindow ;
-       switch (part)
-       {
-               case inContent:         
-                       {
-                               MacFireMouseEvent( ev ) ;
-                       }
-                       break ;
-       }
-}
-void wxWindow::MacActivate( EventRecord *ev , bool inIsActivating )
-{
-    if ( !m_macWindowData->m_macHasReceivedFirstActivate )
-        m_macWindowData->m_macHasReceivedFirstActivate = true ;
-    
-       wxActivateEvent event(wxEVT_ACTIVATE, inIsActivating , m_windowId);
-       event.m_timeStamp = ev->when ;
-       event.SetEventObject(this);
-       
-       GetEventHandler()->ProcessEvent(event);
-       
-    Refresh() ;
-       UMAHighlightAndActivateWindow( m_macWindowData->m_macWindow , inIsActivating ) ;
-//     MacUpdateImmediately() ;
-}
-
-void wxWindow::MacRedraw( RgnHandle updatergn , long time)
-{
-       // updatergn is always already clipped to our boundaries
-       WindowRef window = GetMacRootWindow() ;
-       // ownUpdateRgn is the area that this window has to invalidate i.e. its own area without its children
-       RgnHandle ownUpdateRgn = NewRgn() ;
-       CopyRgn( updatergn , ownUpdateRgn ) ;
-       wxWindow* win = wxFindWinFromMacWindow( window ) ;
-       {
-               wxMacDrawingHelper focus( this ) ; // was client
-               if ( focus.Ok() )
-               {
-                       WindowRef window = GetMacRootWindow() ;
-                       bool eraseBackground = false ;
-                       if ( m_macWindowData )
-                               eraseBackground = true ;
-                       if ( m_backgroundColour == wxSystemSettings::GetSystemColour(wxSYS_COLOUR_APPWORKSPACE) )
-                       {
-                                       UMASetThemeWindowBackground( 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
-               
-
-                                       wxWindow* parent = GetParent() ;
-                                       while( parent )
-                                       {
-                                               if ( parent->GetMacRootWindow() != 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 ) )
-                                                       {
-                                                               // 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) ;
-                                                               UMAApplyThemeBackground(kThemeBackgroundTabPane, &box , kThemeStateActive,8,true);
-                                                               break ;
-                                                       }
-                                               }
-                                               else
-                                               {
-                                                       parent = NULL ;
-                                                       break ;
-                                               }
-                                               parent = parent->GetParent() ;
-                                       }
-                                       if ( !parent )
-                                       {
-                                               // if there is nothing special -> use default
-                                               UMASetThemeWindowBackground( window , kThemeBrushDialogBackgroundActive , false ) ;
-                                       }
-                       }
-                       else
-                       {
-                               RGBBackColor( &m_backgroundColour.GetPixel()) ;
-                       }
-            // subtract all non transparent children from updatergn
-
-           RgnHandle childarea = NewRgn() ;
-               for (wxNode *node = GetChildren().First(); node; node = node->Next())
-               {
-                       wxWindow *child = (wxWindow*)node->Data();
-                       // eventually test for transparent windows
-                       if ( child->GetMacRootWindow() == window && child->IsShown() )
-                       {
-                           if ( !child->IsKindOf( CLASSINFO( wxControl ) ) && ((wxControl*)child)->GetMacControl() )
-                           {
-                               SetRectRgn( childarea , child->m_x , child->m_y , child->m_x + child->m_width ,  child->m_y + child->m_height ) ;
-                               DiffRgn( ownUpdateRgn , childarea , ownUpdateRgn ) ;
-                           }
-                       }
-               }               
-               DisposeRgn( childarea ) ;
-
-                       if ( GetParent() && m_backgroundColour != GetParent()->GetBackgroundColour() )
-                               eraseBackground = true ;
-                       SetClip( ownUpdateRgn ) ;
-                       if ( m_macEraseOnRedraw ) {
-                       if ( eraseBackground  )
-                       {
-                               EraseRgn( ownUpdateRgn ) ;      
-                       }
-               }
-               else {
-                   m_macEraseOnRedraw = true ;
-               }
-               }
-
-               {
-                       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 ) ;
-               }
-
-               MacPaintBorders() ;
-               wxPaintEvent event;
-               event.m_timeStamp = time ;
-               event.SetEventObject(this);
-               GetEventHandler()->ProcessEvent(event);
-       }
-       
-       
-       RgnHandle childupdate = NewRgn() ;
-                       
-       for (wxNode *node = GetChildren().First(); node; node = node->Next())
-       {
-               wxWindow *child = (wxWindow*)node->Data();
-               SetRectRgn( childupdate , child->m_x , child->m_y , child->m_x + child->m_width ,  child->m_y + child->m_height ) ;
-               SectRgn( childupdate , updatergn , childupdate ) ;
-               OffsetRgn( childupdate , -child->m_x , -child->m_y ) ;
-               if ( child->GetMacRootWindow() == window && child->IsShown() && !EmptyRgn( childupdate ) )
-               {
-                       // because dialogs may also be children
-                       child->MacRedraw( childupdate , time ) ;
-               }
-       }
-       DisposeRgn( childupdate ) ;
-       // eventually a draw grow box here
-}
-
-void wxWindow::MacUpdateImmediately()
-{
-       WindowRef window = GetMacRootWindow() ;
-       if ( window )
-       {
-               wxWindow* win = wxFindWinFromMacWindow( window ) ;
-               #if TARGET_CARBON
-               AGAPortHelper help( GetWindowPort(window) ) ;
-               #else
-               AGAPortHelper help( (window) ) ;
-               #endif
-               SetOrigin( 0 , 0 ) ;
-               BeginUpdate( window ) ;
-               if ( win )
-               {
-                       RgnHandle               region = NewRgn();
-                       
-                       if ( region )
-                       {
-                   GetPortVisibleRegion( GetWindowPort( window ), region );
-
-                               // if windowshade gives incompatibility , take the follwing out
-                   if ( !EmptyRgn( region ) && win->m_macWindowData->m_macHasReceivedFirstActivate )
-                   {
-                                       win->MacRedraw( region , wxTheApp->sm_lastMessageTime ) ;
-                   }
-                   DisposeRgn( region );
-               }
-               }
-               EndUpdate( window ) ;
-       }
-}
-
-void wxWindow::MacUpdate( EventRecord *ev )
-{
-       WindowRef window = (WindowRef) ev->message ;
-       wxWindow * win = wxFindWinFromMacWindow( window ) ;
-       #if TARGET_CARBON
-       AGAPortHelper help( GetWindowPort(window) ) ;
-       #else
-       AGAPortHelper help( (window) ) ;
-       #endif
-       SetOrigin( 0 , 0 ) ;
-       BeginUpdate( window ) ;
-       if ( win )
-       {
-               RgnHandle               region = NewRgn();
-               
-               if ( region )
-               {
-            GetPortVisibleRegion( GetWindowPort( window ), region );
-
-                       // if windowshade gives incompatibility , take the follwing out
-            if ( !EmptyRgn( region ) && win->m_macWindowData->m_macHasReceivedFirstActivate )
-            {
-                               MacRedraw( region , ev->when ) ;
-            }
-            DisposeRgn( region );
+    GetEventHandler()->ProcessEvent( event ) ;
+
+    return TRUE;
+}
+
+wxString wxWindowMac::MacGetToolTipString( wxPoint &pt )
+{
+    if ( m_tooltip )
+    {
+        return m_tooltip->GetTip() ;
+    }
+    return "" ;
+}
+
+void wxWindowMac::Update()
+{
+    wxTopLevelWindowMac* win = MacGetTopLevelWindow(  ) ;
+    if ( win )
+    {
+      win->MacUpdate( 0 ) ;
+#if TARGET_API_MAC_CARBON
+        if ( QDIsPortBuffered( GetWindowPort( (WindowRef) win->MacGetWindowRef() ) ) )
+        {
+                QDFlushPortBuffer( GetWindowPort( (WindowRef) win->MacGetWindowRef() ) , NULL ) ;

         }
         }

-       }
-       EndUpdate( window ) ;
-}
-
-WindowRef wxWindow::GetMacRootWindow() const
-{
-       WindowRef window = NULL ;
-       wxWindow *iter = (wxWindow*)this ;
-       
-       while( iter )
-       {
-               if ( iter->m_macWindowData )
-                       return iter->m_macWindowData->m_macWindow ;
-
-               iter = iter->GetParent() ;
-       } 
-       wxASSERT_MSG( 1 , "No valid mac root window" ) ;
-       return NULL ;
-}
-
-void wxWindow::MacCreateScrollBars( long style ) 
-{
-       wxASSERT_MSG( m_vScrollBar == NULL && m_hScrollBar == NULL , "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 ) ;
-       
-       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, 
-               vSize , wxVERTICAL);
-
-       if ( style & wxVSCROLL )
-       {
-               
-       }
-       else
-       {
-               m_vScrollBar->Show(false) ;
-       }
-       m_hScrollBar = new wxScrollBar(this, wxWINDOW_HSCROLL, hPoint, 
-               hSize , wxHORIZONTAL);
-       if ( style  & wxHSCROLL )
-       {
-       }
-       else
-       {
-               m_hScrollBar->Show(false) ;
-       }
-       
-       // because the create does not take into account the client area origin
-       MacRepositionScrollBars() ; // we might have a real position shift
-}
-
-void wxWindow::MacRepositionScrollBars()
-{
-       bool hasBoth = ( m_hScrollBar && m_hScrollBar->IsShown()) && ( m_vScrollBar && m_vScrollBar->IsShown()) ;
-       int adjust = hasBoth ? MAC_SCROLLBAR_SIZE - 1 : 0 ;
-       
-       // get real client area
-       
-       int width = m_width ; 
-       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) ;
-       
-       int x = 0 ; 
-       int y = 0 ;
-       int w = m_width ;
-       int h = m_height ;
-       
-       MacClientToRootWindow( &x , &y ) ;
-       MacClientToRootWindow( &w , &h ) ;
-       
-       WindowRef window = NULL ;
-       wxWindow *iter = (wxWindow*)this ;
-       
-       int totW = 10000 , totH = 10000;
-       while( iter )
-       {
-               if ( iter->m_macWindowData )
-               {
-                       totW = iter->m_width ;
-                       totH = iter->m_height ;
-                       break ;
-               }
-
-               iter = iter->GetParent() ;
-       } 
-       
-       if ( x == 0 )
-       {
-               hPoint.x = -1 ;
-               hSize.x += 1 ;
-       }
-       if ( y == 0 )
-       {
-               vPoint.y = -1 ;
-               vSize.y += 1 ;
-       }
-       
-       if ( w-x >= totW )
-       {
-               hSize.x += 1 ;
-               vPoint.x += 1 ;
-       }
-       
-       if ( h-y >= totH )
-       {
-               vSize.y += 1 ;
-               hPoint.y += 1 ;
-       }
-
-       if ( m_vScrollBar )
-       {
-               m_vScrollBar->SetSize( vPoint.x , vPoint.y, vSize.x, vSize.y , wxSIZE_ALLOW_MINUS_ONE);
-       }
-       if ( m_hScrollBar )
-       {
-               m_hScrollBar->SetSize( hPoint.x , hPoint.y, hSize.x, hSize.y, wxSIZE_ALLOW_MINUS_ONE);
-       }
-}
-
-void wxWindow::MacKeyDown( EventRecord *ev ) 
-{
-
-}
-
-
-bool wxWindow::AcceptsFocus() const
+#endif
+      }
+}
+
+wxTopLevelWindowMac* wxWindowMac::MacGetTopLevelWindow() const 

 {
 {

-    return MacCanFocus() && wxWindowBase::AcceptsFocus();
+    wxTopLevelWindowMac* win = NULL ;
+    WindowRef window = (WindowRef) MacGetRootWindow() ;
+    if ( window )
+    {
+        win = wxFindWinFromMacWindow( window ) ;
+    }  
+    return win ;

 }
 
 }
 

-ControlHandle wxWindow::MacGetContainerForEmbedding() 
-{
-       if ( m_macWindowData )
-               return m_macWindowData->m_macRootControl ;
-       else
-               return GetParent()->MacGetContainerForEmbedding() ;
-}
-
-void wxWindow::MacSuperChangedPosition() 
-{
-       // only window-absolute structures have to be moved i.e. controls
-
-       wxNode *node = GetChildren().First();
-       while ( node )
-       {
-               wxWindow *child = (wxWindow *)node->Data();
-               child->MacSuperChangedPosition() ;
-               node = node->Next();
-       }
-}
-
-bool wxWindow::MacSetPortFocusParams( const Point & localOrigin, const Rect & clipRect, WindowRef window , wxWindow* 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 wxWindow::MacSetPortDrawingParams( const Point & localOrigin, const Rect & clipRect, WindowRef window , wxWindow* 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) ) ;
-       ::UMASetThemeWindowBackground(  win->m_macWindowData->m_macWindow , win->m_macWindowData->m_macWindowBackgroundTheme ,  false ) ;
-       return true;                    
-}
-
-void wxWindow::MacGetPortParams(Point* localOrigin, Rect* clipRect, WindowRef *window  , wxWindow** rootwin) 
-{
-       if ( m_macWindowData )
-       {
-               localOrigin->h = 0;
-               localOrigin->v = 0;
-               clipRect->left = 0;
-               clipRect->top = 0;
-               clipRect->right = m_width;
-               clipRect->bottom = m_height;
-               *window = m_macWindowData->m_macWindow ;
-               *rootwin = this ;
-       }
-       else
-       {
-               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 wxWindow::MacDoGetPortClientParams(Point* localOrigin, Rect* clipRect, WindowRef *window , wxWindow** rootwin ) 
-{
-//     int width , height ;
-//     GetClientSize( &width , &height ) ;
-       
-       if ( m_macWindowData )
-       {
-               localOrigin->h = 0;
-               localOrigin->v = 0;
-               clipRect->left = 0;
-               clipRect->top = 0;
-               clipRect->right = m_width ;//width;
-               clipRect->bottom = m_height ;// height;
-               *window = m_macWindowData->m_macWindow ;
-               *rootwin = this ;
-       }
-       else
-       {
-               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 wxWindow::MacGetPortClientParams(Point* localOrigin, Rect* clipRect, WindowRef *window , wxWindow** 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 wxWindow::MacGetLeftBorderSize( ) const
-{
-       if( m_macWindowData )
-               return 0 ;
+const wxRegion& wxWindowMac::MacGetVisibleRegion()
+{
+  RgnHandle visRgn = NewRgn() ;
+  RgnHandle tempRgn = NewRgn() ;
+  
+  SetRectRgn( visRgn , 0 , 0 , m_width , m_height ) ;

 
 

-    if (m_windowStyle & wxRAISED_BORDER || m_windowStyle & wxSUNKEN_BORDER )
+  //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 )

     {
     {

-               return 2 ;
+      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() ;

     }
     }

-    else if (  m_windowStyle &wxDOUBLE_BORDER)
+  }
+  if ( GetWindowStyle() & wxCLIP_CHILDREN )
+  {
+    for (wxNode *node = GetChildren().First(); node; node = node->Next())
+    {
+        wxWindowMac *child = (wxWindowMac*)node->Data();
+
+        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 ) ;
+            DiffRgn( visRgn , tempRgn , visRgn ) ;
+        }
+    }       
+  }
+  
+  if ( (GetWindowStyle() & wxCLIP_SIBLINGS) && GetParent() )
+  {
+    bool thisWindowThrough = false ;
+    for (wxNode *node = GetParent()->GetChildren().First(); node; node = node->Next())

     {
     {

-               return 2 ;
+        wxWindowMac *sibling = (wxWindowMac*)node->Data();
+        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 ) ;
+            DiffRgn( visRgn , tempRgn , visRgn ) ;
+        }
+    }  
+  }
+  m_macVisibleRegion = visRgn ;
+  DisposeRgn( visRgn ) ;
+  DisposeRgn( tempRgn ) ;
+  return m_macVisibleRegion ;
+}
+
+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() ;
+        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) )
+        { 
+          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 );
+        }
+        DisposeRgn( ownUpdateRgn ) ; 
+        if ( !m_updateRegion.Empty() )
+        {
+          wxPaintEvent event;
+          event.m_timeStamp = time ;
+          event.SetEventObject(this);
+          GetEventHandler()->ProcessEvent(event); 
+        }       

     }
     }

-    else if (m_windowStyle &wxSIMPLE_BORDER)
+    
+    // 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())

     {
     {

-       return 1 ;
+        // 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();
+        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 ) ;
+        if ( child->MacGetRootWindow() == window && child->IsShown() && !EmptyRgn( childupdate ) )
+        {
+            // because dialogs may also be children
+            child->MacRedraw( childupdate , time , erase ) ;
+        }

     }
     }

-       return 0 ;
+    DisposeRgn( childupdate ) ;
+    // eventually a draw grow box here
+ 

 }
 
 }
 

-long wxWindow::MacGetRightBorderSize( ) const
+WXHWND wxWindowMac::MacGetRootWindow() const

 {
 {

-       if( m_macWindowData )
-               return 0 ;
+    wxWindowMac *iter = (wxWindowMac*)this ;
+    
+    while( iter )
+    {
+        if ( iter->IsTopLevel() )
+            return ((wxTopLevelWindow*)iter)->MacGetWindowRef() ;

 
 

-    if (m_windowStyle & wxRAISED_BORDER || m_windowStyle & wxSUNKEN_BORDER )
+        iter = iter->GetParent() ;
+    } 
+    wxASSERT_MSG( 1 , "No valid mac root window" ) ;
+    return NULL ;
+}
+
+void wxWindowMac::MacCreateScrollBars( long style ) 
+{
+    wxASSERT_MSG( m_vScrollBar == NULL && m_hScrollBar == NULL , "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 ) ;
+    
+    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, 
+        vSize , wxVERTICAL);
+
+    if ( style & wxVSCROLL )

     {
     {

-               return 3 ;
+        

     }
     }

-    else if (  m_windowStyle &wxDOUBLE_BORDER)
+    else

     {
     {

-               return 3 ;
+        m_vScrollBar->Show(false) ;

     }
     }

-    else if (m_windowStyle &wxSIMPLE_BORDER)
+    m_hScrollBar = new wxScrollBar(this, wxWINDOW_HSCROLL, hPoint, 
+        hSize , wxHORIZONTAL);
+    if ( style  & wxHSCROLL )

     {
     {

-       return 3 ;

     }
     }

-       return 0 ;
+    else
+    {
+        m_hScrollBar->Show(false) ;
+    }
+    
+    // because the create does not take into account the client area origin
+    MacRepositionScrollBars() ; // we might have a real position shift

 }
 
 }
 

-long wxWindow::MacGetTopBorderSize( ) const
+void wxWindowMac::MacRepositionScrollBars()

 {
 {

-       if( m_macWindowData )
-               return 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
+    
+    int width = m_width ; 
+    int height = m_height ;

 
 

-    if (m_windowStyle & wxRAISED_BORDER || m_windowStyle & wxSUNKEN_BORDER )
+    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) ;
+    
+    int x = 0 ; 
+    int y = 0 ;
+    int w = m_width ;
+    int h = m_height ;
+    
+    MacClientToRootWindow( &x , &y ) ;
+    MacClientToRootWindow( &w , &h ) ;
+    
+    wxWindowMac *iter = (wxWindowMac*)this ;
+    
+    int totW = 10000 , totH = 10000;
+    while( iter )

     {
     {

-               return 2 ;
+        if ( iter->IsTopLevel() )
+        {
+            totW = iter->m_width ;
+            totH = iter->m_height ;
+            break ;
+        }
+
+        iter = iter->GetParent() ;
+    } 
+    
+    if ( x == 0 )
+    {
+        hPoint.x = -1 ;
+        hSize.x += 1 ;

     }
     }

-    else if (  m_windowStyle &wxDOUBLE_BORDER)
+    if ( y == 0 )

     {
     {

-               return 2 ;
+        vPoint.y = -1 ;
+        vSize.y += 1 ;

     }
     }

-    else if (m_windowStyle &wxSIMPLE_BORDER)
+    
+    if ( w-x >= totW )
+    {
+        hSize.x += 1 ;
+        vPoint.x += 1 ;
+    }
+    
+    if ( h-y >= totH )
+    {
+        vSize.y += 1 ;
+        hPoint.y += 1 ;
+    }
+
+    if ( m_vScrollBar )
+    {
+        m_vScrollBar->SetSize( vPoint.x , vPoint.y, vSize.x, vSize.y , wxSIZE_ALLOW_MINUS_ONE);
+    }
+    if ( m_hScrollBar )
+    {
+        m_hScrollBar->SetSize( hPoint.x , hPoint.y, hSize.x, hSize.y, wxSIZE_ALLOW_MINUS_ONE);
+    }
+}
+
+bool wxWindowMac::AcceptsFocus() const
+{
+    return MacCanFocus() && wxWindowBase::AcceptsFocus();
+}
+
+WXWidget wxWindowMac::MacGetContainerForEmbedding() 
+{
+    return GetParent()->MacGetContainerForEmbedding() ;
+}
+
+void wxWindowMac::MacSuperChangedPosition() 
+{
+    // only window-absolute structures have to be moved i.e. controls
+
+    wxNode *node = GetChildren().First();
+    while ( node )

     {
     {

-       return 1 ;
+        wxWindowMac *child = (wxWindowMac *)node->Data();
+        child->MacSuperChangedPosition() ;
+        node = node->Next();

     }
     }

-       return 0 ;

 }
 
 }
 

-long wxWindow::MacGetBottomBorderSize( ) const
+void wxWindowMac::MacTopLevelWindowChangedPosition() 
+{
+    // only screen-absolute structures have to be moved i.e. glcanvas
+
+    wxNode *node = GetChildren().First();
+    while ( node )
+    {
+        wxWindowMac *child = (wxWindowMac *)node->Data();
+        child->MacTopLevelWindowChangedPosition() ;
+        node = node->Next();
+    }
+}
+long wxWindowMac::MacGetLeftBorderSize( ) const

 {
 {

-       if( m_macWindowData )
-               return 0 ;
+    if( IsTopLevel() )
+        return 0 ;

 
     if (m_windowStyle & wxRAISED_BORDER || m_windowStyle & wxSUNKEN_BORDER )
     {
 
     if (m_windowStyle & wxRAISED_BORDER || m_windowStyle & wxSUNKEN_BORDER )
     {

-               return 3 ;
+        SInt32 border = 3 ;
+#if wxMAC_USE_THEME_BORDER
+#if TARGET_CARBON       
+          GetThemeMetric( kThemeMetricListBoxFrameOutset , &border ) ;
+#endif
+#endif
+          return border ;

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

-               return 3 ;
+          SInt32 border = 3 ;
+#if wxMAC_USE_THEME_BORDER
+#if TARGET_CARBON       
+          GetThemeMetric( kThemeMetricListBoxFrameOutset , &border ) ;
+#endif
+#endif
+          return border ;

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

-       return 3 ;
-    }
-       return 0 ;
-}
-
-long wxWindow::MacRemoveBordersFromStyle( long style ) 
-{
-       return style & ~( wxDOUBLE_BORDER | wxSUNKEN_BORDER | wxRAISED_BORDER | wxBORDER | wxSTATIC_BORDER ) ;
-}
-
-
-wxMacDrawingHelper::wxMacDrawingHelper( wxWindow * theWindow ) 
-{
-       m_ok = false ;
-       Point localOrigin ;
-       Rect clipRect ;
-       WindowRef window ;
-       wxWindow *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( wxWindow * theWindow ) 
-{
-       m_ok = false ;
-       Point localOrigin ;
-       Rect clipRect ;
-       WindowRef window ;
-       wxWindow *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 wxWindow at the current mouse position, returning the mouse
+        return 1 ;
+    }
+    return 0 ;
+}
+
+long wxWindowMac::MacGetRightBorderSize( ) const
+{
+    // they are all symmetric in mac themes
+    return MacGetLeftBorderSize() ;
+}
+
+long wxWindowMac::MacGetTopBorderSize( ) const
+{
+    // they are all symmetric in mac themes
+    return MacGetLeftBorderSize() ;
+}
+
+long wxWindowMac::MacGetBottomBorderSize( ) const
+{
+    // they are all symmetric in mac themes
+    return MacGetLeftBorderSize() ;
+}
+
+long wxWindowMac::MacRemoveBordersFromStyle( long style ) 
+{
+    return style & ~( wxDOUBLE_BORDER | wxSUNKEN_BORDER | wxRAISED_BORDER | wxBORDER | wxSTATIC_BORDER ) ;
+}
+
+// Find the wxWindowMac at the current mouse position, returning the mouse

 // position.
 // position.

-wxWindow* wxFindWindowAtPointer(wxPoint& pt)
+wxWindowMac* wxFindWindowAtPointer(wxPoint& pt)

 {
     pt = wxGetMousePosition();
 {
     pt = wxGetMousePosition();

-    wxWindow* found = wxFindWindowAtPoint(pt);
+    wxWindowMac* found = wxFindWindowAtPoint(pt);

     return found;
 }
 
     return found;
 }