]> git.saurik.com Git - wxWidgets.git/blobdiff - src/mac/window.cpp
Initialized m_startint in the constructor to avoid cloning of uninitialized value
[wxWidgets.git] / src / mac / window.cpp
index dbfb493a09f09f1dd0110640515febab404d4836..95e1077a9b48bc445a105060c375ea6bfdfad10e 100644 (file)
@@ -15,6 +15,7 @@
 
 #include "wx/setup.h"
 #include "wx/menu.h"
 
 #include "wx/setup.h"
 #include "wx/menu.h"
+#include "wx/window.h"
 #include "wx/dc.h"
 #include "wx/dcclient.h"
 #include "wx/utils.h" 
 #include "wx/dc.h"
 #include "wx/dcclient.h"
 #include "wx/utils.h" 
 #include "wx/layout.h"
 #include "wx/dialog.h"
 #include "wx/listbox.h"
 #include "wx/layout.h"
 #include "wx/dialog.h"
 #include "wx/listbox.h"
+#include "wx/scrolbar.h"
+#include "wx/statbox.h"
 #include "wx/button.h"
 #include "wx/settings.h"
 #include "wx/msgdlg.h"
 #include "wx/frame.h"
 #include "wx/notebook.h"
 #include "wx/tabctrl.h"
 #include "wx/button.h"
 #include "wx/settings.h"
 #include "wx/msgdlg.h"
 #include "wx/frame.h"
 #include "wx/notebook.h"
 #include "wx/tabctrl.h"
-// TODO remove the line below, just for lookup-up convenience CS
-#include "wx/mac/window.h"
-
+#include "wx/tooltip.h"
+#include "wx/statusbr.h"
 #include "wx/menuitem.h"
 #include "wx/log.h"
 
 #include "wx/menuitem.h"
 #include "wx/log.h"
 
+#if wxUSE_CARET
+    #include "wx/caret.h"
+#endif // wxUSE_CARET
+
 #define wxWINDOW_HSCROLL 5998
 #define wxWINDOW_VSCROLL 5997
 #define MAC_SCROLLBAR_SIZE 16
 #define wxWINDOW_HSCROLL 5998
 #define wxWINDOW_VSCROLL 5997
 #define MAC_SCROLLBAR_SIZE 16
@@ -52,12 +58,12 @@ wxWindow* gFocusWindow = NULL ;
 
 #if !USE_SHARED_LIBRARY
 IMPLEMENT_DYNAMIC_CLASS(wxWindow, wxEvtHandler)
 
 #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)
 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)
 END_EVENT_TABLE()
 
 #endif
 END_EVENT_TABLE()
 
 #endif
@@ -102,11 +108,15 @@ void wxRemoveMacWindowAssociation(wxWindow *win)
 // constructors and such
 // ----------------------------------------------------------------------------
 
 // constructors and such
 // ----------------------------------------------------------------------------
 
+WindowRef wxWindow::s_macWindowInUpdate = NULL;
+
 void wxWindow::Init()
 {
     // generic
     InitBase();
 
 void wxWindow::Init()
 {
     // generic
     InitBase();
 
+    m_macEraseOnRedraw = true ;
+
     // MSW specific
     m_doubleClickAllowed = 0;
     m_winCaptured = FALSE;
     // MSW specific
     m_doubleClickAllowed = 0;
     m_winCaptured = FALSE;
@@ -124,6 +134,7 @@ void wxWindow::Init()
     m_isShown = TRUE;
 
        m_macWindowData = NULL ;
     m_isShown = TRUE;
 
        m_macWindowData = NULL ;
+       m_macEraseOnRedraw = true ;
 
        m_x = 0;
        m_y = 0 ;       
 
        m_x = 0;
        m_y = 0 ;       
@@ -141,6 +152,20 @@ void wxWindow::Init()
 // Destructor
 wxWindow::~wxWindow()
 {
 // Destructor
 wxWindow::~wxWindow()
 {
+    // deleting a window while it is shown invalidates the region
+    if ( IsShown() ) {
+        wxWindow* iter = this ;
+        while( iter ) {
+            if ( iter->m_macWindowData )
+            {
+                Refresh() ;
+                break ;
+            }
+            iter = iter->GetParent() ;
+            
+        }
+    }
+    
     m_isBeingDeleted = TRUE;
 
        if ( s_lastMouseWindow == this )
     m_isBeingDeleted = TRUE;
 
        if ( s_lastMouseWindow == this )
@@ -160,6 +185,7 @@ wxWindow::~wxWindow()
 
        if ( m_macWindowData )
        {
 
        if ( m_macWindowData )
        {
+               wxToolTip::NotifyWindowDelete(m_macWindowData->m_macWindow) ;
        UMADisposeWindow( m_macWindowData->m_macWindow ) ;
        delete m_macWindowData ;
        wxRemoveMacWindowAssociation( this ) ;
        UMADisposeWindow( m_macWindowData->m_macWindow ) ;
        delete m_macWindowData ;
        wxRemoveMacWindowAssociation( this ) ;
@@ -186,36 +212,63 @@ bool wxWindow::Create(wxWindow *parent, wxWindowID id,
        m_width = WidthDefault( size.x );
        m_height = HeightDefault( size.y ) ;
 
        m_width = WidthDefault( size.x );
        m_height = HeightDefault( size.y ) ;
 
-    MacCreateScrollBars( style ) ;
+       if ( ! IsKindOf( CLASSINFO ( wxControl ) ) && ! IsKindOf( CLASSINFO( wxStatusBar ) ) )
+       {
+       MacCreateScrollBars( style ) ;
+       }
 
     return TRUE;
 }
 
 void wxWindow::SetFocus()
 {
 
     return TRUE;
 }
 
 void wxWindow::SetFocus()
 {
+       if ( gFocusWindow == this )
+               return ;
+               
        if ( AcceptsFocus() )
        {
                if (gFocusWindow )
                {
        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 ) ;
                        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);
+               wxFocusEvent event(wxEVT_KILL_FOCUS, gFocusWindow->m_windowId);
+               event.SetEventObject(gFocusWindow);
                        gFocusWindow->GetEventHandler()->ProcessEvent(event) ;
                }
                gFocusWindow = this ;
                {
                        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 ) ;
                        }
 
                        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);
+               wxFocusEvent event(wxEVT_SET_FOCUS, m_windowId);
+               event.SetEventObject(this);
                        GetEventHandler()->ProcessEvent(event) ;
                }
        }
                        GetEventHandler()->ProcessEvent(event) ;
                }
        }
@@ -225,11 +278,6 @@ bool wxWindow::Enable(bool enable)
 {
     if ( !wxWindowBase::Enable(enable) )
         return FALSE;
 {
     if ( !wxWindowBase::Enable(enable) )
         return FALSE;
-/*
-    HWND hWnd = GetHwnd();
-    if ( hWnd )
-        ::EnableWindow(hWnd, (BOOL)enable);
-*/
 
     wxWindowList::Node *node = GetChildren().GetFirst();
     while ( node )
 
     wxWindowList::Node *node = GetChildren().GetFirst();
     while ( node )
@@ -295,18 +343,6 @@ void wxWindow::DoGetPosition(int *x, int *y) const
     }
 }
 
     }
 }
 
-wxSize wxWindow::DoGetBestSize()
-{
-       return wxSize( 0 , 0 ) ;
-}
-
-bool wxWindow::Reparent(wxWindow *parent)
-{
-    if ( !wxWindowBase::Reparent(parent) )
-        return FALSE;
-
-    return TRUE;
-}
 
 bool wxWindow::DoPopupMenu(wxMenu *menu, int x, int y)
 {
 
 bool wxWindow::DoPopupMenu(wxMenu *menu, int x, int y)
 {
@@ -356,6 +392,7 @@ void wxWindow::DoClientToScreen(int *x, int *y) const
        GrafPtr         port ;  
        ::GetPort( &port ) ;
        ::SetPort( UMAGetWindowPort( window ) ) ;
        GrafPtr         port ;  
        ::GetPort( &port ) ;
        ::SetPort( UMAGetWindowPort( window ) ) ;
+       ::SetOrigin( 0 , 0 ) ;
        ::LocalToGlobal( &localwhere ) ;
        ::SetPort( port ) ;
        *x = localwhere.h ;
        ::LocalToGlobal( &localwhere ) ;
        ::SetPort( port ) ;
        *x = localwhere.h ;
@@ -390,11 +427,19 @@ void wxWindow::MacRootWindowToClient( int *x , int *y ) const
 
 bool wxWindow::SetCursor(const wxCursor& cursor)
 {
 
 bool wxWindow::SetCursor(const wxCursor& cursor)
 {
-   if ( !wxWindowBase::SetCursor(cursor) )
-   {
-       // no change
+    if (m_cursor == cursor)
        return FALSE;
        return FALSE;
-   }
+
+    if (wxNullCursor == cursor)
+    {
+       if ( ! wxWindowBase::SetCursor( *wxSTANDARD_CURSOR ) )
+        return FALSE ;
+    }
+    else
+    {
+       if ( ! wxWindowBase::SetCursor( cursor ) )
+        return FALSE ;
+    }
 
   wxASSERT_MSG( m_cursor.Ok(),
                   wxT("cursor must be valid after call to the base version"));
 
   wxASSERT_MSG( m_cursor.Ok(),
                   wxT("cursor must be valid after call to the base version"));
@@ -409,7 +454,7 @@ bool wxWindow::SetCursor(const wxCursor& cursor)
   {
        if ( mouseWin == this && !wxIsBusy() )
        {
   {
        if ( mouseWin == this && !wxIsBusy() )
        {
-               cursor.MacInstall() ;
+               m_cursor.MacInstall() ;
        }
   }
 
        }
   }
 
@@ -423,10 +468,52 @@ void wxWindow::DoGetClientSize(int *x, int *y) const
     *x = m_width ;
     *y = m_height ;
 
     *x = m_width ;
     *y = m_height ;
 
-  if (m_vScrollBar && m_vScrollBar->IsShown() )
-       (*x) -= MAC_SCROLLBAR_SIZE;
-  if (m_hScrollBar  && m_hScrollBar->IsShown() )
-       (*y) -= MAC_SCROLLBAR_SIZE;
+       *x -= MacGetLeftBorderSize(  )  + MacGetRightBorderSize(  ) ;
+       *y -= MacGetTopBorderSize(  ) + MacGetBottomBorderSize( );
+       
+  if ( (m_vScrollBar && m_vScrollBar->IsShown()) || (m_hScrollBar  && m_hScrollBar->IsShown()) )
+  {
+       int x1 = 0 ; 
+       int y1 = 0 ;
+       int w = m_width ;
+       int h = m_height ;
+       
+       MacClientToRootWindow( &x1 , &y1 ) ;
+       MacClientToRootWindow( &w , &h ) ;
+       
+       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 ;
+       }
+       }
+  }
 }
 
 
 }
 
 
@@ -440,8 +527,8 @@ void wxWindow::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
@@ -451,8 +538,17 @@ void wxWindow::DoMoveWindow(int x, int y, int width, int height)
        DoSetSize( x,y, width, height ) ;
 }
 
        DoSetSize( x,y, width, height ) ;
 }
 
+// set the size of the window: if the dimensions are positive, just use them,
+// but if any of them is equal to -1, it means that we must find the value for
+// it ourselves (unless sizeFlags contains wxSIZE_ALLOW_MINUS_ONE flag, in
+// which case -1 is a valid value for x and y)
+//
+// If sizeFlags contains wxSIZE_AUTO_WIDTH/HEIGHT flags (default), we calculate
+// the width/height to best suit our contents, otherwise we reuse the current
+// width/height
 void wxWindow::DoSetSize(int x, int y, int width, int height, int sizeFlags)
 {
 void wxWindow::DoSetSize(int x, int y, int width, int height, int sizeFlags)
 {
+
        int former_x = m_x ;
        int former_y = m_y ;
        int former_w = m_width ;
        int former_x = m_x ;
        int former_y = m_y ;
        int former_w = m_width ;
@@ -467,15 +563,53 @@ void wxWindow::DoSetSize(int x, int y, int width, int height, int sizeFlags)
   int actualHeight = height;
   int actualX = x;
   int actualY = y;
   int actualHeight = height;
   int actualX = x;
   int actualY = y;
-  if (x == -1 || (sizeFlags & wxSIZE_ALLOW_MINUS_ONE))
+  if (x == -1 && !(sizeFlags & wxSIZE_ALLOW_MINUS_ONE))
       actualX = currentX;
       actualX = currentX;
-  if (y == -1 || (sizeFlags & wxSIZE_ALLOW_MINUS_ONE))
+  if (y == -1 && !(sizeFlags & wxSIZE_ALLOW_MINUS_ONE))
       actualY = currentY;
       actualY = currentY;
-  if (width == -1)
+  
+  wxSize size( -1 , -1 ) ;
+  
+  if (width == -1 || height == -1 )
+  {
+       size = DoGetBestSize() ;
+  }
+  
+  if ( width == -1 )
+  {
+       if ( sizeFlags & wxSIZE_AUTO_WIDTH )
+    {
+      actualWidth = size.x ;   
+      if ( actualWidth == -1 )
+       actualWidth = 80 ;
+    }
+    else
+    {
       actualWidth = currentW ;
       actualWidth = currentW ;
+    }
+  }
   if (height == -1)
   if (height == -1)
+  {
+       if ( sizeFlags & wxSIZE_AUTO_HEIGHT )
+       {
+               actualHeight = size.y ;
+               if ( actualHeight == -1 )
+                       actualHeight = 26 ;
+       }
+       else 
+       {
       actualHeight = currentH ;
       actualHeight = 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
        if ( actualX == currentX && actualY == currentY && actualWidth == currentW && actualHeight == currentH)
        {
                MacRepositionScrollBars() ; // we might have a real position shift
@@ -505,13 +639,12 @@ void wxWindow::DoSetSize(int x, int y, int width, int height, int sizeFlags)
                else
                {
                        // erase former position
                else
                {
                        // erase former position
+                       wxMacDrawingHelper focus( this ) ;
+                       if ( focus.Ok() )
                        {
                        {
-                               wxMacDrawingClientHelper focus( this ) ;
-                               if ( focus.Ok() )
-                               {
-                               Rect clientrect = { 0 , 0 , m_height , m_width } ;
-                           InvalRect( &clientrect ) ;
-                               }
+                               Rect clientrect = { 0 , 0 , m_height , m_width } ;
+                               // ClipRect( &clientrect ) ;
+                       InvalWindowRect( GetMacRootWindow() , &clientrect ) ;
                        }
                }
                m_x = actualX ;
                        }
                }
                m_x = actualX ;
@@ -521,48 +654,52 @@ void wxWindow::DoSetSize(int x, int y, int width, int height, int sizeFlags)
                if ( m_macWindowData )
                {
                        if ( doMove )
                if ( m_macWindowData )
                {
                        if ( doMove )
-                               ::MoveWindow(m_macWindowData->m_macWindow, m_x, m_y, false); // don't make frontmost
+                               ::MoveWindow(m_macWindowData->m_macWindow, m_x, m_y  , false); // don't make frontmost
                        
                        if ( doResize )
                        
                        if ( doResize )
-                               ::SizeWindow(m_macWindowData->m_macWindow, m_width, m_height, true); 
+                               ::SizeWindow(m_macWindowData->m_macWindow, m_width, m_height  , true); 
                        
                        
-                       // the OS takes care of invalidating and erasing        
+                       // 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 ;
                        
                        if ( IsKindOf( CLASSINFO( wxFrame ) ) )
                        {
                                wxFrame* frame = (wxFrame*) this ;
-                         frame->PositionStatusBar();
-                       frame->PositionToolBar();
+                               frame->PositionStatusBar();
+                               frame->PositionToolBar();
                        }
                }
                else
                {
                        // erase new position
                        }
                }
                else
                {
                        // erase new position
+                       
                        {
                        {
-                               wxMacDrawingClientHelper focus( this ) ;
+                               wxMacDrawingHelper focus( this ) ;
                                if ( focus.Ok() )
                                {
                                if ( focus.Ok() )
                                {
-                               Rect clientrect = { 0 , 0 , m_height , m_width } ;
-                           InvalRect( &clientrect ) ;
+                                       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 )
                {
                        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 )
-    {
+               wxMoveEvent event(wxPoint(m_x, m_y), m_windowId);
+               event.SetEventObject(this);
+               GetEventHandler()->ProcessEvent(event) ;
+       }
+       if ( doResize )
+       {
                        MacRepositionScrollBars() ;
                        MacRepositionScrollBars() ;
-           wxSizeEvent event(wxSize(m_width, m_height), m_windowId);
-           event.SetEventObject(this);
-           GetEventHandler()->ProcessEvent(event);
-    }
+               wxSizeEvent event(wxSize(m_width, m_height), m_windowId);
+               event.SetEventObject(this);
+               GetEventHandler()->ProcessEvent(event);
+       }
        }
 }
 // For implementation purposes - sometimes decorations make the client area
        }
 }
 // For implementation purposes - sometimes decorations make the client area
@@ -570,7 +707,7 @@ void wxWindow::DoSetSize(int x, int y, int width, int height, int sizeFlags)
 
 wxPoint wxWindow::GetClientAreaOrigin() const
 {
 
 wxPoint wxWindow::GetClientAreaOrigin() const
 {
-    return wxPoint(0, 0);
+    return wxPoint(MacGetLeftBorderSize(  ) , MacGetTopBorderSize(  ) );
 }
 
 // Makes an adjustment to the window position (for example, a frame that has
 }
 
 // Makes an adjustment to the window position (for example, a frame that has
@@ -618,7 +755,8 @@ bool wxWindow::Show(bool show)
          {
                UMAShowWindow( m_macWindowData->m_macWindow ) ;
                UMASelectWindow( m_macWindowData->m_macWindow ) ;
          {
                UMAShowWindow( m_macWindowData->m_macWindow ) ;
                UMASelectWindow( m_macWindowData->m_macWindow ) ;
-                       // no need to generate events here, they will get them triggered by macos
+               // 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);
            wxSizeEvent event(wxSize(m_width, m_height), m_windowId);
            event.SetEventObject(this);
            GetEventHandler()->ProcessEvent(event);
@@ -628,11 +766,42 @@ bool wxWindow::Show(bool show)
                UMAHideWindow( m_macWindowData->m_macWindow ) ;
          }
        }
                UMAHideWindow( m_macWindowData->m_macWindow ) ;
          }
        }
+       MacSuperShown( show ) ;
        Refresh() ;
 
     return TRUE;
 }
 
        Refresh() ;
 
     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 ;
+*/
+}
+
 int wxWindow::GetCharHeight() const
 {
        wxClientDC dc ( (wxWindow*)this ) ;
 int wxWindow::GetCharHeight() const
 {
        wxClientDC dc ( (wxWindow*)this ) ;
@@ -651,21 +820,23 @@ void wxWindow::GetTextExtent(const wxString& string, int *x, int *y,
     const wxFont *fontToUse = theFont;
     if ( !fontToUse )
         fontToUse = &m_font;
     const wxFont *fontToUse = theFont;
     if ( !fontToUse )
         fontToUse = &m_font;
-/*
+        
+    wxClientDC dc( (wxWindow*) this ) ;
+    long lx,ly,ld,le ;
+    dc.GetTextExtent( string , &lx , &ly , &ld, &le, (wxFont *)fontToUse ) ;
+    if ( externalLeading )
+       *externalLeading = le ;
+    if ( descent )
+       *descent = ld ;
     if ( x )
     if ( x )
-        *x = sizeRect.cx;
+       *x = lx ;
     if ( y )
     if ( y )
-        *y = sizeRect.cy;
-    if ( descent )
-        *descent = tm.tmDescent;
-    if ( externalLeading )
-        *externalLeading = tm.tmExternalLeading;
-*/
-
+       *y = ly ;
 }
 
 void wxWindow::MacEraseBackground( Rect *rect )
 {
 }
 
 void wxWindow::MacEraseBackground( Rect *rect )
 {
+/*
        WindowRef window = GetMacRootWindow() ;
        if ( m_backgroundColour == wxSystemSettings::GetSystemColour(wxSYS_COLOUR_APPWORKSPACE) )
        {
        WindowRef window = GetMacRootWindow() ;
        if ( m_backgroundColour == wxSystemSettings::GetSystemColour(wxSYS_COLOUR_APPWORKSPACE) )
        {
@@ -691,7 +862,7 @@ void wxWindow::MacEraseBackground( Rect *rect )
                                        // if we have the normal colours in the hierarchy but another control etc. -> use it's background
                                        if ( parent->IsKindOf( CLASSINFO( wxNotebook ) ) || parent->IsKindOf( CLASSINFO( wxTabCtrl ) ))
                                        {
                                        // if 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 ) ))
                                        {
-                                               ApplyThemeBackground                    (kThemeBackgroundTabPane, rect, kThemeStateActive,8,true);
+                                               UMAApplyThemeBackground(kThemeBackgroundTabPane, rect, kThemeStateActive,8,true);
                                                break ;
                                        }
                                }
                                                break ;
                                        }
                                }
@@ -719,10 +890,6 @@ void wxWindow::MacEraseBackground( Rect *rect )
        for (wxNode *node = GetChildren().First(); node; node = node->Next())
        {
                wxWindow *child = (wxWindow*)node->Data();
        for (wxNode *node = GetChildren().First(); node; node = node->Next())
        {
                wxWindow *child = (wxWindow*)node->Data();
-//                     int width ;
-//                     int height ;
-               
-//                     child->GetClientSize( &width , &height ) ;
                
                Rect clientrect = { child->m_x , child->m_y , child->m_x +child->m_width , child->m_y + child->m_height } ;
                SectRect( &clientrect , rect , &clientrect ) ;          
                
                Rect clientrect = { child->m_x , child->m_y , child->m_x +child->m_width , child->m_y + child->m_height } ;
                SectRect( &clientrect , rect , &clientrect ) ;          
@@ -737,31 +904,31 @@ void wxWindow::MacEraseBackground( Rect *rect )
                        }
                }
        }
                        }
                }
        }
+*/
 }
 
 void wxWindow::Refresh(bool eraseBack, const wxRect *rect)
 {
 }
 
 void wxWindow::Refresh(bool eraseBack, const wxRect *rect)
 {
-       wxMacDrawingClientHelper focus( this ) ;
+//    if ( !IsShown() )
+//        return ;
+        
+       wxMacDrawingHelper focus( this ) ;
        if ( focus.Ok() )
        {
        if ( focus.Ok() )
        {
-       int width , height ;
-       GetClientSize( &width , &height ) ;
-       Rect clientrect = { 0 , 0 , height , width } ;
-       ClipRect( &clientrect ) ;
+               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 } ;
+       if ( rect )
+       {
+               Rect r = { rect->y , rect->x , rect->y + rect->height , rect->x + rect->width } ;
                        SectRect( &clientrect , &r , &clientrect ) ;            
                        SectRect( &clientrect , &r , &clientrect ) ;            
-    }
-    InvalRect( &clientrect ) ;
-    /*
-    if ( eraseBack )
-    {
-       MacEraseBackground( &clientrect ) ;
-       }
-       */
+       }
+       InvalWindowRect( GetMacRootWindow() , &clientrect ) ;
        }
        }
+       if ( !eraseBack )
+               m_macEraseOnRedraw = false ;
+       else
+               m_macEraseOnRedraw = true ;
 }
 
 // Responds to colour changes: passes event on to children.
 }
 
 // Responds to colour changes: passes event on to children.
@@ -840,7 +1007,6 @@ void wxWindow::WarpPointer (int x_pos, int y_pos)
 void wxWindow::OnEraseBackground(wxEraseEvent& event)
 {
     // TODO : probably we would adopt the EraseEvent structure
 void wxWindow::OnEraseBackground(wxEraseEvent& event)
 {
     // TODO : probably we would adopt the EraseEvent structure
-    Default();
 }
 
 int wxWindow::GetScrollPos(int orient) const
 }
 
 int wxWindow::GetScrollPos(int orient) const
@@ -904,6 +1070,212 @@ void wxWindow::SetScrollPos(int orient, int pos, bool refresh)
                }
 }
 
                }
 }
 
+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() ;
+
+    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 ) ;
+       }
+    }
+    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);         
+           }
+    }
+ */
+}
+
 // New function that will replace some of the above.
 void wxWindow::SetScrollbar(int orient, int pos, int thumbVisible,
     int range, bool refresh)
 // New function that will replace some of the above.
 void wxWindow::SetScrollbar(int orient, int pos, int thumbVisible,
     int range, bool refresh)
@@ -921,7 +1293,7 @@ void wxWindow::SetScrollbar(int orient, int pos, int thumbVisible,
                                {
                                        if ( !m_hScrollBar->IsShown() )
                                                m_hScrollBar->Show(true) ;
                                {
                                        if ( !m_hScrollBar->IsShown() )
                                                m_hScrollBar->Show(true) ;
-                                       m_hScrollBar->SetScrollbar( pos , thumbVisible , range , refresh ) ;
+                                       m_hScrollBar->SetScrollbar( pos , thumbVisible , range , thumbVisible , refresh ) ;
                                }
                        }
                }
                                }
                        }
                }
@@ -938,7 +1310,7 @@ void wxWindow::SetScrollbar(int orient, int pos, int thumbVisible,
                                {
                                        if ( !m_vScrollBar->IsShown() )
                                                m_vScrollBar->Show(true) ;
                                {
                                        if ( !m_vScrollBar->IsShown() )
                                                m_vScrollBar->Show(true) ;
-                                       m_vScrollBar->SetScrollbar( pos , thumbVisible , range , refresh ) ;
+                                       m_vScrollBar->SetScrollbar( pos , thumbVisible , range , thumbVisible , refresh ) ;
                                }
                        }
                }
                                }
                        }
                }
@@ -951,21 +1323,71 @@ void wxWindow::ScrollWindow(int dx, int dy, const wxRect *rect)
        wxMacDrawingClientHelper focus( this ) ;
        if ( focus.Ok() )
        {
        wxMacDrawingClientHelper focus( this ) ;
        if ( focus.Ok() )
        {
-       int width , height ;
-       GetClientSize( &width , &height ) ;
-       Rect scrollrect = { 0 , 0 , height , width } ;
+               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 } ;
+               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 ) ;            
                        SectRect( &scrollrect , &r , &scrollrect ) ;            
-    }
-       ScrollRect( &scrollrect , dx , dy , updateRgn ) ;
-    InvalRgn( updateRgn ) ;
-    DisposeRgn( updateRgn ) ;
+       }
+               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)
 }
 
 bool wxWindow::SetFont(const wxFont& font)
@@ -1016,6 +1438,30 @@ wxObject* wxWindow::GetChild(int number) const
 }
 #endif // WXWIN_COMPATIBILITY
 
 }
 #endif // WXWIN_COMPATIBILITY
 
+void wxWindow::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
+    //
+    // 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;
+    }
+
+    event.Skip();
+}
+
 void wxWindow::Clear()
 {
        if ( m_macWindowData )
 void wxWindow::Clear()
 {
        if ( m_macWindowData )
@@ -1031,9 +1477,9 @@ void wxWindow::Clear()
        else
        {
                wxClientDC dc(this);
        else
        {
                wxClientDC dc(this);
-    wxBrush brush(GetBackgroundColour(), wxSOLID);
-    dc.SetBackground(brush);
-    dc.Clear();
+       wxBrush brush(GetBackgroundColour(), wxSOLID);
+       dc.SetBackground(brush);
+       dc.Clear();
        }
 }
 
        }
 }
 
@@ -1088,6 +1534,9 @@ void wxWindow::DoSetClientSize(int width, int height)
                if ( height != -1 && m_vScrollBar )
                        height += MAC_SCROLLBAR_SIZE ;
 
                if ( height != -1 && m_vScrollBar )
                        height += MAC_SCROLLBAR_SIZE ;
 
+               width += MacGetLeftBorderSize(  ) + MacGetRightBorderSize( ) ;
+               height += MacGetTopBorderSize(  ) + MacGetBottomBorderSize( ) ;
+
                DoSetSize( -1 , -1 , width , height ) ;
        }
 }
                DoSetSize( -1 , -1 , width , height ) ;
        }
 }
@@ -1111,7 +1560,8 @@ bool wxWindow::MacGetWindowFromPointSub( const wxPoint &point , wxWindow** outWi
        for (wxNode *node = GetChildren().First(); node; node = node->Next())
        {
                wxWindow *child = (wxWindow*)node->Data();
        for (wxNode *node = GetChildren().First(); node; node = node->Next())
        {
                wxWindow *child = (wxWindow*)node->Data();
-               if ( child->GetMacRootWindow() == window )
+               // added the m_isShown test --dmazzoni
+               if ( child->GetMacRootWindow() == window && child->m_isShown )
                {
                        if (child->MacGetWindowFromPointSub(newPoint , outWin ))
                                return TRUE;
                {
                        if (child->MacGetWindowFromPointSub(newPoint , outWin ))
                                return TRUE;
@@ -1130,9 +1580,12 @@ bool wxWindow::MacGetWindowFromPoint( const wxPoint &screenpoint , wxWindow** ou
        {
                        wxPoint point( screenpoint ) ;
                        wxWindow* win = wxFindWinFromMacWindow( window ) ;
        {
                        wxPoint point( screenpoint ) ;
                        wxWindow* win = wxFindWinFromMacWindow( window ) ;
+                       if ( win )
+                       {
                        win->ScreenToClient( point ) ;
                        return win->MacGetWindowFromPointSub( point , outWin ) ;
        }
                        win->ScreenToClient( point ) ;
                        return win->MacGetWindowFromPointSub( point , outWin ) ;
        }
+       }
        return FALSE ;
 }
 
        return FALSE ;
 }
 
@@ -1144,6 +1597,7 @@ bool wxWindow::MacDispatchMouseEvent(wxMouseEvent& event)
                (event.m_x > (m_x + m_width)) || (event.m_y > (m_y + m_height)))
                return FALSE;
        
                (event.m_x > (m_x + m_width)) || (event.m_y > (m_y + m_height)))
                return FALSE;
        
+
        if ( IsKindOf( CLASSINFO ( wxStaticBox ) ) )
                return FALSE ; 
        
        if ( IsKindOf( CLASSINFO ( wxStaticBox ) ) )
                return FALSE ; 
        
@@ -1172,10 +1626,35 @@ bool wxWindow::MacDispatchMouseEvent(wxMouseEvent& event)
        {
                m_cursor.MacInstall() ;
        }
        {
                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 
+               || event.GetEventType() == wxEVT_ENTER_WINDOW
+               || event.GetEventType() == wxEVT_LEAVE_WINDOW )
+        wxToolTip::RelayEvent( this , event);
+#endif // wxUSE_TOOLTIPS
        GetEventHandler()->ProcessEvent( event ) ;
        return TRUE;
 }
 
        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);
 void wxWindow::MacFireMouseEvent( EventRecord *ev )
 {
        wxMouseEvent event(wxEVT_LEFT_DOWN);
@@ -1218,6 +1697,26 @@ void wxWindow::MacFireMouseEvent( EventRecord *ev )
        ::GlobalToLocal( &localwhere ) ;
        ::SetPort( port ) ;
 
        ::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_x = localwhere.h;
        event.m_y = localwhere.v;
        event.m_x += m_x;
@@ -1287,25 +1786,36 @@ void wxWindow::MacMouseMoved( EventRecord *ev , short part)
 }
 void wxWindow::MacActivate( EventRecord *ev , bool inIsActivating )
 {
 }
 void wxWindow::MacActivate( EventRecord *ev , bool inIsActivating )
 {
-       wxActivateEvent event(wxEVT_ACTIVATE, 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);
        
        event.m_timeStamp = ev->when ;
        event.SetEventObject(this);
        
        GetEventHandler()->ProcessEvent(event);
        
+    Refresh(false) ;
        UMAHighlightAndActivateWindow( m_macWindowData->m_macWindow , inIsActivating ) ;
        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() ;
 }
 
 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 ) ;
        {
        wxWindow* win = wxFindWinFromMacWindow( window ) ;
        {
-               wxMacDrawingClientHelper focus( this ) ;
+               wxMacDrawingHelper focus( this ) ; // was client
                if ( focus.Ok() )
                {
                        WindowRef window = GetMacRootWindow() ;
                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 ) ;
                        if ( m_backgroundColour == wxSystemSettings::GetSystemColour(wxSYS_COLOUR_APPWORKSPACE) )
                        {
                                        UMASetThemeWindowBackground( window , kThemeBrushDocumentWindowBackground , false ) ;
@@ -1332,13 +1842,15 @@ void wxWindow::MacRedraw( RgnHandle updatergn , long time)
                                                        if ( parent->m_backgroundColour != wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DFACE ) )
                                                        {
                                                                // if we have any other colours in the hierarchy
                                                        if ( parent->m_backgroundColour != wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DFACE ) )
                                                        {
                                                                // if we have any other colours in the hierarchy
-                                                       RGBBackColor( &parent->m_backgroundColour.GetPixel()) ;
-                                                       break ;
+                                                               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 ) ))
                                                        {
                                                        }
                                                        // 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 ) ))
                                                        {
-                                                               ApplyThemeBackground                    (kThemeBackgroundTabPane, &(**updatergn).rgnBBox , kThemeStateActive,8,true);
+                                                               Rect box ;
+                                                               GetRegionBounds( updatergn , &box) ;
+                                                               UMAApplyThemeBackground(kThemeBackgroundTabPane, &box , kThemeStateActive,8,true);
                                                                break ;
                                                        }
                                                }
                                                                break ;
                                                        }
                                                }
@@ -1359,33 +1871,67 @@ void wxWindow::MacRedraw( RgnHandle updatergn , long time)
                        {
                                RGBBackColor( &m_backgroundColour.GetPixel()) ;
                        }
                        {
                                RGBBackColor( &m_backgroundColour.GetPixel()) ;
                        }
-                       SetClip( updatergn ) ;
-                       EraseRgn( updatergn ) ; 
+            // 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->GetBackgroundColour() != m_backgroundColour && !child->IsKindOf( CLASSINFO( wxControl ) ) && ((wxControl*)child)->GetMacControl() )
+                           {
+                               SetRectRgn( childarea , child->m_x , child->m_y , child->m_x + child->m_width ,  child->m_y + child->m_height ) ;
+                               DiffRgn( ownUpdateRgn , childarea , ownUpdateRgn ) ;
+                           }
+                       }
+               }               
+               DisposeRgn( childarea ) ;
+
+                       if ( GetParent() && m_backgroundColour != GetParent()->GetBackgroundColour() )
+                               eraseBackground = true ;
+                       SetClip( 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);
+       }
        
        
-       m_updateRegion = updatergn ;
-       wxPaintEvent event;
-       event.m_timeStamp = time ;
-       event.SetEventObject(this);
-       
-       GetEventHandler()->ProcessEvent(event);
        
        RgnHandle childupdate = NewRgn() ;
        
        RgnHandle childupdate = NewRgn() ;
-
+                       
        for (wxNode *node = GetChildren().First(); node; node = node->Next())
        {
                wxWindow *child = (wxWindow*)node->Data();
        for (wxNode *node = GetChildren().First(); node; node = node->Next())
        {
                wxWindow *child = (wxWindow*)node->Data();
-               int width ;
-               int height ;
-               
-               child->GetClientSize( &width , &height ) ;
-               
-               SetRectRgn( childupdate , child->m_x , child->m_y , child->m_x +width ,  child->m_y + height ) ;
-               SectRgn( childupdate , m_updateRegion.GetWXHRGN() , childupdate ) ;
+               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 ) ;
                OffsetRgn( childupdate , -child->m_x , -child->m_y ) ;
-               if ( child->GetMacRootWindow() == window && child->IsShown() )
+               if ( child->GetMacRootWindow() == window && child->IsShown() && !EmptyRgn( childupdate ) )
                {
                        // because dialogs may also be children
                        child->MacRedraw( childupdate , time ) ;
                {
                        // because dialogs may also be children
                        child->MacRedraw( childupdate , time ) ;
@@ -1401,24 +1947,28 @@ void wxWindow::MacUpdateImmediately()
        if ( window )
        {
                wxWindow* win = wxFindWinFromMacWindow( window ) ;
        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 )
                {
                BeginUpdate( window ) ;
                if ( win )
                {
-               #if ! TARGET_CARBON
-                       if ( !EmptyRgn( window->visRgn ) )
-               #endif
+                       RgnHandle               region = NewRgn();
+                       
+                       if ( region )
                        {
                        {
-                               win->MacRedraw( window->visRgn , wxTheApp->sm_lastMessageTime ) ;
-/*
-                               {
-                                       wxMacDrawingHelper help( win ) ;
-                                       SetOrigin( 0 , 0 ) ;
-                                       UMASetThemeWindowBackground( win->m_macWindowData->m_macWindow , kThemeBrushDialogBackgroundActive , false ) ;
-                                       UMAUpdateControls( window , window->visRgn ) ;
-                                       UMASetThemeWindowBackground( win->m_macWindowData->m_macWindow , win->m_macWindowData->m_macWindowBackgroundTheme , false ) ;
-                               }
-*/
-                       }
+                   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 ) ;
        }
                }
                EndUpdate( window ) ;
        }
@@ -1428,26 +1978,28 @@ void wxWindow::MacUpdate( EventRecord *ev )
 {
        WindowRef window = (WindowRef) ev->message ;
        wxWindow * win = wxFindWinFromMacWindow( window ) ;
 {
        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 )
        {
        BeginUpdate( window ) ;
        if ( win )
        {
-               // if windowshade gives incompatibility , take the follwing out
-               #if ! TARGET_CARBON
-               if ( !EmptyRgn( window->visRgn ) )
-               #endif
+               RgnHandle               region = NewRgn();
+               
+               if ( region )
                {
                {
-                       MacRedraw( window->visRgn , ev->when ) ;
-                       /*
-                       {
-                               wxMacDrawingHelper help( this ) ;
-                               SetOrigin( 0 , 0 ) ;
-                               UMASetThemeWindowBackground( m_macWindowData->m_macWindow , kThemeBrushDialogBackgroundActive , false ) ;
-                               UMAUpdateControls( window , window->visRgn ) ;
-                               UMASetThemeWindowBackground( m_macWindowData->m_macWindow , m_macWindowData->m_macWindowBackgroundTheme , false ) ;
-                       }
-                       */
-               }
+            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 );
+        }
        }
        EndUpdate( window ) ;
 }
        }
        EndUpdate( window ) ;
 }
@@ -1471,19 +2023,38 @@ WindowRef wxWindow::GetMacRootWindow() const
 void wxWindow::MacCreateScrollBars( long style ) 
 {
        wxASSERT_MSG( m_vScrollBar == NULL && m_hScrollBar == NULL , "attempt to create window twice" ) ;
 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 ;
        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 )
        {
        if ( style & wxVSCROLL )
        {
-               m_vScrollBar = new wxScrollBar(this, wxWINDOW_VSCROLL, wxPoint(m_width-MAC_SCROLLBAR_SIZE, 0), 
-                       wxSize(MAC_SCROLLBAR_SIZE, m_height - adjust), wxVERTICAL);
+               
        }
        }
+       else
+       {
+               m_vScrollBar->Show(false) ;
+       }
+       m_hScrollBar = new wxScrollBar(this, wxWINDOW_HSCROLL, hPoint, 
+               hSize , wxHORIZONTAL);
        if ( style  & wxHSCROLL )
        {
        if ( style  & wxHSCROLL )
        {
-               m_hScrollBar = new wxScrollBar(this, wxWINDOW_HSCROLL, wxPoint(0 , m_height-MAC_SCROLLBAR_SIZE ), 
-                       wxSize( m_width - adjust, MAC_SCROLLBAR_SIZE), wxHORIZONTAL);
        }
        }
+       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
 }
        // because the create does not take into account the client area origin
        MacRepositionScrollBars() ; // we might have a real position shift
 }
@@ -1493,22 +2064,86 @@ void wxWindow::MacRepositionScrollBars()
        bool hasBoth = ( m_hScrollBar && m_hScrollBar->IsShown()) && ( m_vScrollBar && m_vScrollBar->IsShown()) ;
        int adjust = hasBoth ? MAC_SCROLLBAR_SIZE - 1 : 0 ;
        
        bool hasBoth = ( m_hScrollBar && m_hScrollBar->IsShown()) && ( m_vScrollBar && m_vScrollBar->IsShown()) ;
        int adjust = hasBoth ? MAC_SCROLLBAR_SIZE - 1 : 0 ;
        
+       // get real client area
+       
+       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 )
        {
        if ( m_vScrollBar )
        {
-               m_vScrollBar->SetSize( m_width-MAC_SCROLLBAR_SIZE, 0, MAC_SCROLLBAR_SIZE, m_height - adjust , wxSIZE_USE_EXISTING);
+               m_vScrollBar->SetSize( vPoint.x , vPoint.y, vSize.x, vSize.y , wxSIZE_ALLOW_MINUS_ONE);
        }
        if ( m_hScrollBar )
        {
        }
        if ( m_hScrollBar )
        {
-               m_hScrollBar->SetSize( 0 , m_height-MAC_SCROLLBAR_SIZE ,m_width - adjust, MAC_SCROLLBAR_SIZE, wxSIZE_USE_EXISTING);
+               m_hScrollBar->SetSize( hPoint.x , hPoint.y, hSize.x, hSize.y, wxSIZE_ALLOW_MINUS_ONE);
        }
 }
 
 void wxWindow::MacKeyDown( EventRecord *ev ) 
 {
        }
 }
 
 void wxWindow::MacKeyDown( EventRecord *ev ) 
 {
-}
 
 
+}
 
 
 
 
+bool wxWindow::AcceptsFocus() const
+{
+    return MacCanFocus() && wxWindowBase::AcceptsFocus();
+}
 
 ControlHandle wxWindow::MacGetContainerForEmbedding() 
 {
 
 ControlHandle wxWindow::MacGetContainerForEmbedding() 
 {
@@ -1530,55 +2165,6 @@ void wxWindow::MacSuperChangedPosition()
                node = node->Next();
        }
 }
                node = node->Next();
        }
 }
-       
-bool wxWindow::MacSetupFocusPort(  ) 
-{
-       Point localOrigin ;
-       Rect clipRect ;
-       WindowRef window ;
-       wxWindow *rootwin ;
-       GrafPtr port ;
-       
-       MacGetPortParams( &localOrigin , &clipRect , &window , &rootwin) ;
-       return  MacSetPortFocusParams( localOrigin, clipRect, window , rootwin ) ; 
-}
-
-bool wxWindow::MacSetupFocusClientPort(  ) 
-{
-       Point localOrigin ;
-       Rect clipRect ;
-       WindowRef window ;
-       wxWindow *rootwin ;
-       GrafPtr port ;
-       
-       MacGetPortClientParams( &localOrigin , &clipRect , &window , &rootwin) ;
-       return  MacSetPortFocusParams( localOrigin, clipRect, window , rootwin ) ; 
-}
-
-bool wxWindow::MacSetupDrawingPort(  ) 
-{
-       Point localOrigin ;
-       Rect clipRect ;
-       WindowRef window ;
-       wxWindow *rootwin ;
-       GrafPtr port ;
-       
-       MacGetPortParams( &localOrigin , &clipRect , &window , &rootwin) ;
-       return  MacSetPortDrawingParams( localOrigin, clipRect, window , rootwin ) ; 
-}
-
-bool wxWindow::MacSetupDrawingClientPort(  ) 
-{
-       Point localOrigin ;
-       Rect clipRect ;
-       WindowRef window ;
-       wxWindow *rootwin ;
-       GrafPtr port ;
-       
-       MacGetPortClientParams( &localOrigin , &clipRect , &window , &rootwin) ;
-       return  MacSetPortDrawingParams( localOrigin, clipRect, window , rootwin ) ; 
-}
-
 
 bool wxWindow::MacSetPortFocusParams( const Point & localOrigin, const Rect & clipRect, WindowRef window , wxWindow* win ) 
 {
 
 bool wxWindow::MacSetPortFocusParams( const Point & localOrigin, const Rect & clipRect, WindowRef window , wxWindow* win ) 
 {
@@ -1593,6 +2179,7 @@ bool wxWindow::MacSetPortFocusParams( const Point & localOrigin, const Rect & cl
        if (currPort != port )
                        ::SetPort(port);
                                
        if (currPort != port )
                        ::SetPort(port);
                                
+//     wxASSERT( port->portRect.left == 0 && port->portRect.top == 0 ) ; 
        ::SetOrigin(-localOrigin.h, -localOrigin.v);
        return true;                    
 }
        ::SetOrigin(-localOrigin.h, -localOrigin.v);
        return true;                    
 }
@@ -1608,14 +2195,16 @@ bool wxWindow::MacSetPortDrawingParams( const Point & localOrigin, const Rect &
        port = UMAGetWindowPort( window) ;
        if (currPort != port )
                        ::SetPort(port);
        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() ) ;
        ::SetOrigin(-localOrigin.h, -localOrigin.v);
        ::ClipRect(&clipRect);
 
        ::PenNormal() ;
        ::RGBBackColor(& win->GetBackgroundColour().GetPixel() ) ;
        ::RGBForeColor(& win->GetForegroundColour().GetPixel() ) ;
-       ::BackPat( &qd.white ) ;
+       Pattern whiteColor ;
+       
+       ::BackPat( GetQDGlobalsWhite( &whiteColor) ) ;
        ::UMASetThemeWindowBackground(  win->m_macWindowData->m_macWindow , win->m_macWindowData->m_macWindowBackgroundTheme ,  false ) ;
        return true;                    
 }
        ::UMASetThemeWindowBackground(  win->m_macWindowData->m_macWindow , win->m_macWindowData->m_macWindowBackgroundTheme ,  false ) ;
        return true;                    
 }
@@ -1650,10 +2239,10 @@ void wxWindow::MacGetPortParams(Point* localOrigin, Rect* clipRect, WindowRef *w
        }
 }
 
        }
 }
 
-void wxWindow::MacGetPortClientParams(Point* localOrigin, Rect* clipRect, WindowRef *window , wxWindow** rootwin ) 
+void wxWindow::MacDoGetPortClientParams(Point* localOrigin, Rect* clipRect, WindowRef *window , wxWindow** rootwin ) 
 {
 {
-       int width , height ;
-       GetClientSize( &width , &height ) ;
+//     int width , height ;
+//     GetClientSize( &width , &height ) ;
        
        if ( m_macWindowData )
        {
        
        if ( m_macWindowData )
        {
@@ -1670,7 +2259,7 @@ void wxWindow::MacGetPortClientParams(Point* localOrigin, Rect* clipRect, Window
        {
                wxASSERT( GetParent() != NULL ) ;
                
        {
                wxASSERT( GetParent() != NULL ) ;
                
-               GetParent()->MacGetPortClientParams( localOrigin , clipRect , window, rootwin) ;
+               GetParent()->MacDoGetPortClientParams( localOrigin , clipRect , window, rootwin) ;
 
                localOrigin->h += m_x;
                localOrigin->v += m_y;
 
                localOrigin->h += m_x;
                localOrigin->v += m_y;
@@ -1679,41 +2268,119 @@ void wxWindow::MacGetPortClientParams(Point* localOrigin, Rect* clipRect, Window
                Rect myClip;
                myClip.left = 0;
                myClip.top = 0;
                Rect myClip;
                myClip.left = 0;
                myClip.top = 0;
-               myClip.right = width;
-               myClip.bottom = height;
+               myClip.right = m_width ;//width;
+               myClip.bottom = m_height ;// height;
                SectRect(clipRect, &myClip, clipRect);
        }
 }
 
                SectRect(clipRect, &myClip, clipRect);
        }
 }
 
-wxMacFocusHelper::wxMacFocusHelper( wxWindow * theWindow ) 
+void wxWindow::MacGetPortClientParams(Point* localOrigin, Rect* clipRect, WindowRef *window , wxWindow** rootwin ) 
 {
 {
-       m_ok = false ;
-       Point localOrigin ;
-       Rect clipRect ;
-       WindowRef window ;
-       wxWindow *rootwin ;
-       m_currentPort = NULL ;
-       GetPort( &m_formerPort ) ;
-       if ( theWindow )
-       {
+       MacDoGetPortClientParams( localOrigin , clipRect , window , rootwin ) ;
+
+       int width , height ;
+       GetClientSize( &width , &height ) ;
+       wxPoint client ;
+       client = GetClientAreaOrigin( ) ;
        
        
-               theWindow->MacGetPortParams( &localOrigin , &clipRect , &window , &rootwin) ;
-               m_currentPort = UMAGetWindowPort( window ) ;
-               theWindow->MacSetPortFocusParams( localOrigin, clipRect, window , rootwin ) ; 
-               m_ok = true ;
-       }
+       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);
 }
 }
-       
-wxMacFocusHelper::~wxMacFocusHelper() 
+
+long wxWindow::MacGetLeftBorderSize( ) const
 {
 {
-       if ( m_ok )
-       {
-               SetOrigin( 0 , 0 ) ;
-       }
-       if ( m_formerPort != m_currentPort )
-               SetPort( m_formerPort ) ;
+       if( m_macWindowData )
+               return 0 ;
+
+    if (m_windowStyle & wxRAISED_BORDER || m_windowStyle & wxSUNKEN_BORDER )
+    {
+               return 2 ;
+    }
+    else if (  m_windowStyle &wxDOUBLE_BORDER)
+    {
+               return 2 ;
+    }
+    else if (m_windowStyle &wxSIMPLE_BORDER)
+    {
+       return 1 ;
+    }
+       return 0 ;
+}
+
+long wxWindow::MacGetRightBorderSize( ) const
+{
+       if( m_macWindowData )
+               return 0 ;
+
+    if (m_windowStyle & wxRAISED_BORDER || m_windowStyle & wxSUNKEN_BORDER )
+    {
+               return 3 ;
+    }
+    else if (  m_windowStyle &wxDOUBLE_BORDER)
+    {
+               return 3 ;
+    }
+    else if (m_windowStyle &wxSIMPLE_BORDER)
+    {
+       return 3 ;
+    }
+       return 0 ;
 }
 
 }
 
+long wxWindow::MacGetTopBorderSize( ) const
+{
+       if( m_macWindowData )
+               return 0 ;
+
+    if (m_windowStyle & wxRAISED_BORDER || m_windowStyle & wxSUNKEN_BORDER )
+    {
+               return 2 ;
+    }
+    else if (  m_windowStyle &wxDOUBLE_BORDER)
+    {
+               return 2 ;
+    }
+    else if (m_windowStyle &wxSIMPLE_BORDER)
+    {
+       return 1 ;
+    }
+       return 0 ;
+}
+
+long wxWindow::MacGetBottomBorderSize( ) const
+{
+       if( m_macWindowData )
+               return 0 ;
+
+    if (m_windowStyle & wxRAISED_BORDER || m_windowStyle & wxSUNKEN_BORDER )
+    {
+               return 3 ;
+    }
+    else if (  m_windowStyle &wxDOUBLE_BORDER)
+    {
+               return 3 ;
+    }
+    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 ;
 wxMacDrawingHelper::wxMacDrawingHelper( wxWindow * theWindow ) 
 {
        m_ok = false ;
@@ -1740,45 +2407,18 @@ wxMacDrawingHelper::~wxMacDrawingHelper()
 {
        if ( m_ok )
        {
 {
        if ( m_ok )
        {
+               SetPort( m_currentPort ) ;
                SetPenState( &m_savedPenState ) ;
                SetOrigin( 0 , 0 ) ;
                SetPenState( &m_savedPenState ) ;
                SetOrigin( 0 , 0 ) ;
-               ClipRect( &m_currentPort->portRect ) ;
+               Rect portRect ;
+               GetPortBounds( m_currentPort , &portRect ) ;
+               ClipRect( &portRect ) ;
        }
                
        if ( m_formerPort != m_currentPort )
                SetPort( m_formerPort ) ;
 }
 
        }
                
        if ( m_formerPort != m_currentPort )
                SetPort( m_formerPort ) ;
 }
 
-wxMacFocusClientHelper::wxMacFocusClientHelper( 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 ) ;
-               theWindow->MacSetPortFocusParams( localOrigin, clipRect, window , rootwin ) ; 
-               m_ok = true ;
-       }
-}
-       
-wxMacFocusClientHelper::~wxMacFocusClientHelper() 
-{
-       if ( m_ok )
-       {
-               SetOrigin( 0 , 0 ) ;
-       }
-       if ( m_formerPort != m_currentPort )
-               SetPort( m_formerPort ) ;
-}
-
 wxMacDrawingClientHelper::wxMacDrawingClientHelper( wxWindow * theWindow ) 
 {
        m_ok = false ;
 wxMacDrawingClientHelper::wxMacDrawingClientHelper( wxWindow * theWindow ) 
 {
        m_ok = false ;
@@ -1806,11 +2446,32 @@ wxMacDrawingClientHelper::~wxMacDrawingClientHelper()
 {
        if ( m_ok )
        {
 {
        if ( m_ok )
        {
+               SetPort( m_currentPort ) ;
                SetPenState( &m_savedPenState ) ;
                SetOrigin( 0 , 0 ) ;
                SetPenState( &m_savedPenState ) ;
                SetOrigin( 0 , 0 ) ;
-               ClipRect( &m_currentPort->portRect ) ;
+               Rect portRect ;
+               GetPortBounds( m_currentPort , &portRect ) ;
+               ClipRect( &portRect ) ;
        }
                
        if ( m_formerPort != m_currentPort )
                SetPort( m_formerPort ) ;
 }
        }
                
        if ( m_formerPort != m_currentPort )
                SetPort( m_formerPort ) ;
 }
+
+// Find the wxWindow at the current mouse position, returning the mouse
+// position.
+wxWindow* wxFindWindowAtPointer(wxPoint& pt)
+{
+    pt = wxGetMousePosition();
+    wxWindow* found = wxFindWindowAtPoint(pt);
+    return found;
+}
+
+// Get the current mouse position.
+wxPoint wxGetMousePosition()
+{
+    int x, y;
+    wxGetMousePosition(& x, & y);
+    return wxPoint(x, y);
+}
+