Pruned some of txrc.tex; removed redundant helpxlp files.

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

diff --git a/src/mac/carbon/window.cpp b/src/mac/carbon/window.cpp
index 06788f0b9dd5c0f9745ce73001659e03bba63659..ce34604fa12cccc1130fcf9d2c44e5195ad81ef7 100644 (file)
--- a/src/mac/carbon/window.cpp
+++ b/src/mac/carbon/window.cpp
@@ -46,6 +46,10 @@
 #define MAC_SCROLLBAR_SIZE 16
 
 #include "wx/mac/uma.h"
 #define MAC_SCROLLBAR_SIZE 16
 
 #include "wx/mac/uma.h"

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

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


@@ -120,10 +124,6 @@ void wxWindowMac::Init()
 
     m_hScrollBar = NULL ;
     m_vScrollBar = NULL ;
 
     m_hScrollBar = NULL ;
     m_vScrollBar = NULL ;

-
-#if  wxUSE_DRAG_AND_DROP
-  m_pDropTarget = NULL;
-#endif

 }
 
 // Destructor
 }
 
 // Destructor


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

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

                 control->MacRedrawControl() ;
             }
             #endif
                 control->MacRedrawControl() ;
             }
             #endif


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

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

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


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

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

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


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

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

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


@@ -273,12 +273,12 @@ void wxWindowMac::ReleaseMouse()
 
 void wxWindowMac::SetDropTarget(wxDropTarget *pDropTarget)
 {
 
 void wxWindowMac::SetDropTarget(wxDropTarget *pDropTarget)
 {

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

   }
 
   }
 

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

   {
     // TODO
   }
   {
     // TODO
   }


@@ -322,8 +322,8 @@ bool wxWindowMac::DoPopupMenu(wxMenu *menu, int x, int y)
     menu->UpdateUI();
     ClientToScreen( &x , &y ) ;
 
     menu->UpdateUI();
     ClientToScreen( &x , &y ) ;
 

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

     menu->MacMenuSelect( this , TickCount() , HiWord(menuResult) , LoWord(menuResult) ) ;
     ::DeleteMenu( menu->MacGetMenuId() ) ;
     menu->SetInvokingWindow(NULL);
     menu->MacMenuSelect( this , TickCount() , HiWord(menuResult) , LoWord(menuResult) ) ;
     ::DeleteMenu( menu->MacGetMenuId() ) ;
     menu->SetInvokingWindow(NULL);


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

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

 
     Point       localwhere = {0,0} ;
 
 
     Point       localwhere = {0,0} ;
 


@@ -350,14 +350,23 @@ void wxWindowMac::DoScreenToClient(int *x, int *y) const
     if(x)   *x = localwhere.h ;
     if(y)   *y = localwhere.v ;
     
     if(x)   *x = localwhere.h ;
     if(y)   *y = localwhere.v ;
     

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

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

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

     
     

-    MacClientToRootWindow( x , y ) ;
+    if ( x )
+            x += MacGetLeftBorderSize() ;
+    if ( y )
+            y += MacGetTopBorderSize() ;
+            
+    MacWindowToRootWindow( x , y ) ;

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


@@ -556,32 +565,17 @@ void wxWindowMac::DoMoveWindow(int x, int y, int width, int height)
     if ( doMove || doResize )
     {
         // erase former position
     if ( doMove || doResize )
     {
         // erase former position

-        wxMacDrawingHelper focus( this ) ;
-        if ( focus.Ok() )
-        {
-            Rect clientrect = { 0 , 0 , m_height , m_width } ;
-            focus.LocalToWindow( &clientrect ) ;
-            // ClipRect( &clientrect ) ;
-            InvalWindowRect( MacGetRootWindow() , &clientrect ) ;
-        }
+
+        Refresh() ;

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

+

         // erase new position
         // erase new position

-        
-        {
-            wxMacDrawingHelper focus( this ) ;
-            if ( focus.Ok() )
-            {
-                Rect clientrect = { 0 , 0 , m_height , m_width } ;
-                focus.LocalToWindow( &clientrect ) ;
-                // ClipRect( &clientrect ) ;
-                InvalWindowRect( MacGetRootWindow() , &clientrect ) ;
-            }
-        }
-        
+
+        Refresh() ;

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


@@ -684,12 +678,12 @@ wxPoint wxWindowMac::GetClientAreaOrigin() const
 
 void wxWindow::SetTitle(const wxString& title)
 {
 
 void wxWindow::SetTitle(const wxString& title)
 {

-       m_label = title ;
+    m_label = title ;

 }
 
 wxString wxWindow::GetTitle() const
 {
 }
 
 wxString wxWindow::GetTitle() const
 {

-       return m_label ;
+    return m_label ;

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


@@ -700,7 +694,7 @@ bool wxWindowMac::Show(bool show)
     MacSuperShown( show ) ;
     if ( !show )
     {
     MacSuperShown( show ) ;
     if ( !show )
     {

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

         wxWindowMac* win = wxFindWinFromMacWindow( window ) ;
         if ( win && !win->m_isBeingDeleted )
             Refresh() ; 
         wxWindowMac* win = wxFindWinFromMacWindow( window ) ;
         if ( win && !win->m_isBeingDeleted )
             Refresh() ; 


@@ -878,17 +872,17 @@ void wxWindowMac::WarpPointer (int x_pos, int y_pos)
 
 const wxBrush& wxWindowMac::MacGetBackgroundBrush() 
 {
 
 const wxBrush& wxWindowMac::MacGetBackgroundBrush() 
 {

-    if ( m_backgroundColour == wxSystemSettings::GetSystemColour(wxSYS_COLOUR_APPWORKSPACE) )
+    if ( m_backgroundColour == wxSystemSettings::GetColour(wxSYS_COLOUR_APPWORKSPACE) )

     {
         m_macBackgroundBrush.SetMacTheme( kThemeBrushDocumentWindowBackground ) ;
     }
     {
         m_macBackgroundBrush.SetMacTheme( kThemeBrushDocumentWindowBackground ) ;
     }

-    else if (  m_backgroundColour == wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DFACE ) )
+    else if (  m_backgroundColour == wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE ) )

     {
         // on mac we have the difficult situation, that 3dface gray can be different colours, depending whether
         // it is on a notebook panel or not, in order to take care of that we walk up the hierarchy until we have
         // either a non gray background color or a non control window
         
     {
         // on mac we have the difficult situation, that 3dface gray can be different colours, depending whether
         // it is on a notebook panel or not, in order to take care of that we walk up the hierarchy until we have
         // either a non gray background color or a non control window
         

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

             
             wxWindowMac* parent = GetParent() ;
             while( parent )
             
             wxWindowMac* parent = GetParent() ;
             while( parent )


@@ -901,8 +895,8 @@ const wxBrush& wxWindowMac::MacGetBackgroundBrush()
                 }
 
                 {
                 }
 
                 {

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

                     {
                         // if we have any other colours in the hierarchy
                         m_macBackgroundBrush.SetColour( parent->m_backgroundColour ) ;
                     {
                         // if we have any other colours in the hierarchy
                         m_macBackgroundBrush.SetColour( parent->m_backgroundColour ) ;


@@ -921,7 +915,7 @@ const wxBrush& wxWindowMac::MacGetBackgroundBrush()
                         extent.top-- ;
                         extent.right = x + size.x ;
                         extent.bottom = y + size.y ;
                         extent.top-- ;
                         extent.right = x + size.x ;
                         extent.bottom = y + size.y ;

-                        m_macBackgroundBrush.SetMacThemeBackground( kThemeBackgroundTabPane , extent ) ; // todo eventually change for inactive
+                        m_macBackgroundBrush.SetMacThemeBackground( kThemeBackgroundTabPane , (WXRECTPTR) &extent ) ; // todo eventually change for inactive

                         break ;
                     }
                 }
                         break ;
                     }
                 }


@@ -948,11 +942,10 @@ void wxWindowMac::OnEraseBackground(wxEraseEvent& event)
 
 void wxWindowMac::OnNcPaint( wxNcPaintEvent& event )
 {
 
 void wxWindowMac::OnNcPaint( wxNcPaintEvent& event )
 {

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

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


@@ -1030,17 +1023,17 @@ void wxWindowMac::MacPaintBorders( int left , int top )
     if (HasFlag(wxRAISED_BORDER) || HasFlag( wxSUNKEN_BORDER) || HasFlag(wxDOUBLE_BORDER) )
     {
 #if wxMAC_USE_THEME_BORDER
     if (HasFlag(wxRAISED_BORDER) || HasFlag( wxSUNKEN_BORDER) || HasFlag(wxDOUBLE_BORDER) )
     {
 #if wxMAC_USE_THEME_BORDER

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

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

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

         RGBForeColor( &face );
         MoveTo( left + 0 , top + m_height - 2 );
         LineTo( left + 0 , top + 0 );
         RGBForeColor( &face );
         MoveTo( left + 0 , top + m_height - 2 );
         LineTo( left + 0 , top + 0 );


@@ -1073,7 +1066,7 @@ void wxWindowMac::MacPaintBorders( int left , int top )
     }
     else if (HasFlag(wxSIMPLE_BORDER))
     {
     }
     else if (HasFlag(wxSIMPLE_BORDER))
     {

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

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


@@ -1123,24 +1116,24 @@ void wxWindowMac::SetScrollbar(int orient, int pos, int thumbVisible,
 // Does a physical scroll
 void wxWindowMac::ScrollWindow(int dx, int dy, const wxRect *rect)
 {
 // Does a physical scroll
 void wxWindowMac::ScrollWindow(int dx, int dy, const wxRect *rect)
 {

-    wxMacDrawingHelper focus( this , true ) ;
-    if ( focus.Ok() )
+    wxClientDC dc(this) ;
+    wxMacPortSetter helper(&dc) ;
+

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

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

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

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

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

-        InvalWindowRgn( MacGetRootWindow() ,  updateRgn ) ;
+        InvalWindowRgn( (WindowRef) MacGetRootWindow() ,  updateRgn ) ;

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


@@ -1316,16 +1309,28 @@ wxWindowMac* wxWindowMac::s_lastMouseWindow = NULL ;
 
 bool wxWindowMac::MacGetWindowFromPointSub( const wxPoint &point , wxWindowMac** outWin ) 
 {
 
 bool wxWindowMac::MacGetWindowFromPointSub( const wxPoint &point , wxWindowMac** outWin ) 
 {

-    if ((point.x < m_x) || (point.y < m_y) ||
-        (point.x > (m_x + m_width)) || (point.y > (m_y + m_height)))
-        return FALSE;
+    if ( IsTopLevel() )
+    {
+      if ((point.x < 0) || (point.y < 0) ||
+          (point.x > (m_width)) || (point.y > (m_height)))
+          return FALSE;
+    }
+    else
+    {
+      if ((point.x < m_x) || (point.y < m_y) ||
+          (point.x > (m_x + m_width)) || (point.y > (m_y + m_height)))
+          return FALSE;
+    }

     
     

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

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

-    newPoint.x -= m_x;
-    newPoint.y -= m_y;
+    if ( !IsTopLevel() )
+    {
+      newPoint.x -= m_x;
+      newPoint.y -= m_y;
+    }

     
     for (wxNode *node = GetChildren().First(); node; node = node->Next())
     {
     
     for (wxNode *node = GetChildren().First(); node; node = node->Next())
     {


@@ -1345,16 +1350,27 @@ bool wxWindowMac::MacGetWindowFromPointSub( const wxPoint &point , wxWindowMac**
 bool wxWindowMac::MacGetWindowFromPoint( const wxPoint &screenpoint , wxWindowMac** outWin ) 
 {
     WindowRef window ;
 bool wxWindowMac::MacGetWindowFromPoint( const wxPoint &screenpoint , wxWindowMac** outWin ) 
 {
     WindowRef window ;

+    

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

-            wxPoint point( screenpoint ) ;
-            wxWindowMac* win = wxFindWinFromMacWindow( window ) ;
-            if ( win )
-            {
-            win->ScreenToClient( point ) ;
+        
+        wxWindowMac* win = wxFindWinFromMacWindow( window ) ;
+        if ( win )
+        {
+            // No, this yields the CLIENT are, we need the whole frame. RR.
+            // point = win->ScreenToClient( point ) ;
+            
+            GrafPtr     port;  
+            ::GetPort( &port ) ;
+            ::SetPort( UMAGetWindowPort( window ) ) ;
+            ::GlobalToLocal( &pt ) ;
+            ::SetPort( port ) ;
+
+            wxPoint point( pt.h, pt.v ) ;
+            

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

-    }
+        }

     }
     return FALSE ;
 }
     }
     return FALSE ;
 }


@@ -1371,7 +1387,7 @@ bool wxWindowMac::MacDispatchMouseEvent(wxMouseEvent& event)
     if ( IsKindOf( CLASSINFO ( wxStaticBox ) ) )
         return FALSE ; 
     
     if ( IsKindOf( CLASSINFO ( wxStaticBox ) ) )
         return FALSE ; 
     

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

 
     event.m_x -= m_x;
     event.m_y -= m_y;
 
     event.m_x -= m_x;
     event.m_y -= m_y;


@@ -1410,7 +1426,9 @@ bool wxWindowMac::MacDispatchMouseEvent(wxMouseEvent& event)
             || event.GetEventType() == wxEVT_LEAVE_WINDOW )
         wxToolTip::RelayEvent( this , event);
 #endif // wxUSE_TOOLTIPS
             || event.GetEventType() == wxEVT_LEAVE_WINDOW )
         wxToolTip::RelayEvent( this , event);
 #endif // wxUSE_TOOLTIPS

+

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

+

     return TRUE;
 }
 
     return TRUE;
 }
 


@@ -1427,13 +1445,21 @@ void wxWindowMac::Update()
 {
     wxTopLevelWindowMac* win = MacGetTopLevelWindow(  ) ;
     if ( win )
 {
     wxTopLevelWindowMac* win = MacGetTopLevelWindow(  ) ;
     if ( win )

+    {

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

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

 }
 
 wxTopLevelWindowMac* wxWindowMac::MacGetTopLevelWindow() const 
 {
     wxTopLevelWindowMac* win = NULL ;
 }
 
 wxTopLevelWindowMac* wxWindowMac::MacGetTopLevelWindow() const 
 {
     wxTopLevelWindowMac* win = NULL ;

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

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


@@ -1444,30 +1470,53 @@ wxTopLevelWindowMac* wxWindowMac::MacGetTopLevelWindow() const
 const wxRegion& wxWindowMac::MacGetVisibleRegion()
 {
   RgnHandle visRgn = NewRgn() ;
 const wxRegion& wxWindowMac::MacGetVisibleRegion()
 {
   RgnHandle visRgn = NewRgn() ;

+  RgnHandle tempRgn = NewRgn() ;

   
   SetRectRgn( visRgn , 0 , 0 , m_width , m_height ) ;
 
   
   SetRectRgn( visRgn , 0 , 0 , m_width , m_height ) ;
 

-  if ( GetWindowStyle() & wxCLIP_CHILDREN )
+  //TODO : as soon as the new scheme has proven to work correctly, move this to wxStaticBox
+  if ( IsKindOf( CLASSINFO( wxStaticBox ) ) )

   {
   {

-    // subtract all children from updatergn
+    int borderTop = 14 ;
+    int borderOther = 4 ;
+    
+    SetRectRgn( tempRgn , borderOther , borderTop , m_width - borderOther , m_height - borderOther ) ;
+    DiffRgn( visRgn , tempRgn , visRgn ) ;
+  }

 
 

-    RgnHandle childarea = NewRgn() ;
+  if ( !IsTopLevel() )
+  {
+    wxWindow* parent = GetParent() ;
+    while( parent )
+    {
+      wxSize size = parent->GetSize() ;
+      int x , y ;
+      x = y = 0 ;
+      parent->MacWindowToRootWindow( &x, &y ) ;
+      MacRootWindowToWindow( &x , &y ) ;
+      SetRectRgn( tempRgn , x , y , x + size.x , y + size.y ) ;
+      SectRgn( visRgn , tempRgn , visRgn ) ;
+      if ( parent->IsTopLevel() )
+        break ;
+      parent = parent->GetParent() ;
+    }
+  }
+  if ( GetWindowStyle() & wxCLIP_CHILDREN )
+  {

     for (wxNode *node = GetChildren().First(); node; node = node->Next())
     {
         wxWindowMac *child = (wxWindowMac*)node->Data();
 
         if ( !child->IsTopLevel() && child->IsShown() )
         {
     for (wxNode *node = GetChildren().First(); node; node = node->Next())
     {
         wxWindowMac *child = (wxWindowMac*)node->Data();
 
         if ( !child->IsTopLevel() && child->IsShown() )
         {

-            SetRectRgn( childarea , child->m_x , child->m_y , child->m_x + child->m_width ,  child->m_y + child->m_height ) ;
-            DiffRgn( visRgn , childarea , visRgn ) ;
+            SetRectRgn( tempRgn , child->m_x , child->m_y , child->m_x + child->m_width ,  child->m_y + child->m_height ) ;
+            DiffRgn( visRgn , tempRgn , visRgn ) ;

         }
     }       
         }
     }       

-    DisposeRgn( childarea ) ;

   }
   
   if ( (GetWindowStyle() & wxCLIP_SIBLINGS) && GetParent() )
   {
   }
   
   if ( (GetWindowStyle() & wxCLIP_SIBLINGS) && GetParent() )
   {

-    RgnHandle siblingarea = NewRgn() ;

     bool thisWindowThrough = false ;
     for (wxNode *node = GetParent()->GetChildren().First(); node; node = node->Next())
     {
     bool thisWindowThrough = false ;
     for (wxNode *node = GetParent()->GetChildren().First(); node; node = node->Next())
     {


@@ -1484,30 +1533,31 @@ const wxRegion& wxWindowMac::MacGetVisibleRegion()
 
         if ( !sibling->IsTopLevel() && sibling->IsShown() )
         {
 
         if ( !sibling->IsTopLevel() && sibling->IsShown() )
         {

-            SetRectRgn( siblingarea , sibling->m_x - m_x , sibling->m_y - m_y , sibling->m_x + sibling->m_width - m_x ,  sibling->m_y + sibling->m_height - m_y ) ;
-            DiffRgn( visRgn , siblingarea , visRgn ) ;
+            SetRectRgn( tempRgn , sibling->m_x - m_x , sibling->m_y - m_y , sibling->m_x + sibling->m_width - m_x ,  sibling->m_y + sibling->m_height - m_y ) ;
+            DiffRgn( visRgn , tempRgn , visRgn ) ;

         }
     }  
         }
     }  

-    DisposeRgn( siblingarea ) ;     

   }
   m_macVisibleRegion = visRgn ;
   DisposeRgn( visRgn ) ;
   }
   m_macVisibleRegion = visRgn ;
   DisposeRgn( visRgn ) ;

+  DisposeRgn( tempRgn ) ;

   return m_macVisibleRegion ;
 }
 
   return m_macVisibleRegion ;
 }
 

-void wxWindowMac::MacRedraw( RgnHandle updatergn , long time, bool erase)
+void wxWindowMac::MacRedraw( WXHRGN updatergnr , long time, bool erase)

 {
 {

+    RgnHandle updatergn = (RgnHandle) updatergnr ;

     // updatergn is always already clipped to our boundaries
     // it is in window coordinates, not in client coordinates
     
     // updatergn is always already clipped to our boundaries
     // it is in window coordinates, not in client coordinates
     

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

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

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

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


@@ -1563,7 +1613,7 @@ void wxWindowMac::MacRedraw( RgnHandle updatergn , long time, bool erase)
  
 }
 
  
 }
 

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

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


@@ -1696,7 +1746,7 @@ bool wxWindowMac::AcceptsFocus() const
     return MacCanFocus() && wxWindowBase::AcceptsFocus();
 }
 
     return MacCanFocus() && wxWindowBase::AcceptsFocus();
 }
 

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

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


@@ -1726,65 +1776,6 @@ void wxWindowMac::MacTopLevelWindowChangedPosition()
         node = node->Next();
     }
 }
         node = node->Next();
     }
 }

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

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


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

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

 #if wxMAC_USE_THEME_BORDER
 #if wxMAC_USE_THEME_BORDER

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

 #endif
 #endif
 #endif
 #endif

-                 return border ;
+          return border ;

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

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

 #if wxMAC_USE_THEME_BORDER
 #if wxMAC_USE_THEME_BORDER

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

 #endif
 #endif
 #endif
 #endif

-                 return border ;
+          return border ;

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


@@ -1840,46 +1831,6 @@ long wxWindowMac::MacRemoveBordersFromStyle( long style )
     return style & ~( wxDOUBLE_BORDER | wxSUNKEN_BORDER | wxRAISED_BORDER | wxBORDER | wxSTATIC_BORDER ) ;
 }
 
     return style & ~( wxDOUBLE_BORDER | wxSUNKEN_BORDER | wxRAISED_BORDER | wxBORDER | wxSTATIC_BORDER ) ;
 }
 

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

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