toplevel fixes

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

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

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

 // Author:      AUTHOR
 // Modified by:
 // Created:     ??/??/98
 // Author:      AUTHOR
 // Modified by:
 // Created:     ??/??/98


@@ -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" 


@@ -23,15 +24,16 @@
 #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"
 


@@ -52,18 +54,25 @@
 #include <string.h>
 
 extern wxList wxPendingDelete;
 #include <string.h>
 
 extern wxList wxPendingDelete;

-wxWindow* gFocusWindow = NULL ;
-
-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_SCROLL(wxWindow::OnScroll)
+wxWindowMac* gFocusWindow = NULL ;
+
+#ifdef __WXUNIVERSAL__
+    IMPLEMENT_ABSTRACT_CLASS(wxWindowMac, wxWindowBase)
+#else // __WXMAC__
+    IMPLEMENT_DYNAMIC_CLASS(wxWindow, wxWindowBase)
+#endif // __WXUNIVERSAL__/__WXMAC__
+
+#if !USE_SHARED_LIBRARY
+
+BEGIN_EVENT_TABLE(wxWindowMac, wxWindowBase)
+  EVT_ERASE_BACKGROUND(wxWindowMac::OnEraseBackground)
+  EVT_SYS_COLOUR_CHANGED(wxWindowMac::OnSysColourChanged)
+  EVT_INIT_DIALOG(wxWindowMac::OnInitDialog)
+  EVT_IDLE(wxWindowMac::OnIdle)
+  EVT_SET_FOCUS(wxWindowMac::OnSetFocus)

 END_EVENT_TABLE()
 
 END_EVENT_TABLE()
 

+#endif

 
 
 
 
 
 


@@ -72,21 +81,21 @@ END_EVENT_TABLE()
 // ===========================================================================
 
 // ---------------------------------------------------------------------------
 // ===========================================================================
 
 // ---------------------------------------------------------------------------

-// wxWindow utility functions
+// wxWindowMac utility functions

 // ---------------------------------------------------------------------------
 
 // Find an item given the Macintosh Window Reference
 
 wxList *wxWinMacWindowList = NULL;
 // ---------------------------------------------------------------------------
 
 // Find an item given the Macintosh Window Reference
 
 wxList *wxWinMacWindowList = NULL;

-wxWindow *wxFindWinFromMacWindow(WindowRef inWindowRef)
+wxWindowMac *wxFindWinFromMacWindow(WindowRef inWindowRef)

 {
     wxNode *node = wxWinMacWindowList->Find((long)inWindowRef);
     if (!node)
         return NULL;
 {
     wxNode *node = wxWinMacWindowList->Find((long)inWindowRef);
     if (!node)
         return NULL;

-    return (wxWindow *)node->Data();
+    return (wxWindowMac *)node->Data();

 }
 
 }
 

-void wxAssociateWinWithMacWindow(WindowRef inWindowRef, wxWindow *win)
+void wxAssociateWinWithMacWindow(WindowRef inWindowRef, wxWindowMac *win)

 {
     // adding NULL WindowRef is (first) surely a result of an error and
     // (secondly) breaks menu command processing
 {
     // adding NULL WindowRef is (first) surely a result of an error and
     // (secondly) breaks menu command processing


@@ -96,7 +105,7 @@ void wxAssociateWinWithMacWindow(WindowRef inWindowRef, wxWindow *win)
         wxWinMacWindowList->Append((long)inWindowRef, win);
 }
 
         wxWinMacWindowList->Append((long)inWindowRef, win);
 }
 

-void wxRemoveMacWindowAssociation(wxWindow *win)
+void wxRemoveMacWindowAssociation(wxWindowMac *win)

 {
     wxWinMacWindowList->DeleteObject(win);
 }
 {
     wxWinMacWindowList->DeleteObject(win);
 }


@@ -105,11 +114,15 @@ void wxRemoveMacWindowAssociation(wxWindow *win)
 // constructors and such
 // ----------------------------------------------------------------------------
 
 // constructors and such
 // ----------------------------------------------------------------------------
 

-void wxWindow::Init()
+WindowRef wxWindowMac::s_macWindowInUpdate = NULL;
+
+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;


@@ -127,6 +140,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 ;       


@@ -142,8 +156,22 @@ void wxWindow::Init()
 }
 
 // Destructor
 }
 
 // Destructor

-wxWindow::~wxWindow()
-{
+wxWindowMac::~wxWindowMac()
+{
+    // deleting a window while it is shown invalidates the region
+    if ( IsShown() ) {
+        wxWindowMac* iter = this ;
+        while( iter ) {
+            if ( iter->m_macWindowData )
+            {
+                Refresh() ;
+                break ;
+            }
+            iter = iter->GetParent() ;
+            
+        }
+    }
+    

     m_isBeingDeleted = TRUE;
 
        if ( s_lastMouseWindow == this )
     m_isBeingDeleted = TRUE;
 
        if ( s_lastMouseWindow == this )


@@ -163,6 +191,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 ) ;


@@ -170,13 +199,13 @@ wxWindow::~wxWindow()
 }
 
 // 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;
 
     if ( !CreateBase(parent, id, pos, size, style, wxDefaultValidator, name) )
         return FALSE;


@@ -188,14 +217,20 @@ bool wxWindow::Create(wxWindow *parent, wxWindowID id,
        AdjustForParentClientOrigin(m_x, m_y, wxSIZE_USE_EXISTING);
        m_width = WidthDefault( size.x );
        m_height = HeightDefault( size.y ) ;
        AdjustForParentClientOrigin(m_x, m_y, wxSIZE_USE_EXISTING);
        m_width = WidthDefault( size.x );
        m_height = HeightDefault( size.y ) ;

-
-    MacCreateScrollBars( style ) ;
-
+#ifndef __WXUNIVERSAL__
+       if ( ! IsKindOf( CLASSINFO ( wxControl ) ) && ! IsKindOf( CLASSINFO( wxStatusBar ) ) )
+       {
+       MacCreateScrollBars( style ) ;
+       }
+#endif

     return TRUE;
 }
 
     return TRUE;
 }
 

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

 {
 {

+       if ( gFocusWindow == this )
+               return ;
+               

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


@@ -207,11 +242,14 @@ void wxWindow::SetFocus()
                                  gFocusWindow->m_caret->OnKillFocus();
                            }
                        #endif // wxUSE_CARET
                                  gFocusWindow->m_caret->OnKillFocus();
                            }
                        #endif // wxUSE_CARET

+      #ifndef __WXUNIVERSAL__

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

                        }
                        }

+                       #endif

                wxFocusEvent event(wxEVT_KILL_FOCUS, gFocusWindow->m_windowId);
                event.SetEventObject(gFocusWindow);
                        gFocusWindow->GetEventHandler()->ProcessEvent(event) ;
                wxFocusEvent event(wxEVT_KILL_FOCUS, gFocusWindow->m_windowId);
                event.SetEventObject(gFocusWindow);
                        gFocusWindow->GetEventHandler()->ProcessEvent(event) ;


@@ -226,17 +264,16 @@ void wxWindow::SetFocus()
                    }
                        #endif // wxUSE_CARET
                        // panel wants to track the window which was the last to have focus in it
                    }
                        #endif // wxUSE_CARET
                        // panel wants to track the window which was the last to have focus in it

-               wxPanel *panel = wxDynamicCast(GetParent(), wxPanel);
-               if ( panel )
-               {
-                       panel->SetLastFocus(this);
-               }
+            wxChildFocusEvent eventFocus(this);
+            (void)GetEventHandler()->ProcessEvent(eventFocus);
+
+      #ifndef __WXUNIVERSAL__

                        wxControl* control = wxDynamicCast( gFocusWindow , wxControl ) ;
                        if ( control && control->GetMacControl() )
                        {
                                UMASetKeyboardFocus( gFocusWindow->GetMacRootWindow() , control->GetMacControl()  , kControlEditTextPart ) ;
                        }
                        wxControl* control = wxDynamicCast( gFocusWindow , wxControl ) ;
                        if ( control && control->GetMacControl() )
                        {
                                UMASetKeyboardFocus( gFocusWindow->GetMacRootWindow() , control->GetMacControl()  , kControlEditTextPart ) ;
                        }

-
+      #endif

                wxFocusEvent event(wxEVT_SET_FOCUS, m_windowId);
                event.SetEventObject(this);
                        GetEventHandler()->ProcessEvent(event) ;
                wxFocusEvent event(wxEVT_SET_FOCUS, m_windowId);
                event.SetEventObject(this);
                        GetEventHandler()->ProcessEvent(event) ;


@@ -244,20 +281,15 @@ void wxWindow::SetFocus()
        }
 }
 
        }
 }
 

-bool wxWindow::Enable(bool enable)
+bool wxWindowMac::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 )
     {

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

         child->Enable(enable);
 
         node = node->GetNext();
         child->Enable(enable);
 
         node = node->GetNext();


@@ -266,19 +298,24 @@ bool wxWindow::Enable(bool enable)
     return TRUE;
 }
 
     return TRUE;
 }
 

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

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

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

 {
     wxTheApp->s_captureWindow = NULL ;
 }
 
 #if    wxUSE_DRAG_AND_DROP
 
 {
     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_pDropTarget != 0 ) {
     delete m_pDropTarget;


@@ -294,35 +331,36 @@ 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 ;
+    int xx,yy;
+ 
+    xx = m_x ;
+    yy = m_y ;

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

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

     }
     }

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

 }
 
 }
 

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

 {
        menu->SetInvokingWindow(this);
     menu->UpdateUI();
 {
        menu->SetInvokingWindow(this);
     menu->UpdateUI();


@@ -336,14 +374,16 @@ bool wxWindow::DoPopupMenu(wxMenu *menu, int x, int y)
 
   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 = GetMacRootWindow() ;
 

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

 
        GrafPtr         port ;  
        ::GetPort( &port ) ;
 
        GrafPtr         port ;  
        ::GetPort( &port ) ;


@@ -351,70 +391,73 @@ void wxWindow::DoScreenToClient(int *x, int *y) const
        ::GlobalToLocal( &localwhere ) ;
        ::SetPort( port ) ;
 
        ::GlobalToLocal( &localwhere ) ;
        ::SetPort( port ) ;
 

-       *x = localwhere.h ;
-       *y = localwhere.v ;
+    if(x)   *x = localwhere.h ;
+    if(y)   *y = localwhere.v ;

        
        MacRootWindowToClient( x , y ) ;
 }
 
        
        MacRootWindowToClient( x , y ) ;
 }
 

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

 {
        WindowRef window = GetMacRootWindow() ;
        
        MacClientToRootWindow( x , y ) ;
        
 {
        WindowRef window = GetMacRootWindow() ;
        
        MacClientToRootWindow( x , y ) ;
        

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

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

+       ::SetOrigin( 0 , 0 ) ;

        ::LocalToGlobal( &localwhere ) ;
        ::SetPort( port ) ;
        ::LocalToGlobal( &localwhere ) ;
        ::SetPort( port ) ;

-       *x = localwhere.h ;
-       *y = localwhere.v ;
+    if(x)   *x = localwhere.h ;
+    if(y)   *y = localwhere.v ;

 }
 
 }
 

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

 {
 {

-       if ( m_macWindowData )
-       {
-       }
-       else
+       if ( m_macWindowData == NULL)

        {
        {

-               *x += m_x ;
-               *y += m_y ;
+               if(x)   *x += m_x ;
+               if(y)   *y += m_y ;

                GetParent()->MacClientToRootWindow( x , y ) ;
        }
 }
 
                GetParent()->MacClientToRootWindow( x , y ) ;
        }
 }
 

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

 {
 {

-       if ( m_macWindowData )
-       {
-       }
-       else
+       if ( m_macWindowData == NULL)

        {
        {

-               *x -= m_x ;
-               *y -= m_y ;
+               if(x)   *x -= m_x ;
+           if(y)   *y -= m_y ;

                GetParent()->MacRootWindowToClient( x , y ) ;
        }
 }
 
                GetParent()->MacRootWindowToClient( x , y ) ;
        }
 }
 

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

 {
 {

-   if ( !wxWindowBase::SetCursor(cursor) )
-   {
-       // no change
+    if (m_cursor == cursor)

        return FALSE;
        return FALSE;

-   }
+
+    if (wxNullCursor == cursor)
+    {
+       if ( ! wxWindowBase::SetCursor( *wxSTANDARD_CURSOR ) )
+        return FALSE ;
+    }
+    else
+    {
+       if ( ! wxWindowBase::SetCursor( cursor ) )
+        return FALSE ;
+    }

 
   wxASSERT_MSG( m_cursor.Ok(),
                   wxT("cursor must be valid after call to the base version"));
 
   Point pt ;
 
   wxASSERT_MSG( m_cursor.Ok(),
                   wxT("cursor must be valid after call to the base version"));
 
   Point pt ;

-  wxWindow *mouseWin ;
+  wxWindowMac *mouseWin ;

   GetMouse( &pt ) ;
   
   // Change the cursor NOW if we're within the correct window
   GetMouse( &pt ) ;
   
   // Change the cursor NOW if we're within the correct window


@@ -423,7 +466,7 @@ bool wxWindow::SetCursor(const wxCursor& cursor)
   {
        if ( mouseWin == this && !wxIsBusy() )
        {
   {
        if ( mouseWin == this && !wxIsBusy() )
        {

-               cursor.MacInstall() ;
+               m_cursor.MacInstall() ;

        }
   }
 
        }
   }
 


@@ -432,15 +475,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 ;
+
+       ww -= MacGetLeftBorderSize(  )  + MacGetRightBorderSize(  ) ;
+       hh -= MacGetTopBorderSize(  ) + MacGetBottomBorderSize( );
+       
+  if ( (m_vScrollBar && m_vScrollBar->IsShown()) || (m_hScrollBar  && m_hScrollBar->IsShown()) )
+  {
+       int x1 = 0 ; 
+       int y1 = 0 ;
+       int w = m_width ;
+       int h = m_height ;
+       
+       MacClientToRootWindow( &x1 , &y1 ) ;
+       MacClientToRootWindow( &w , &h ) ;
+       
+       wxWindowMac *iter = (wxWindowMac*)this ;
+       
+       int totW = 10000 , totH = 10000;
+       while( iter )
+       {
+               if ( iter->m_macWindowData )
+               {
+                       totW = iter->m_width ;
+                       totH = iter->m_height ;
+                       break ;
+               }

 
 

-  if (m_vScrollBar && m_vScrollBar->IsShown() )
-       (*x) -= MAC_SCROLLBAR_SIZE;
-  if (m_hScrollBar  && m_hScrollBar->IsShown() )
-       (*y) -= MAC_SCROLLBAR_SIZE;
+               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;

 }
 
 
 }
 
 


@@ -450,55 +537,37 @@ 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)
-{
-       DoSetSize( x,y, width, height ) ;
-}
-
-void wxWindow::DoSetSize(int x, int y, int width, int height, int sizeFlags)
+void wxWindowMac::DoMoveWindow(int x, int y, int width, int height)

 {
        int former_x = m_x ;
        int former_y = m_y ;
        int former_w = m_width ;
        int former_h = m_height ;
        
 {
        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;
   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;
-  if (width == -1)
-      actualWidth = currentW ;
-  if (height == -1)
-      actualHeight = currentH ;
-
-       if ( actualX == currentX && actualY == currentY && actualWidth == currentW && actualHeight == currentH)
-       {
-               MacRepositionScrollBars() ; // we might have a real position shift
-               return ;
-       }
+  
+    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;

 
 

-       AdjustForParentClientOrigin(actualX, actualY, sizeFlags);
-       
-       

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


@@ -519,13 +588,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 ;


@@ -535,61 +603,137 @@ 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 )
                        if ( doMove )

-                               wxWindow::MacSuperChangedPosition() ; // like this only children will be notified
+                               wxWindowMac::MacSuperChangedPosition() ; // like this only children will be notified

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

-       wxMoveEvent event(wxPoint(m_x, m_y), m_windowId);
-       event.SetEventObject(this);
-       GetEventHandler()->ProcessEvent(event) ;
+               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,
+// but if any of them is equal to -1, it means that we must find the value for
+// it ourselves (unless sizeFlags contains wxSIZE_ALLOW_MINUS_ONE flag, in
+// which case -1 is a valid value for x and y)
+//
+// If sizeFlags contains wxSIZE_AUTO_WIDTH/HEIGHT flags (default), we calculate
+// the width/height to best suit our contents, otherwise we reuse the current
+// width/height
+void wxWindowMac::DoSetSize(int x, int y, int width, int height, int sizeFlags)
+{
+    // get the current size and position...
+    int currentX, currentY;
+    GetPosition(&currentX, &currentY);
+    int currentW,currentH;
+    GetSize(&currentW, &currentH);
+
+    // ... and don't do anything (avoiding flicker) if it's already ok
+    if ( x == currentX && y == currentY &&
+         width == currentW && height == currentH )
+    {
+               MacRepositionScrollBars() ; // we might have a real position shift
+        return;

     }
     }

-    if ( doResize )
+
+    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 )

     {
     {

-                       MacRepositionScrollBars() ;
-           wxSizeEvent event(wxSize(m_width, m_height), m_windowId);
-           event.SetEventObject(this);
-           GetEventHandler()->ProcessEvent(event);
+        if ( sizeFlags & wxSIZE_AUTO_WIDTH )
+        {
+            size = DoGetBestSize();
+            width = size.x;
+        }
+        else
+        {
+            // just take the current one
+            width = currentW;
+        }

     }
     }

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

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

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

 {
 {

-    return wxPoint(0, 0);
+    return wxPoint(MacGetLeftBorderSize(  ) , MacGetTopBorderSize(  ) );

 }
 
 // Makes an adjustment to the window position (for example, a frame that has
 // a toolbar that it manages itself).
 }
 
 // Makes an adjustment to the window position (for example, a frame that has
 // a toolbar that it manages itself).

-void wxWindow::AdjustForParentClientOrigin(int& x, int& y, int sizeFlags)
+void wxWindowMac::AdjustForParentClientOrigin(int& x, int& y, int sizeFlags)

 {
        if( !m_macWindowData )
        {
 {
        if( !m_macWindowData )
        {


@@ -601,7 +745,7 @@ void wxWindow::AdjustForParentClientOrigin(int& x, int& y, int sizeFlags)
    }
 }
 
    }
 }
 

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

 {
        m_label = title ;
        
 {
        m_label = title ;
        


@@ -616,12 +760,12 @@ void wxWindow::SetTitle(const wxString& title)
        UMASetWTitleC( m_macWindowData->m_macWindow , label ) ;
 }
 
        UMASetWTitleC( m_macWindowData->m_macWindow , label ) ;
 }
 

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


@@ -632,8 +776,10 @@ 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
-           wxSizeEvent event(wxSize(m_width, m_height), m_windowId);
+               // no need to generate events here, they will get them triggered by macos
+               // actually they should be , but apparently they are not
+           wxSize size(m_width, m_height);
+           wxSizeEvent event(size, m_windowId);

            event.SetEventObject(this);
            GetEventHandler()->ProcessEvent(event);
          }
            event.SetEventObject(this);
            GetEventHandler()->ProcessEvent(event);
          }


@@ -643,53 +789,86 @@ bool wxWindow::Show(bool show)
          }
        }
        MacSuperShown( show ) ;
          }
        }
        MacSuperShown( show ) ;

-       Refresh() ;
+       if ( !show )
+       {
+           WindowRef window = GetMacRootWindow() ;
+           wxWindowMac* win = wxFindWinFromMacWindow( window ) ;
+           if ( win && !win->m_isBeingDeleted )
+               Refresh() ;     
+       }
+       else
+       {
+       Refresh() ;     
+       }

 
     return TRUE;
 }
 
 
     return TRUE;
 }
 

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

 {
        wxNode *node = GetChildren().First();
        while ( node )
        {
 {
        wxNode *node = GetChildren().First();
        while ( node )
        {

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

                if ( child->m_isShown )
                        child->MacSuperShown( show ) ;
                node = node->Next();
        }
 }
 
                if ( child->m_isShown )
                        child->MacSuperShown( show ) ;
                node = node->Next();
        }
 }
 

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

 {
 {

-       wxClientDC dc ( (wxWindow*)this ) ;
+       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 wxWindowMac::GetCharHeight() const
+{
+       wxClientDC dc ( (wxWindowMac*)this ) ;

        return dc.GetCharHeight() ;
 }
 
        return dc.GetCharHeight() ;
 }
 

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

 {
 {

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

        return dc.GetCharWidth() ;
 }
 
        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( this ) ;
+    wxClientDC dc( (wxWindowMac*) this ) ;

     long lx,ly,ld,le ;
     long lx,ly,ld,le ;

-    dc.GetTextExtent( string , &lx , &ly , &ld, &le, fontToUse ) ;
-    *externalLeading = le ;
-    *descent = ld ;
-    *x = lx ;
-    *y = ly ;
+    dc.GetTextExtent( string , &lx , &ly , &ld, &le, (wxFont *)fontToUse ) ;
+    if ( externalLeading )
+       *externalLeading = le ;
+    if ( descent )
+       *descent = ld ;
+    if ( x )
+       *x = lx ;
+    if ( y )
+       *y = ly ;

 }
 
 }
 

-void wxWindow::MacEraseBackground( Rect *rect )
+void wxWindowMac::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) )
        {


@@ -701,7 +880,7 @@ void wxWindow::MacEraseBackground( Rect *rect )
                // it is on a notebook panel or not, in order to take care of that we walk up the hierarchy until we have
                // either a non gray background color or a non control window
                
                // it is on a notebook panel or not, in order to take care of that we walk up the hierarchy until we have
                // either a non gray background color or a non control window
                

-                       wxWindow* parent = GetParent() ;
+                       wxWindowMac* parent = GetParent() ;

                        while( parent )
                        {
                                if ( parent->m_backgroundColour != wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DFACE ) )
                        while( parent )
                        {
                                if ( parent->m_backgroundColour != wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DFACE ) )


@@ -715,7 +894,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 ;
                                        }
                                }


@@ -742,11 +921,7 @@ void wxWindow::MacEraseBackground( Rect *rect )
        
        for (wxNode *node = GetChildren().First(); node; node = node->Next())
        {
        
        for (wxNode *node = GetChildren().First(); node; node = node->Next())
        {

-               wxWindow *child = (wxWindow*)node->Data();
-//                     int width ;
-//                     int height ;
-               
-//                     child->GetClientSize( &width , &height ) ;
+               wxWindowMac *child = (wxWindowMac*)node->Data();

                
                Rect clientrect = { child->m_x , child->m_y , child->m_x +child->m_width , child->m_y + child->m_height } ;
                SectRect( &clientrect , rect , &clientrect ) ;          
                
                Rect clientrect = { child->m_x , child->m_y , child->m_x +child->m_width , child->m_y + child->m_height } ;
                SectRect( &clientrect , rect , &clientrect ) ;          


@@ -761,41 +936,43 @@ void wxWindow::MacEraseBackground( Rect *rect )
                        }
                }
        }
                        }
                }
        }

+*/

 }
 
 }
 

-void wxWindow::Refresh(bool eraseBack, const wxRect *rect)
+void wxWindowMac::Refresh(bool eraseBack, const wxRect *rect)

 {
 {

+//    if ( !IsShown() )
+//        return ;
+        

        wxMacDrawingClientHelper focus( this ) ;
        if ( focus.Ok() )
        {
        wxMacDrawingClientHelper focus( this ) ;
        if ( focus.Ok() )
        {

-       int width , height ;
-       GetClientSize( &width , &height ) ;
-       Rect clientrect = { 0 , 0 , height , width } ;
-       ClipRect( &clientrect ) ;
-
-    if ( rect )
-    {
-       Rect r = { rect->y , rect->x , rect->y + rect->height , rect->x + rect->width } ;
+           wxPoint client ;
+           client = GetClientAreaOrigin( ) ;
+               Rect clientrect = { -client.y , -client.x , m_height - client.y , m_width - client.x} ;
+               // ClipRect( &clientrect ) ;
+
+       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.

-void wxWindow::OnSysColourChanged(wxSysColourChangedEvent& event)
+void wxWindowMac::OnSysColourChanged(wxSysColourChangedEvent& event)

 {
     wxNode *node = GetChildren().First();
     while ( node )
     {
         // Only propagate to non-top-level windows
 {
     wxNode *node = GetChildren().First();
     while ( node )
     {
         // Only propagate to non-top-level windows

-        wxWindow *win = (wxWindow *)node->Data();
+        wxWindowMac *win = (wxWindowMac *)node->Data();

         if ( win->GetParent() )
         {
             wxSysColourChangedEvent event2;
         if ( win->GetParent() )
         {
             wxSysColourChangedEvent event2;


@@ -812,36 +989,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" );
 


@@ -849,24 +1026,24 @@ 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)
+void wxWindowMac::OnEraseBackground(wxEraseEvent& event)

 {
     // TODO : probably we would adopt the EraseEvent structure
 }
 
 {
     // TODO : probably we would adopt the EraseEvent structure
 }
 

-int wxWindow::GetScrollPos(int orient) const
+int wxWindowMac::GetScrollPos(int orient) const

 {
                if ( orient == wxHORIZONTAL )
                {
 {
                if ( orient == wxHORIZONTAL )
                {


@@ -883,7 +1060,7 @@ int wxWindow::GetScrollPos(int orient) const
 
 // This now returns the whole range, not just the number
 // of positions that we can scroll.
 
 // This now returns the whole range, not just the number
 // of positions that we can scroll.

-int wxWindow::GetScrollRange(int orient) const
+int wxWindowMac::GetScrollRange(int orient) const

 {
                if ( orient == wxHORIZONTAL )
                {
 {
                if ( orient == wxHORIZONTAL )
                {


@@ -898,7 +1075,7 @@ int wxWindow::GetScrollRange(int orient) const
     return 0;
 }
 
     return 0;
 }
 

-int wxWindow::GetScrollThumb(int orient) const
+int wxWindowMac::GetScrollThumb(int orient) const

 {
                if ( orient == wxHORIZONTAL )
                {
 {
                if ( orient == wxHORIZONTAL )
                {


@@ -913,7 +1090,7 @@ int wxWindow::GetScrollThumb(int orient) const
     return 0;
 }
 
     return 0;
 }
 

-void wxWindow::SetScrollPos(int orient, int pos, bool refresh)
+void wxWindowMac::SetScrollPos(int orient, int pos, bool refresh)

 {
                if ( orient == wxHORIZONTAL )
                {
 {
                if ( orient == wxHORIZONTAL )
                {


@@ -927,45 +1104,214 @@ void wxWindow::SetScrollPos(int orient, int pos, bool refresh)
                }
 }
 
                }
 }
 

-void wxWindow::MacPaint( wxPaintEvent &event ) 
+void  wxWindowMac::MacCreateRealWindow( const wxString& title,
+           const wxPoint& pos,
+           const wxSize& size,
+           long style,
+           const wxString& name ) 

 {
 {

-    wxPaintDC dc(this);
-    PrepareDC(dc);
+  SetName(name);
+  m_windowStyle = style;
+  m_isShown = FALSE;

 
 

-    if (HasFlag(wxRAISED_BORDER) || HasFlag( wxSUNKEN_BORDER) )
-    {
-       bool sunken = HasFlag( wxSUNKEN_BORDER ) ;
+  // create frame.

 
 

-               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(0, 0, m_width, m_height);          // outer - right and button
+       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 ;

        
        

-           dc.SetPen(wxPen2);
-               dc.DrawRectangle(1, 1, m_width-1, m_height-1);      // outer - left and top
+       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 ;
+       }

        
        

-           dc.SetPen(wxPen3);
-               dc.DrawRectangle(0, 0, m_width-2, m_height-2);          // inner - right and button
+       if ( HasFlag( wxMINIMIZE_BOX ) || HasFlag( wxMAXIMIZE_BOX ) )
+       {
+               attr |= kWindowFullZoomAttribute ;
+               attr |= kWindowCollapseBoxAttribute ;
+       }
+       if ( HasFlag( wxRESIZE_BORDER ) )
+       {
+               attr |= kWindowResizableAttribute ;
+       }
+       if ( HasFlag( wxSYSTEM_MENU ) )
+       {
+               attr |= kWindowCloseBoxAttribute ;
+       }

        
        

-           dc.SetPen(wxPen4);
-               dc.DrawLine(0, 0, m_width-3, 0);                 // inner - left and top
-               dc.DrawLine(0, 0, 0, m_height-3);
+       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 wxWindowMac::MacPaint( wxPaintEvent &event ) 
+{
+}
+
+void wxWindowMac::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))
     {
     }
     else if (HasFlag(wxSIMPLE_BORDER))
     {

-               dc.SetPen(*wxBLACK_PEN);
-               dc.DrawRectangle(0, 0, m_width, m_height);         
+               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.
 }
 
 // New function that will replace some of the above.

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

     int range, bool refresh)
 {
                if ( orient == wxHORIZONTAL )
     int range, bool refresh)
 {
                if ( orient == wxHORIZONTAL )


@@ -981,7 +1327,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 ) ;

                                }
                        }
                }
                                }
                        }
                }


@@ -998,7 +1344,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 ) ;

                                }
                        }
                }
                                }
                        }
                }


@@ -1006,29 +1352,44 @@ void wxWindow::SetScrollbar(int orient, int pos, int thumbVisible,
 }
 
 // Does a physical scroll
 }
 
 // Does a physical scroll

-void wxWindow::ScrollWindow(int dx, int dy, const wxRect *rect)
+void wxWindowMac::ScrollWindow(int dx, int dy, const wxRect *rect)

 {
        wxMacDrawingClientHelper focus( this ) ;
        if ( focus.Ok() )
        {
 {
        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())
+       {
+               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 );
+       }
+       

 }
 
 }
 

-void wxWindow::MacOnScroll(wxScrollEvent &event )
+void wxWindowMac::MacOnScroll(wxScrollEvent &event )

 {
        if ( event.m_eventObject == m_vScrollBar || event.m_eventObject == m_hScrollBar )
        {
 {
        if ( event.m_eventObject == m_vScrollBar || event.m_eventObject == m_hScrollBar )
        {


@@ -1037,43 +1398,33 @@ void wxWindow::MacOnScroll(wxScrollEvent &event )
            wevent.SetOrientation(event.GetOrientation());
            wevent.m_eventObject = this;
        
            wevent.SetOrientation(event.GetOrientation());
            wevent.m_eventObject = this;
        

-           switch ( event.m_eventType )
-           {
-           case wxEVT_SCROLL_TOP:
+       if (event.m_eventType == wxEVT_SCROLL_TOP) {

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

-               break;
-       
-           case wxEVT_SCROLL_BOTTOM:
+           } else
+       if (event.m_eventType == wxEVT_SCROLL_BOTTOM) {

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

-               break;
-       
-           case wxEVT_SCROLL_LINEUP:
+           } else
+       if (event.m_eventType == wxEVT_SCROLL_LINEUP) {

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

-               break;
-       
-           case wxEVT_SCROLL_LINEDOWN:
+           } else
+       if (event.m_eventType == wxEVT_SCROLL_LINEDOWN) {

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

-               break;
-       
-           case wxEVT_SCROLL_PAGEUP:
+           } else
+       if (event.m_eventType == wxEVT_SCROLL_PAGEUP) {

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

-               break;
-       
-           case wxEVT_SCROLL_PAGEDOWN:
+           } else
+       if (event.m_eventType == wxEVT_SCROLL_PAGEDOWN) {

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

-               break;
-       
-           case wxEVT_SCROLL_THUMBTRACK:
+           } else
+       if (event.m_eventType == wxEVT_SCROLL_THUMBTRACK) {

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

-               break;
-       

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

-bool wxWindow::SetFont(const wxFont& font)
+bool wxWindowMac::SetFont(const wxFont& font)

 {
     if ( !wxWindowBase::SetFont(font) )
     {
 {
     if ( !wxWindowBase::SetFont(font) )
     {


@@ -1085,7 +1436,7 @@ bool wxWindow::SetFont(const wxFont& font)
 }
 
 // Get the window with the focus
 }
 
 // Get the window with the focus

-wxWindow *wxWindowBase::FindFocus()
+wxWindowMac *wxWindowBase::FindFocus()

 {
        return gFocusWindow ;
 }
 {
        return gFocusWindow ;
 }


@@ -1094,7 +1445,7 @@ wxWindow *wxWindowBase::FindFocus()
 // If nothing defined for this, try the parent.
 // E.g. we may be a button loaded from a resource, with no callback function
 // defined.
 // 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;


@@ -1104,7 +1455,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();


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

-void wxWindow::Clear()
+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
+    //
+    // notice that it's also important to do it upwards the tree becaus
+    // otherwise when the top level panel gets focus, it won't set it back to
+    // us, but to some other sibling
+    
+    // CS:don't know if this is still needed:
+    //wxChildFocusEvent eventFocus(this);
+    //(void)GetEventHandler()->ProcessEvent(eventFocus);
+
+    event.Skip();
+}
+
+void wxWindowMac::Clear()

 {
        if ( m_macWindowData )
        {
 {
        if ( m_macWindowData )
        {


@@ -1136,20 +1503,20 @@ 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();

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


@@ -1172,18 +1539,24 @@ void wxWindow::OnIdle(wxIdleEvent& event)
 }
 
 // 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
+    if ( m_macWindowData )
+    {
+        UMABringToFront( m_macWindowData->m_macWindow ) ;
+    }

 }
 
 // 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
+    if ( m_macWindowData )
+    {
+        UMASendBehind( m_macWindowData->m_macWindow , NULL ) ;
+    }

 }
 
 }
 

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

 {
        if ( width != -1 || height != -1 )
        {
 {
        if ( width != -1 || height != -1 )
        {


@@ -1193,14 +1566,17 @@ 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 ) ;
        }
 }
 
 

-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)))
 {
        if ((point.x < m_x) || (point.y < m_y) ||
                (point.x > (m_x + m_width)) || (point.y > (m_y + m_height)))


@@ -1215,8 +1591,9 @@ bool wxWindow::MacGetWindowFromPointSub( const wxPoint &point , wxWindow** outWi
        
        for (wxNode *node = GetChildren().First(); node; node = node->Next())
        {
        
        for (wxNode *node = GetChildren().First(); node; node = node->Next())
        {

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


@@ -1227,28 +1604,32 @@ bool wxWindow::MacGetWindowFromPointSub( const wxPoint &point , wxWindow** outWi
        return TRUE;
 }
 
        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 ) ;
 {
        WindowRef window ;
        Point pt = { screenpoint.y , screenpoint.x } ;
        if ( ::FindWindow( pt , &window ) == 3 )
        {
                        wxPoint point( screenpoint ) ;

-                       wxWindow* win = wxFindWinFromMacWindow( window ) ;
+                       wxWindowMac* win = wxFindWinFromMacWindow( window ) ;
+                       if ( win )
+                       {

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

+       }

        return FALSE ;
 }
 
 extern int wxBusyCursorCount ;
 
        return FALSE ;
 }
 
 extern int wxBusyCursorCount ;
 

-bool wxWindow::MacDispatchMouseEvent(wxMouseEvent& event)
+bool wxWindowMac::MacDispatchMouseEvent(wxMouseEvent& event)

 {
        if ((event.m_x < m_x) || (event.m_y < m_y) ||
                (event.m_x > (m_x + m_width)) || (event.m_y > (m_y + m_height)))
                return FALSE;
        
 {
        if ((event.m_x < m_x) || (event.m_y < m_y) ||
                (event.m_x > (m_x + m_width)) || (event.m_y > (m_y + m_height)))
                return FALSE;
        

+

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


@@ -1262,7 +1643,7 @@ bool wxWindow::MacDispatchMouseEvent(wxMouseEvent& event)
 
        for (wxNode *node = GetChildren().First(); node; node = node->Next())
        {
 
        for (wxNode *node = GetChildren().First(); node; node = node->Next())
        {

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

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


@@ -1277,11 +1658,36 @@ 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;
 }
 

-void wxWindow::MacFireMouseEvent( EventRecord *ev )
+Point lastWhere ;
+long lastWhen = 0 ;
+
+wxString wxWindowMac::MacGetToolTipString( wxPoint &pt )
+{
+       if ( m_tooltip )
+       {
+               return m_tooltip->GetTip() ;
+       }
+       return "" ;
+}
+void wxWindowMac::MacFireMouseEvent( EventRecord *ev )

 {
        wxMouseEvent event(wxEVT_LEFT_DOWN);
        bool isDown = !(ev->modifiers & btnState) ; // 1 is for up
 {
        wxMouseEvent event(wxEVT_LEFT_DOWN);
        bool isDown = !(ev->modifiers & btnState) ; // 1 is for up


@@ -1323,6 +1729,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;


@@ -1360,14 +1786,13 @@ void wxWindow::MacFireMouseEvent( EventRecord *ev )
        }
 }
 
        }
 }
 

-void wxWindow::MacMouseDown( EventRecord *ev , short part)
+void wxWindowMac::MacMouseDown( EventRecord *ev , short part)

 {
        MacFireMouseEvent( ev ) ;
 }
 
 {
        MacFireMouseEvent( ev ) ;
 }
 

-void wxWindow::MacMouseUp( EventRecord *ev , short part)
+void wxWindowMac::MacMouseUp( EventRecord *ev , short part)

 {
 {

-       WindowPtr frontWindow ;

        switch (part)
        {
                case inContent:         
        switch (part)
        {
                case inContent:         


@@ -1378,9 +1803,8 @@ void wxWindow::MacMouseUp( EventRecord *ev , short part)
        }
 }
 
        }
 }
 

-void wxWindow::MacMouseMoved( EventRecord *ev , short part)
+void wxWindowMac::MacMouseMoved( EventRecord *ev , short part)

 {
 {

-       WindowPtr frontWindow ;

        switch (part)
        {
                case inContent:         
        switch (part)
        {
                case inContent:         


@@ -1390,24 +1814,32 @@ void wxWindow::MacMouseMoved( EventRecord *ev , short part)
                        break ;
        }
 }
                        break ;
        }
 }

-void wxWindow::MacActivate( EventRecord *ev , bool inIsActivating )
+void wxWindowMac::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)
+void wxWindowMac::MacRedraw( RgnHandle updatergn , long time)

 {
        // updatergn is always already clipped to our boundaries
        WindowRef window = GetMacRootWindow() ;
 {
        // updatergn is always already clipped to our boundaries
        WindowRef window = GetMacRootWindow() ;

-       wxWindow* win = wxFindWinFromMacWindow( window ) ;
+       // ownUpdateRgn is the area that this window has to invalidate i.e. its own area without its children
+       RgnHandle ownUpdateRgn = NewRgn() ;
+       CopyRgn( updatergn , ownUpdateRgn ) ;
+

        {
        {

-               wxMacDrawingClientHelper focus( this ) ;
+               wxMacDrawingHelper focus( this ) ; // was client

                if ( focus.Ok() )
                {
                        WindowRef window = GetMacRootWindow() ;
                if ( focus.Ok() )
                {
                        WindowRef window = GetMacRootWindow() ;


@@ -1425,7 +1857,7 @@ void wxWindow::MacRedraw( RgnHandle updatergn , long time)
                                        // either a non gray background color or a non control window
                
 
                                        // either a non gray background color or a non control window
                
 

-                                       wxWindow* parent = GetParent() ;
+                                       wxWindowMac* parent = GetParent() ;

                                        while( parent )
                                        {
                                                if ( parent->GetMacRootWindow() != window )
                                        while( parent )
                                        {
                                                if ( parent->GetMacRootWindow() != window )


@@ -1446,7 +1878,9 @@ void wxWindow::MacRedraw( RgnHandle updatergn , long time)
                                                        // 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 ;
                                                        }
                                                }


@@ -1467,40 +1901,67 @@ void wxWindow::MacRedraw( RgnHandle updatergn , long time)
                        {
                                RGBBackColor( &m_backgroundColour.GetPixel()) ;
                        }
                        {
                                RGBBackColor( &m_backgroundColour.GetPixel()) ;
                        }

+            // subtract all non transparent children from updatergn
+            
+           RgnHandle childarea = NewRgn() ;
+               for (wxNode *node = GetChildren().First(); node; node = node->Next())
+               {
+                       wxWindowMac *child = (wxWindowMac*)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 ;
                        if ( GetParent() && m_backgroundColour != GetParent()->GetBackgroundColour() )
                                eraseBackground = true ;

-                       SetClip( updatergn ) ;
-                       if ( eraseBackground )
-                       {
-                               EraseRgn( updatergn ) ; 
-                       }
+                       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);
-       
-       wxPaintEvent event2( event ) ;
-       GetEventHandler()->ProcessEvent(event);
-       MacPaint( event2 ) ;

        
        RgnHandle childupdate = NewRgn() ;
        
        RgnHandle childupdate = NewRgn() ;

-
+                       

        for (wxNode *node = GetChildren().First(); node; node = node->Next())
        {
        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 ) ;
+               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 ) ;
                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 ) ;


@@ -1510,67 +1971,72 @@ void wxWindow::MacRedraw( RgnHandle updatergn , long time)
        // eventually a draw grow box here
 }
 
        // eventually a draw grow box here
 }
 

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

 {
        WindowRef window = GetMacRootWindow() ;
        if ( window )
        {
 {
        WindowRef window = GetMacRootWindow() ;
        if ( window )
        {

-               wxWindow* win = wxFindWinFromMacWindow( window ) ;
+               wxWindowMac* 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 ) ;
        }
 }
 

-void wxWindow::MacUpdate( EventRecord *ev )
+void wxWindowMac::MacUpdate( EventRecord *ev )

 {
        WindowRef window = (WindowRef) ev->message ;
 {
        WindowRef window = (WindowRef) ev->message ;

-       wxWindow * win = wxFindWinFromMacWindow( window ) ;
-       
+       wxWindowMac * 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 ) ;
 }
 

-WindowRef wxWindow::GetMacRootWindow() const
+WindowRef wxWindowMac::GetMacRootWindow() const

 {
 {

-       WindowRef window = NULL ;
-       wxWindow *iter = (wxWindow*)this ;
+       wxWindowMac *iter = (wxWindowMac*)this ;

        
        while( iter )
        {
        
        while( iter )
        {


@@ -1583,55 +2049,131 @@ WindowRef wxWindow::GetMacRootWindow() const
        return NULL ;
 }
 
        return NULL ;
 }
 

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

 {
        wxASSERT_MSG( m_vScrollBar == NULL && m_hScrollBar == NULL , "attempt to create window twice" ) ;
 {
        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);
-//             m_vScrollBar->PushEventHandler( this ) ;
+               

        }
        }

+       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);
-//             m_hScrollBar->PushEventHandler( this ) ;
+       }
+       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
 }
 

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

 {
        bool hasBoth = ( m_hScrollBar && m_hScrollBar->IsShown()) && ( m_vScrollBar && m_vScrollBar->IsShown()) ;
        int adjust = hasBoth ? MAC_SCROLLBAR_SIZE - 1 : 0 ;
        
 {
        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 ) ;
+       
+       wxWindowMac *iter = (wxWindowMac*)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 wxWindowMac::MacKeyDown( EventRecord *ev ) 

 {
 {

+

 }
 
 
 }
 
 

-bool wxWindow::AcceptsFocus() const
+bool wxWindowMac::AcceptsFocus() const

 {
     return MacCanFocus() && wxWindowBase::AcceptsFocus();
 }
 
 {
     return MacCanFocus() && wxWindowBase::AcceptsFocus();
 }
 

-ControlHandle wxWindow::MacGetContainerForEmbedding() 
+ControlHandle wxWindowMac::MacGetContainerForEmbedding() 

 {
        if ( m_macWindowData )
                return m_macWindowData->m_macRootControl ;
 {
        if ( m_macWindowData )
                return m_macWindowData->m_macRootControl ;


@@ -1639,69 +2181,20 @@ ControlHandle wxWindow::MacGetContainerForEmbedding()
                return GetParent()->MacGetContainerForEmbedding() ;
 }
 
                return GetParent()->MacGetContainerForEmbedding() ;
 }
 

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

 {
        // only window-absolute structures have to be moved i.e. controls
 
        wxNode *node = GetChildren().First();
        while ( node )
        {
 {
        // only window-absolute structures have to be moved i.e. controls
 
        wxNode *node = GetChildren().First();
        while ( node )
        {

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

                child->MacSuperChangedPosition() ;
                node = node->Next();
        }
 }
                child->MacSuperChangedPosition() ;
                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 wxWindowMac::MacSetPortFocusParams( const Point & localOrigin, const Rect & clipRect, WindowRef window , wxWindowMac* win ) 

 {
        if ( window == NULL )
                return false ;
 {
        if ( window == NULL )
                return false ;


@@ -1714,11 +2207,12 @@ 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;                    
 }
 

-bool wxWindow::MacSetPortDrawingParams( const Point & localOrigin, const Rect & clipRect, WindowRef window , wxWindow* win ) 
+bool wxWindowMac::MacSetPortDrawingParams( const Point & localOrigin, const Rect & clipRect, WindowRef window , wxWindowMac* win ) 

 {
        if ( window == NULL )
                return false ;
 {
        if ( window == NULL )
                return false ;


@@ -1729,19 +2223,21 @@ 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;                    
 }
 

-void wxWindow::MacGetPortParams(Point* localOrigin, Rect* clipRect, WindowRef *window  , wxWindow** rootwin) 
+void wxWindowMac::MacGetPortParams(Point* localOrigin, Rect* clipRect, WindowRef *window  , wxWindowMac** rootwin) 

 {
        if ( m_macWindowData )
        {
 {
        if ( m_macWindowData )
        {


@@ -1771,10 +2267,10 @@ void wxWindow::MacGetPortParams(Point* localOrigin, Rect* clipRect, WindowRef *w
        }
 }
 
        }
 }
 

-void wxWindow::MacGetPortClientParams(Point* localOrigin, Rect* clipRect, WindowRef *window , wxWindow** rootwin ) 
+void wxWindowMac::MacDoGetPortClientParams(Point* localOrigin, Rect* clipRect, WindowRef *window , wxWindowMac** rootwin ) 

 {
 {

-       int width , height ;
-       GetClientSize( &width , &height ) ;
+//     int width , height ;
+//     GetClientSize( &width , &height ) ;

        
        if ( m_macWindowData )
        {
        
        if ( m_macWindowData )
        {


@@ -1791,7 +2287,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;


@@ -1800,48 +2296,126 @@ 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 wxWindowMac::MacGetPortClientParams(Point* localOrigin, Rect* clipRect, WindowRef *window , wxWindowMac** 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 wxWindowMac::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 wxWindowMac::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 wxWindowMac::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 wxWindowMac::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 ;

 }
 
 }
 

-wxMacDrawingHelper::wxMacDrawingHelper( wxWindow * theWindow ) 
+long wxWindowMac::MacRemoveBordersFromStyle( long style ) 
+{
+       return style & ~( wxDOUBLE_BORDER | wxSUNKEN_BORDER | wxRAISED_BORDER | wxBORDER | wxSTATIC_BORDER ) ;
+}
+
+
+wxMacDrawingHelper::wxMacDrawingHelper( wxWindowMac * theWindow ) 

 {
        m_ok = false ;
        Point localOrigin ;
        Rect clipRect ;
        WindowRef window ;
 {
        m_ok = false ;
        Point localOrigin ;
        Rect clipRect ;
        WindowRef window ;

-       wxWindow *rootwin ;
+       wxWindowMac *rootwin ;

        m_currentPort = NULL ;
        
        GetPort( &m_formerPort ) ;
        m_currentPort = NULL ;
        
        GetPort( &m_formerPort ) ;


@@ -1861,52 +2435,25 @@ 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 ) 
+wxMacDrawingClientHelper::wxMacDrawingClientHelper( wxWindowMac * theWindow ) 

 {
        m_ok = false ;
        Point localOrigin ;
        Rect clipRect ;
        WindowRef window ;
 {
        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 ;
-       Point localOrigin ;
-       Rect clipRect ;
-       WindowRef window ;
-       wxWindow *rootwin ;
+       wxWindowMac *rootwin ;

        m_currentPort = NULL ;
        
        GetPort( &m_formerPort ) ;
        m_currentPort = NULL ;
        
        GetPort( &m_formerPort ) ;


@@ -1927,11 +2474,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 wxWindowMac at the current mouse position, returning the mouse
+// position.
+wxWindowMac* wxFindWindowAtPointer(wxPoint& pt)
+{
+    pt = wxGetMousePosition();
+    wxWindowMac* found = wxFindWindowAtPoint(pt);
+    return found;
+}
+
+// Get the current mouse position.
+wxPoint wxGetMousePosition()
+{
+    int x, y;
+    wxGetMousePosition(& x, & y);
+    return wxPoint(x, y);
+}
+