Applied [ 590985 ] fix for radiobox under motif

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

diff --git a/src/mac/window.cpp b/src/mac/window.cpp
index bd38b3ccd2c29ee7dc2fde22c389778a3908f33d..471c87c4623b2e74904083fb5b80de21464e094f 100644 (file)
--- a/src/mac/window.cpp
+++ b/src/mac/window.cpp
@@ -18,7 +18,7 @@
 #include "wx/window.h"
 #include "wx/dc.h"
 #include "wx/dcclient.h"
 #include "wx/window.h"
 #include "wx/dc.h"
 #include "wx/dcclient.h"

-#include "wx/utils.h" 
+#include "wx/utils.h"

 #include "wx/app.h"
 #include "wx/panel.h"
 #include "wx/layout.h"
 #include "wx/app.h"
 #include "wx/panel.h"
 #include "wx/layout.h"


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

+#include "wx/spinctrl.h"

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


@@ -46,6 +47,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"


@@ -114,12 +119,14 @@ void wxWindowMac::Init()
     m_isShown = TRUE;
 
     m_x = 0;
     m_isShown = TRUE;
 
     m_x = 0;

-    m_y = 0 ;   
+    m_y = 0 ;

     m_width = 0 ;
     m_height = 0 ;
 
     m_hScrollBar = NULL ;
     m_vScrollBar = NULL ;
     m_width = 0 ;
     m_height = 0 ;
 
     m_hScrollBar = NULL ;
     m_vScrollBar = NULL ;

+
+    m_label = wxEmptyString;

 }
 
 // Destructor
 }
 
 // Destructor


@@ -135,12 +142,28 @@ wxWindowMac::~wxWindowMac()
                 break ;
             }
             iter = iter->GetParent() ;
                 break ;
             }
             iter = iter->GetParent() ;

-            
+

         }
     }
         }
     }

-    
+

     m_isBeingDeleted = TRUE;
 
     m_isBeingDeleted = TRUE;
 

+#ifndef __WXUNIVERSAL__
+    // VS: make sure there's no wxFrame with last focus set to us:
+    for ( wxWindow *win = GetParent(); win; win = win->GetParent() )
+    {
+        wxFrame *frame = wxDynamicCast(win, wxFrame);
+        if ( frame )
+        {
+            if ( frame->GetLastFocus() == this )
+            {
+                frame->SetLastFocus((wxWindow*)NULL);
+            }
+            break;
+        }
+    }
+#endif // __WXUNIVERSAL__
+

     if ( s_lastMouseWindow == this )
     {
         s_lastMouseWindow = NULL ;
     if ( s_lastMouseWindow == this )
     {
         s_lastMouseWindow = NULL ;


@@ -177,7 +200,9 @@ bool wxWindowMac::Create(wxWindowMac *parent, wxWindowID id,
     m_width = WidthDefault( size.x );
     m_height = HeightDefault( size.y ) ;
 #ifndef __WXUNIVERSAL__
     m_width = WidthDefault( size.x );
     m_height = HeightDefault( size.y ) ;
 #ifndef __WXUNIVERSAL__

-    if ( ! IsKindOf( CLASSINFO ( wxControl ) ) && ! IsKindOf( CLASSINFO( wxStatusBar ) ) )
+    // Don't give scrollbars to wxControls unless they ask for them
+    if ( (! IsKindOf(CLASSINFO(wxControl)) && ! IsKindOf(CLASSINFO(wxStatusBar))) ||
+         (IsKindOf(CLASSINFO(wxControl)) && ( style & wxHSCROLL || style & wxVSCROLL)))

     {
         MacCreateScrollBars( style ) ;
     }
     {
         MacCreateScrollBars( style ) ;
     }


@@ -189,7 +214,7 @@ void wxWindowMac::SetFocus()
 {
     if ( gFocusWindow == this )
         return ;
 {
     if ( gFocusWindow == this )
         return ;

-    
+

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


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

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

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


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

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

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


@@ -260,7 +285,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 ;
 }


@@ -298,7 +323,7 @@ void wxWindowMac::DoGetSize(int *x, int *y) const
 void wxWindowMac::DoGetPosition(int *x, int *y) const
 {
     int xx,yy;
 void wxWindowMac::DoGetPosition(int *x, int *y) const
 {
     int xx,yy;

- 
+

     xx = m_x ;
     yy = m_y ;
     if ( !IsTopLevel() && GetParent())
     xx = m_x ;
     yy = m_y ;
     if ( !IsTopLevel() && GetParent())


@@ -337,7 +362,7 @@ void wxWindowMac::DoScreenToClient(int *x, int *y) const
     if(x)   localwhere.h = * x ;
     if(y)   localwhere.v = * y ;
 
     if(x)   localwhere.h = * x ;
     if(y)   localwhere.v = * y ;
 

-    GrafPtr     port ;  
+    GrafPtr     port ;

     ::GetPort( &port ) ;
     ::SetPort( UMAGetWindowPort( window ) ) ;
     ::GlobalToLocal( &localwhere ) ;
     ::GetPort( &port ) ;
     ::SetPort( UMAGetWindowPort( window ) ) ;
     ::GlobalToLocal( &localwhere ) ;


@@ -345,21 +370,30 @@ 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
 {
     WindowRef window = (WindowRef) MacGetRootWindow() ;
 }
 
 void wxWindowMac::DoClientToScreen(int *x, int *y) const
 {
     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 ;
     if(y)   localwhere.v = * y ;
     Point       localwhere = { 0,0 };
     if(x)   localwhere.h = * x ;
     if(y)   localwhere.v = * y ;

-    
-    GrafPtr     port ;  
+
+    GrafPtr     port ;

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


@@ -374,7 +408,7 @@ void wxWindowMac::MacClientToRootWindow( int *x , int *y ) const
     wxPoint origin = GetClientAreaOrigin() ;
     if(x)   *x += origin.x ;
     if(y)   *y += origin.y ;
     wxPoint origin = GetClientAreaOrigin() ;
     if(x)   *x += origin.x ;
     if(y)   *y += origin.y ;

-    
+

     MacWindowToRootWindow( x , y ) ;
 }
 
     MacWindowToRootWindow( x , y ) ;
 }
 


@@ -428,7 +462,7 @@ bool wxWindowMac::SetCursor(const wxCursor& cursor)
   Point pt ;
   wxWindowMac *mouseWin ;
   GetMouse( &pt ) ;
   Point pt ;
   wxWindowMac *mouseWin ;
   GetMouse( &pt ) ;

-  
+

   // Change the cursor NOW if we're within the correct window
 
   if ( MacGetWindowFromPoint( wxPoint( pt.h , pt.v ) , &mouseWin ) )
   // Change the cursor NOW if we're within the correct window
 
   if ( MacGetWindowFromPoint( wxPoint( pt.h , pt.v ) , &mouseWin ) )


@@ -452,19 +486,19 @@ void wxWindowMac::DoGetClientSize(int *x, int *y) const
 
     ww -= MacGetLeftBorderSize(  )  + MacGetRightBorderSize(  ) ;
     hh -= MacGetTopBorderSize(  ) + MacGetBottomBorderSize( );
 
     ww -= MacGetLeftBorderSize(  )  + MacGetRightBorderSize(  ) ;
     hh -= MacGetTopBorderSize(  ) + MacGetBottomBorderSize( );

-    
+

   if ( (m_vScrollBar && m_vScrollBar->IsShown()) || (m_hScrollBar  && m_hScrollBar->IsShown()) )
   {
   if ( (m_vScrollBar && m_vScrollBar->IsShown()) || (m_hScrollBar  && m_hScrollBar->IsShown()) )
   {

-    int x1 = 0 ; 
+    int x1 = 0 ;

     int y1 = 0 ;
     int w = m_width ;
     int h = m_height ;
     int y1 = 0 ;
     int w = m_width ;
     int h = m_height ;

-    
+

     MacClientToRootWindow( &x1 , &y1 ) ;
     MacClientToRootWindow( &w , &h ) ;
     MacClientToRootWindow( &x1 , &y1 ) ;
     MacClientToRootWindow( &w , &h ) ;

-    
+

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

-    
+

     int totW = 10000 , totH = 10000;
     while( iter )
     {
     int totW = 10000 , totH = 10000;
     while( iter )
     {


@@ -476,8 +510,8 @@ void wxWindowMac::DoGetClientSize(int *x, int *y) const
         }
 
         iter = iter->GetParent() ;
         }
 
         iter = iter->GetParent() ;

-    } 
-    
+    }
+

     if (m_hScrollBar  && m_hScrollBar->IsShown() )
     {
         hh -= MAC_SCROLLBAR_SIZE;
     if (m_hScrollBar  && m_hScrollBar->IsShown() )
     {
         hh -= MAC_SCROLLBAR_SIZE;


@@ -522,24 +556,24 @@ void wxWindowMac::DoMoveWindow(int x, int y, int width, int height)
     int former_y = m_y ;
     int former_w = m_width ;
     int former_h = m_height ;
     int former_y = m_y ;
     int former_w = m_width ;
     int former_h = m_height ;

-    
+

   int actualWidth = width;
   int actualHeight = height;
   int actualX = x;
   int actualY = y;
   int actualWidth = width;
   int actualHeight = height;
   int actualX = x;
   int actualY = y;

-  
-    if ((m_minWidth != -1) && (actualWidth < m_minWidth)) 
+
+    if ((m_minWidth != -1) && (actualWidth < m_minWidth))

         actualWidth = m_minWidth;
         actualWidth = m_minWidth;

-    if ((m_minHeight != -1) && (actualHeight < m_minHeight)) 
+    if ((m_minHeight != -1) && (actualHeight < m_minHeight))

         actualHeight = m_minHeight;
         actualHeight = m_minHeight;

-    if ((m_maxWidth != -1) && (actualWidth > m_maxWidth)) 
+    if ((m_maxWidth != -1) && (actualWidth > m_maxWidth))

         actualWidth = m_maxWidth;
         actualWidth = m_maxWidth;

-    if ((m_maxHeight != -1) && (actualHeight > m_maxHeight)) 
+    if ((m_maxHeight != -1) && (actualHeight > m_maxHeight))

         actualHeight = m_maxHeight;
 
     bool doMove = false ;
     bool doResize = false ;
         actualHeight = m_maxHeight;
 
     bool doMove = false ;
     bool doResize = false ;

-    
+

     if ( actualX != former_x || actualY != former_y )
     {
         doMove = true ;
     if ( actualX != former_x || actualY != former_y )
     {
         doMove = true ;


@@ -560,6 +594,9 @@ void wxWindowMac::DoMoveWindow(int x, int y, int width, int height)
         m_width = actualWidth ;
         m_height = actualHeight ;
 
         m_width = actualWidth ;
         m_height = actualHeight ;
 

+               // update any low-level frame-relative positions
+
+               MacUpdateDimensions() ;

         // erase new position
 
         Refresh() ;
         // erase new position
 
         Refresh() ;


@@ -583,7 +620,7 @@ void wxWindowMac::DoMoveWindow(int x, int y, int width, int height)
              GetEventHandler()->ProcessEvent(event);
         }
     }
              GetEventHandler()->ProcessEvent(event);
         }
     }

-    
+

 }
 
 // set the size of the window: if the dimensions are positive, just use them,
 }
 
 // set the size of the window: if the dimensions are positive, just use them,


@@ -599,7 +636,7 @@ 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);
     // get the current size and position...
     int currentX, currentY;
     GetPosition(&currentX, &currentY);

-    
+

     int currentW,currentH;
     GetSize(&currentW, &currentH);
 
     int currentW,currentH;
     GetSize(&currentW, &currentH);
 


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

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

 {
 {

-       m_label = title ;
+    m_label = title ;

 }
 
 }
 

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

 {
 {

-       return m_label ;
+    return m_label ;

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


@@ -678,23 +715,29 @@ bool wxWindowMac::Show(bool show)
     if ( !wxWindowBase::Show(show) )
         return FALSE;
 
     if ( !wxWindowBase::Show(show) )
         return FALSE;
 

+/*
+    WindowRef window = (WindowRef) MacGetRootWindow() ;
+    wxWindowMac* win = wxFindWinFromMacWindow( window ) ;
+    if ( win == NULL && win->m_isBeingDeleted )
+        return FALSE ;
+*/

     MacSuperShown( show ) ;
     MacSuperShown( show ) ;

+    Refresh() ;
+/*

     if ( !show )
     {
     if ( !show )
     {

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

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

-            Refresh() ; 
+            Refresh() ;

     }
     else
     {
     }
     else
     {

-        Refresh() ; 
+        Refresh() ;

     }
     }

-
+*/

     return TRUE;
 }
 
     return TRUE;
 }
 

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

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


@@ -706,11 +749,11 @@ void wxWindowMac::MacSuperShown( bool show )
     }
 }
 
     }
 }
 

-void wxWindowMac::MacSuperEnabled( bool enabled ) 
+void wxWindowMac::MacSuperEnabled( bool enabled )

 {
     if ( !IsTopLevel() )
     {
 {
     if ( !IsTopLevel() )
     {

-      // to be absolutely correct we'd have to invalidate (with eraseBkground 
+      // to be absolutely correct we'd have to invalidate (with eraseBkground

       // because unter MacOSX the frames are drawn with an addXXX mode)
       // the borders area
     }
       // because unter MacOSX the frames are drawn with an addXXX mode)
       // the borders area
     }


@@ -724,13 +767,13 @@ void wxWindowMac::MacSuperEnabled( bool enabled )
     }
 }
 
     }
 }
 

-bool wxWindowMac::MacIsReallyShown() const 
+bool wxWindowMac::MacIsReallyShown() const

 {
     if ( m_isShown && (m_parent != NULL) ) {
         return m_parent->MacIsReallyShown();
     }
     return m_isShown;
 {
     if ( m_isShown && (m_parent != NULL) ) {
         return m_parent->MacIsReallyShown();
     }
     return m_isShown;

-/*  
+/*

     bool status = m_isShown ;
     wxWindowMac * win = this ;
     while ( status && win->m_parent != NULL )
     bool status = m_isShown ;
     wxWindowMac * win = this ;
     while ( status && win->m_parent != NULL )


@@ -760,7 +803,7 @@ void wxWindowMac::GetTextExtent(const wxString& string, int *x, int *y,
     const wxFont *fontToUse = theFont;
     if ( !fontToUse )
         fontToUse = &m_font;
     const wxFont *fontToUse = theFont;
     if ( !fontToUse )
         fontToUse = &m_font;

-        
+

     wxClientDC dc( (wxWindowMac*) this ) ;
     long lx,ly,ld,le ;
     dc.GetTextExtent( string , &lx , &ly , &ld, &le, (wxFont *)fontToUse ) ;
     wxClientDC dc( (wxWindowMac*) this ) ;
     long lx,ly,ld,le ;
     dc.GetTextExtent( string , &lx , &ly , &ld, &le, (wxFont *)fontToUse ) ;


@@ -775,30 +818,45 @@ void wxWindowMac::GetTextExtent(const wxString& string, int *x, int *y,
 }
 
 /*
 }
 
 /*

- * Rect is given in client coordinates, for further reading, read wxTopLevelWindowMac::InvalidateRect 
+ * Rect is given in client coordinates, for further reading, read wxTopLevelWindowMac::InvalidateRect

  * we always intersect with the entire window, not only with the client area
  */
  * we always intersect with the entire window, not only with the client area
  */

- 
+

 void wxWindowMac::Refresh(bool eraseBack, const wxRect *rect)
 {
     if ( MacGetTopLevelWindow() == NULL )
 void wxWindowMac::Refresh(bool eraseBack, const wxRect *rect)
 {
     if ( MacGetTopLevelWindow() == NULL )

-      return ;
-      
-    wxPoint client ;
-    client = GetClientAreaOrigin( ) ;
-    Rect clientrect = { -client.y , -client.x , m_height - client.y , m_width - client.x} ;
+        return ;
+
+    wxPoint client = GetClientAreaOrigin();
+    int x1 = -client.x;
+    int y1 = -client.y;
+    int x2 = m_width - client.x;
+    int y2 = m_height - client.y;
+
+    if (IsKindOf( CLASSINFO(wxButton)))
+    {
+        // buttons have an "aura"
+        y1 -= 5;
+        x1 -= 5;
+        y2 += 5;
+        x2 += 5;
+    }
+
+    Rect clientrect = { y1, x1, y2, x2 };
+

     if ( rect )
     {
         Rect r = { rect->y , rect->x , rect->y + rect->height , rect->x + rect->width } ;
     if ( rect )
     {
         Rect r = { rect->y , rect->x , rect->y + rect->height , rect->x + rect->width } ;

-        SectRect( &clientrect , &r , &clientrect ) ;        
+        SectRect( &clientrect , &r , &clientrect ) ;

     }
     }

+

     if ( !EmptyRect( &clientrect ) )
     {
       int top = 0 , left = 0 ;
     if ( !EmptyRect( &clientrect ) )
     {
       int top = 0 , left = 0 ;

-      
+

       MacClientToRootWindow( &left , &top ) ;
       OffsetRect( &clientrect , left , top ) ;
       MacClientToRootWindow( &left , &top ) ;
       OffsetRect( &clientrect , left , top ) ;

-      
+

       MacGetTopLevelWindow()->MacInvalidate( &clientrect , eraseBack ) ;
     }
 }
       MacGetTopLevelWindow()->MacInvalidate( &clientrect , eraseBack ) ;
     }
 }


@@ -857,20 +915,20 @@ 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
 }
 

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

-            
+

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


@@ -882,8 +940,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 ) ;


@@ -895,7 +953,7 @@ const wxBrush& wxWindowMac::MacGetBackgroundBrush()
                         Rect extent = { 0 , 0 , 0 , 0 } ;
                         int x , y ;
                         x = y = 0 ;
                         Rect extent = { 0 , 0 , 0 , 0 } ;
                         int x , y ;
                         x = y = 0 ;

-                        wxSize size = GetSize() ;
+                        wxSize size = parent->GetSize() ;

                         parent->MacClientToRootWindow( &x , &y ) ;
                         extent.left = x ;
                         extent.top = y ;
                         parent->MacClientToRootWindow( &x , &y ) ;
                         extent.left = x ;
                         extent.top = y ;


@@ -919,7 +977,7 @@ const wxBrush& wxWindowMac::MacGetBackgroundBrush()
     }
 
     return m_macBackgroundBrush ;
     }
 
     return m_macBackgroundBrush ;

-  
+

 }
 
 void wxWindowMac::OnEraseBackground(wxEraseEvent& event)
 }
 
 void wxWindowMac::OnEraseBackground(wxEraseEvent& event)


@@ -931,7 +989,7 @@ void wxWindowMac::OnNcPaint( wxNcPaintEvent& event )
 {
     wxWindowDC dc(this) ;
     wxMacPortSetter helper(&dc) ;
 {
     wxWindowDC dc(this) ;
     wxMacPortSetter helper(&dc) ;

-    
+

     MacPaintBorders( dc.m_macLocalOrigin.x , dc.m_macLocalOrigin.y) ;
 }
 
     MacPaintBorders( dc.m_macLocalOrigin.x , dc.m_macLocalOrigin.y) ;
 }
 


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

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

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

-        
+

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


@@ -1010,17 +1068,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) ;
       */
       DrawThemeListBoxFrame(&rect,IsEnabled() ? kThemeStateActive : kThemeStateInactive) ;
       */

-        
+

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

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

         RGBForeColor( &face );
         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 );


@@ -1053,12 +1111,22 @@ 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 ) ;
     }
 }
 

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

 // New function that will replace some of the above.
 void wxWindowMac::SetScrollbar(int orient, int pos, int thumbVisible,
     int range, bool refresh)
 // New function that will replace some of the above.
 void wxWindowMac::SetScrollbar(int orient, int pos, int thumbVisible,
     int range, bool refresh)


@@ -1115,28 +1183,29 @@ void wxWindowMac::ScrollWindow(int dx, int dy, const wxRect *rect)
         ClipRect( &scrollrect ) ;
         if ( rect )
         {
         ClipRect( &scrollrect ) ;
         if ( rect )
         {

-            Rect r = { dc.YLOG2DEVMAC(rect->y) , dc.XLOG2DEVMAC(rect->x) , dc.YLOG2DEVMAC(rect->y + rect->height) , 
+            Rect r = { dc.YLOG2DEVMAC(rect->y) , dc.XLOG2DEVMAC(rect->x) , dc.YLOG2DEVMAC(rect->y + rect->height) ,

               dc.XLOG2DEVMAC(rect->x + rect->width) } ;
               dc.XLOG2DEVMAC(rect->x + rect->width) } ;

-            SectRect( &scrollrect , &r , &scrollrect ) ;        
+            SectRect( &scrollrect , &r , &scrollrect ) ;

         }
         ScrollRect( &scrollrect , dx , dy , updateRgn ) ;
         InvalWindowRgn( (WindowRef) MacGetRootWindow() ,  updateRgn ) ;
         DisposeRgn( updateRgn ) ;
     }
         }
         ScrollRect( &scrollrect , dx , dy , updateRgn ) ;
         InvalWindowRgn( (WindowRef) MacGetRootWindow() ,  updateRgn ) ;
         DisposeRgn( updateRgn ) ;
     }

-    
+

     for (wxNode *node = GetChildren().First(); node; node = node->Next())
     {
         wxWindowMac *child = (wxWindowMac*)node->Data();
         if (child == m_vScrollBar) continue;
         if (child == m_hScrollBar) continue;
         if (child->IsTopLevel()) continue;
     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 );
     }
         int x,y;
         child->GetPosition( &x, &y );
         int w,h;
         child->GetSize( &w, &h );
         child->SetSize( x+dx, y+dy, w, h );
     }

-    
+

 }
 
 void wxWindowMac::MacOnScroll(wxScrollEvent &event )
 }
 
 void wxWindowMac::MacOnScroll(wxScrollEvent &event )


@@ -1147,7 +1216,7 @@ void wxWindowMac::MacOnScroll(wxScrollEvent &event )
         wevent.SetPosition(event.GetPosition());
         wevent.SetOrientation(event.GetOrientation());
         wevent.m_eventObject = this;
         wevent.SetPosition(event.GetPosition());
         wevent.SetOrientation(event.GetOrientation());
         wevent.m_eventObject = this;

-    
+

         if (event.m_eventType == wxEVT_SCROLL_TOP) {
             wevent.m_eventType = wxEVT_SCROLLWIN_TOP;
         } else
         if (event.m_eventType == wxEVT_SCROLL_TOP) {
             wevent.m_eventType = wxEVT_SCROLLWIN_TOP;
         } else


@@ -1169,7 +1238,7 @@ void wxWindowMac::MacOnScroll(wxScrollEvent &event )
         if (event.m_eventType == wxEVT_SCROLL_THUMBTRACK) {
             wevent.m_eventType = wxEVT_SCROLLWIN_THUMBTRACK;
         }
         if (event.m_eventType == wxEVT_SCROLL_THUMBTRACK) {
             wevent.m_eventType = wxEVT_SCROLLWIN_THUMBTRACK;
         }

-        
+

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


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

-    
+

     // CS:don't know if this is still needed:
     //wxChildFocusEvent eventFocus(this);
     //(void)GetEventHandler()->ProcessEvent(eventFocus);
     // CS:don't know if this is still needed:
     //wxChildFocusEvent eventFocus(this);
     //(void)GetEventHandler()->ProcessEvent(eventFocus);


@@ -1278,7 +1347,7 @@ void wxWindowMac::DoSetClientSize(int width, int height)
 {
     if ( width != -1 || height != -1 )
     {
 {
     if ( width != -1 || height != -1 )
     {

-        
+

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


@@ -1294,7 +1363,7 @@ void wxWindowMac::DoSetClientSize(int width, int height)
 
 wxWindowMac* wxWindowMac::s_lastMouseWindow = NULL ;
 
 
 wxWindowMac* wxWindowMac::s_lastMouseWindow = NULL ;
 

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

 {
     if ( IsTopLevel() )
     {
 {
     if ( IsTopLevel() )
     {


@@ -1308,7 +1377,7 @@ bool wxWindowMac::MacGetWindowFromPointSub( const wxPoint &point , wxWindowMac**
           (point.x > (m_x + m_width)) || (point.y > (m_y + m_height)))
           return FALSE;
     }
           (point.x > (m_x + m_width)) || (point.y > (m_y + m_height)))
           return FALSE;
     }

-    
+

     WindowRef window = (WindowRef) MacGetRootWindow() ;
 
     wxPoint newPoint( point ) ;
     WindowRef window = (WindowRef) MacGetRootWindow() ;
 
     wxPoint newPoint( point ) ;


@@ -1318,7 +1387,7 @@ bool wxWindowMac::MacGetWindowFromPointSub( const wxPoint &point , wxWindowMac**
       newPoint.x -= m_x;
       newPoint.y -= m_y;
     }
       newPoint.x -= m_x;
       newPoint.y -= m_y;
     }

-    
+

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


@@ -1334,17 +1403,28 @@ bool wxWindowMac::MacGetWindowFromPointSub( const wxPoint &point , wxWindowMac**
     return TRUE;
 }
 
     return TRUE;
 }
 

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

 {
     WindowRef window ;
 {
     WindowRef window ;

+

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

-        wxPoint point( screenpoint ) ;
+

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

-            point = win->ScreenToClient( point ) ;
+            // 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 ) ;
         }
     }


@@ -1352,22 +1432,23 @@ bool wxWindowMac::MacGetWindowFromPoint( const wxPoint &screenpoint , wxWindowMa
 }
 
 extern int wxBusyCursorCount ;
 }
 
 extern int wxBusyCursorCount ;

+static wxWindow *gs_lastWhich = NULL;

 
 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;
 
 bool wxWindowMac::MacDispatchMouseEvent(wxMouseEvent& event)
 {
     if ((event.m_x < m_x) || (event.m_y < m_y) ||
         (event.m_x > (m_x + m_width)) || (event.m_y > (m_y + m_height)))
         return FALSE;

-    

 
 

-    if ( IsKindOf( CLASSINFO ( wxStaticBox ) ) )
-        return FALSE ; 
-    
+
+    if ( IsKindOf( CLASSINFO ( wxStaticBox ) ) /* || IsKindOf( CLASSINFO( wxSpinCtrl ) ) */)
+        return FALSE ;
+

     WindowRef window = (WindowRef) MacGetRootWindow() ;
 
     event.m_x -= m_x;
     event.m_y -= m_y;
     WindowRef window = (WindowRef) MacGetRootWindow() ;
 
     event.m_x -= m_x;
     event.m_y -= m_y;

-    
+

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


@@ -1383,26 +1464,46 @@ bool wxWindowMac::MacDispatchMouseEvent(wxMouseEvent& event)
 
     event.m_x = x ;
     event.m_y = y ;
 
     event.m_x = x ;
     event.m_y = y ;

-    
+    event.SetEventObject( this ) ;
+

     if ( wxBusyCursorCount == 0 )
     {
         m_cursor.MacInstall() ;
     }
     if ( wxBusyCursorCount == 0 )
     {
         m_cursor.MacInstall() ;
     }

-    
+

     if ( event.GetEventType() == wxEVT_LEFT_DOWN )
     {
         // set focus to this window
         if (AcceptsFocus() && FindFocus()!=this)
             SetFocus();
     }
     if ( event.GetEventType() == wxEVT_LEFT_DOWN )
     {
         // set focus to this window
         if (AcceptsFocus() && FindFocus()!=this)
             SetFocus();
     }

-    
+

 #if wxUSE_TOOLTIPS
 #if wxUSE_TOOLTIPS

-    if ( event.GetEventType() == wxEVT_MOTION 
+    if ( event.GetEventType() == wxEVT_MOTION

             || event.GetEventType() == wxEVT_ENTER_WINDOW
             || event.GetEventType() == wxEVT_LEAVE_WINDOW )
         wxToolTip::RelayEvent( this , event);
 #endif // wxUSE_TOOLTIPS
             || event.GetEventType() == wxEVT_ENTER_WINDOW
             || event.GetEventType() == wxEVT_LEAVE_WINDOW )
         wxToolTip::RelayEvent( this , event);
 #endif // wxUSE_TOOLTIPS

+
+    if (gs_lastWhich != this)
+    {
+        gs_lastWhich = this;
+
+        // Double clicks must always occur on the same window
+        if (event.GetEventType() == wxEVT_LEFT_DCLICK)
+            event.SetEventType( wxEVT_LEFT_DOWN );
+        if (event.GetEventType() == wxEVT_RIGHT_DCLICK)
+            event.SetEventType( wxEVT_RIGHT_DOWN );
+
+        // Same for mouse up events
+        if (event.GetEventType() == wxEVT_LEFT_UP)
+            return TRUE;
+        if (event.GetEventType() == wxEVT_RIGHT_UP)
+            return TRUE;
+    }
+

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

+

     return TRUE;
 }
 
     return TRUE;
 }
 


@@ -1419,25 +1520,33 @@ 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* wxWindowMac::MacGetTopLevelWindow() const

 {
     wxTopLevelWindowMac* win = NULL ;
     WindowRef window = (WindowRef) MacGetRootWindow() ;
     if ( window )
     {
         win = wxFindWinFromMacWindow( window ) ;
 {
     wxTopLevelWindowMac* win = NULL ;
     WindowRef window = (WindowRef) MacGetRootWindow() ;
     if ( window )
     {
         win = wxFindWinFromMacWindow( window ) ;

-    }  
+    }

     return win ;
 }
 
     return win ;
 }
 

-const wxRegion& wxWindowMac::MacGetVisibleRegion()
+const wxRegion& wxWindowMac::MacGetVisibleRegion( bool respectChildrenAndSiblings )

 {
   RgnHandle visRgn = NewRgn() ;
   RgnHandle tempRgn = NewRgn() ;
 {
   RgnHandle visRgn = NewRgn() ;
   RgnHandle tempRgn = NewRgn() ;

-  
+

   SetRectRgn( visRgn , 0 , 0 , m_width , m_height ) ;
 
   //TODO : as soon as the new scheme has proven to work correctly, move this to wxStaticBox
   SetRectRgn( visRgn , 0 , 0 , m_width , m_height ) ;
 
   //TODO : as soon as the new scheme has proven to work correctly, move this to wxStaticBox


@@ -1445,7 +1554,7 @@ const wxRegion& wxWindowMac::MacGetVisibleRegion()
   {
     int borderTop = 14 ;
     int borderOther = 4 ;
   {
     int borderTop = 14 ;
     int borderOther = 4 ;

-    
+

     SetRectRgn( tempRgn , borderOther , borderTop , m_width - borderOther , m_height - borderOther ) ;
     DiffRgn( visRgn , tempRgn , visRgn ) ;
   }
     SetRectRgn( tempRgn , borderOther , borderTop , m_width - borderOther , m_height - borderOther ) ;
     DiffRgn( visRgn , tempRgn , visRgn ) ;
   }


@@ -1460,49 +1569,57 @@ const wxRegion& wxWindowMac::MacGetVisibleRegion()
       x = y = 0 ;
       parent->MacWindowToRootWindow( &x, &y ) ;
       MacRootWindowToWindow( &x , &y ) ;
       x = y = 0 ;
       parent->MacWindowToRootWindow( &x, &y ) ;
       MacRootWindowToWindow( &x , &y ) ;

-      SetRectRgn( tempRgn , x , y , x + size.x , y + size.y ) ;
+
+      SetRectRgn( tempRgn , 
+       x + parent->MacGetLeftBorderSize() , y + parent->MacGetTopBorderSize() , 
+       x + size.x - parent->MacGetLeftBorderSize() - parent->MacGetRightBorderSize(), 
+       y + size.y - parent->MacGetTopBorderSize() - parent->MacGetBottomBorderSize()) ;
+

       SectRgn( visRgn , tempRgn , visRgn ) ;
       if ( parent->IsTopLevel() )
         break ;
       parent = parent->GetParent() ;
     }
   }
       SectRgn( visRgn , tempRgn , visRgn ) ;
       if ( parent->IsTopLevel() )
         break ;
       parent = parent->GetParent() ;
     }
   }

-  if ( GetWindowStyle() & wxCLIP_CHILDREN )
+  if ( respectChildrenAndSiblings )

   {
   {

-    for (wxNode *node = GetChildren().First(); node; node = node->Next())
-    {
-        wxWindowMac *child = (wxWindowMac*)node->Data();
-
-        if ( !child->IsTopLevel() && child->IsShown() )
-        {
-            SetRectRgn( tempRgn , child->m_x , child->m_y , child->m_x + child->m_width ,  child->m_y + child->m_height ) ;
-            DiffRgn( visRgn , tempRgn , visRgn ) ;
-        }
-    }       
-  }
-  
-  if ( (GetWindowStyle() & wxCLIP_SIBLINGS) && GetParent() )
-  {
-    bool thisWindowThrough = false ;
-    for (wxNode *node = GetParent()->GetChildren().First(); node; node = node->Next())
-    {
-        wxWindowMac *sibling = (wxWindowMac*)node->Data();
-        if ( sibling == this )
-        {
-          thisWindowThrough = true ;
-          continue ;
-        }
-        if( !thisWindowThrough )
+      if ( GetWindowStyle() & wxCLIP_CHILDREN )
+      {
+        for (wxNode *node = GetChildren().First(); node; node = node->Next())

         {
         {

-          continue ;
+            wxWindowMac *child = (wxWindowMac*)node->Data();
+
+            if ( !child->IsTopLevel() && child->IsShown() )
+            {
+                SetRectRgn( tempRgn , child->m_x , child->m_y , child->m_x + child->m_width ,  child->m_y + child->m_height ) ;
+                DiffRgn( visRgn , tempRgn , visRgn ) ;
+            }

         }
         }

+      }

 
 

-        if ( !sibling->IsTopLevel() && sibling->IsShown() )
+      if ( (GetWindowStyle() & wxCLIP_SIBLINGS) && GetParent() )
+      {
+        bool thisWindowThrough = false ;
+        for (wxNode *node = GetParent()->GetChildren().First(); node; node = node->Next())

         {
         {

-            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 ) ;
+            wxWindowMac *sibling = (wxWindowMac*)node->Data();
+            if ( sibling == this )
+            {
+              thisWindowThrough = true ;
+              continue ;
+            }
+            if( !thisWindowThrough )
+            {
+              continue ;
+            }
+
+            if ( !sibling->IsTopLevel() && sibling->IsShown() )
+            {
+                SetRectRgn( tempRgn , sibling->m_x - m_x , sibling->m_y - m_y , sibling->m_x + sibling->m_width - m_x ,  sibling->m_y + sibling->m_height - m_y ) ;
+                DiffRgn( visRgn , tempRgn , visRgn ) ;
+            }

         }
         }

-    }  
+      }

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


@@ -1515,16 +1632,16 @@ 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
     RgnHandle updatergn = (RgnHandle) updatergnr ;
     // updatergn is always already clipped to our boundaries
     // it is in window coordinates, not in client coordinates

-    
+

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

-                
+

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

-        
+

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


@@ -1534,9 +1651,9 @@ void wxWindowMac::MacRedraw( WXHRGN updatergnr , long time, bool erase)
         OffsetRgn( newupdate , -origin.x , -origin.y ) ;
         m_updateRegion = newupdate ;
         DisposeRgn( newupdate ) ; // it's been cloned to m_updateRegion
         OffsetRgn( newupdate , -origin.x , -origin.y ) ;
         m_updateRegion = newupdate ;
         DisposeRgn( newupdate ) ; // it's been cloned to m_updateRegion

-        
+

         if ( erase && !EmptyRgn(ownUpdateRgn) )
         if ( erase && !EmptyRgn(ownUpdateRgn) )

-        { 
+        {

           wxWindowDC dc(this);
           dc.SetClippingRegion(wxRegion(ownUpdateRgn));
           wxEraseEvent eevent( GetId(), &dc );
           wxWindowDC dc(this);
           dc.SetClippingRegion(wxRegion(ownUpdateRgn));
           wxEraseEvent eevent( GetId(), &dc );


@@ -1547,19 +1664,19 @@ void wxWindowMac::MacRedraw( WXHRGN updatergnr , long time, bool erase)
           eventNc.SetEventObject( this );
           GetEventHandler()->ProcessEvent( eventNc );
         }
           eventNc.SetEventObject( this );
           GetEventHandler()->ProcessEvent( eventNc );
         }

-        DisposeRgn( ownUpdateRgn ) ; 
+        DisposeRgn( ownUpdateRgn ) ;

         if ( !m_updateRegion.Empty() )
         {
           wxPaintEvent event;
           event.m_timeStamp = time ;
           event.SetEventObject(this);
         if ( !m_updateRegion.Empty() )
         {
           wxPaintEvent event;
           event.m_timeStamp = time ;
           event.SetEventObject(this);

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

     }
     }

-    
+

     // now intersect for each of the children their rect with the updateRgn and call MacRedraw recursively
     // now intersect for each of the children their rect with the updateRgn and call MacRedraw recursively

-    
-    RgnHandle childupdate = NewRgn() ;            
+
+    RgnHandle childupdate = NewRgn() ;

     for (wxNode *node = GetChildren().First(); node; node = node->Next())
     {
         // calculate the update region for the child windows by intersecting the window rectangle with our own
     for (wxNode *node = GetChildren().First(); node; node = node->Next())
     {
         // calculate the update region for the child windows by intersecting the window rectangle with our own


@@ -1576,50 +1693,50 @@ void wxWindowMac::MacRedraw( WXHRGN updatergnr , long time, bool erase)
     }
     DisposeRgn( childupdate ) ;
     // eventually a draw grow box here
     }
     DisposeRgn( childupdate ) ;
     // eventually a draw grow box here

- 
+

 }
 
 WXHWND wxWindowMac::MacGetRootWindow() const
 {
     wxWindowMac *iter = (wxWindowMac*)this ;
 }
 
 WXHWND wxWindowMac::MacGetRootWindow() const
 {
     wxWindowMac *iter = (wxWindowMac*)this ;

-    
+

     while( iter )
     {
         if ( iter->IsTopLevel() )
             return ((wxTopLevelWindow*)iter)->MacGetWindowRef() ;
 
         iter = iter->GetParent() ;
     while( iter )
     {
         if ( iter->IsTopLevel() )
             return ((wxTopLevelWindow*)iter)->MacGetWindowRef() ;
 
         iter = iter->GetParent() ;

-    } 
+    }

     wxASSERT_MSG( 1 , "No valid mac root window" ) ;
     return NULL ;
 }
 
     wxASSERT_MSG( 1 , "No valid mac root window" ) ;
     return NULL ;
 }
 

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

 {
     wxASSERT_MSG( m_vScrollBar == NULL && m_hScrollBar == NULL , "attempt to create window twice" ) ;
 {
     wxASSERT_MSG( m_vScrollBar == NULL && m_hScrollBar == NULL , "attempt to create window twice" ) ;

-    
+

     bool hasBoth = ( style & wxVSCROLL ) && ( style & wxHSCROLL ) ;
     int adjust = hasBoth ? MAC_SCROLLBAR_SIZE - 1: 0 ;
     int width, height ;
     GetClientSize( &width , &height ) ;
     bool hasBoth = ( style & wxVSCROLL ) && ( style & wxHSCROLL ) ;
     int adjust = hasBoth ? MAC_SCROLLBAR_SIZE - 1: 0 ;
     int width, height ;
     GetClientSize( &width , &height ) ;

-    
+

     wxPoint vPoint(width-MAC_SCROLLBAR_SIZE, 0) ;
     wxSize vSize(MAC_SCROLLBAR_SIZE, height - adjust) ;
     wxPoint hPoint(0 , height-MAC_SCROLLBAR_SIZE ) ;
     wxSize hSize( width - adjust, MAC_SCROLLBAR_SIZE) ;
     wxPoint vPoint(width-MAC_SCROLLBAR_SIZE, 0) ;
     wxSize vSize(MAC_SCROLLBAR_SIZE, height - adjust) ;
     wxPoint hPoint(0 , height-MAC_SCROLLBAR_SIZE ) ;
     wxSize hSize( width - adjust, MAC_SCROLLBAR_SIZE) ;

-    
-    m_vScrollBar = new wxScrollBar(this, wxWINDOW_VSCROLL, vPoint, 
+
+    m_vScrollBar = new wxScrollBar(this, wxWINDOW_VSCROLL, vPoint,

         vSize , wxVERTICAL);
 
     if ( style & wxVSCROLL )
     {
         vSize , wxVERTICAL);
 
     if ( style & wxVSCROLL )
     {

-        
+

     }
     else
     {
         m_vScrollBar->Show(false) ;
     }
     }
     else
     {
         m_vScrollBar->Show(false) ;
     }

-    m_hScrollBar = new wxScrollBar(this, wxWINDOW_HSCROLL, hPoint, 
+    m_hScrollBar = new wxScrollBar(this, wxWINDOW_HSCROLL, hPoint,

         hSize , wxHORIZONTAL);
     if ( style  & wxHSCROLL )
     {
         hSize , wxHORIZONTAL);
     if ( style  & wxHSCROLL )
     {


@@ -1628,7 +1745,7 @@ void wxWindowMac::MacCreateScrollBars( long style )
     {
         m_hScrollBar->Show(false) ;
     }
     {
         m_hScrollBar->Show(false) ;
     }

-    
+

     // because the create does not take into account the client area origin
     MacRepositionScrollBars() ; // we might have a real position shift
 }
     // because the create does not take into account the client area origin
     MacRepositionScrollBars() ; // we might have a real position shift
 }


@@ -1637,30 +1754,30 @@ void wxWindowMac::MacRepositionScrollBars()
 {
     bool hasBoth = ( m_hScrollBar && m_hScrollBar->IsShown()) && ( m_vScrollBar && m_vScrollBar->IsShown()) ;
     int adjust = hasBoth ? MAC_SCROLLBAR_SIZE - 1 : 0 ;
 {
     bool hasBoth = ( m_hScrollBar && m_hScrollBar->IsShown()) && ( m_vScrollBar && m_vScrollBar->IsShown()) ;
     int adjust = hasBoth ? MAC_SCROLLBAR_SIZE - 1 : 0 ;

-    
+

     // get real client area
     // get real client area

-    
-    int width = m_width ; 
+
+    int width = m_width ;

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

-    
+

     wxPoint vPoint(width-MAC_SCROLLBAR_SIZE, 0) ;
     wxSize vSize(MAC_SCROLLBAR_SIZE, height - adjust) ;
     wxPoint hPoint(0 , height-MAC_SCROLLBAR_SIZE ) ;
     wxSize hSize( width - adjust, MAC_SCROLLBAR_SIZE) ;
     wxPoint vPoint(width-MAC_SCROLLBAR_SIZE, 0) ;
     wxSize vSize(MAC_SCROLLBAR_SIZE, height - adjust) ;
     wxPoint hPoint(0 , height-MAC_SCROLLBAR_SIZE ) ;
     wxSize hSize( width - adjust, MAC_SCROLLBAR_SIZE) ;

-    
-    int x = 0 ; 
+
+    int x = 0 ;

     int y = 0 ;
     int w = m_width ;
     int h = m_height ;
     int y = 0 ;
     int w = m_width ;
     int h = m_height ;

-    
+

     MacClientToRootWindow( &x , &y ) ;
     MacClientToRootWindow( &w , &h ) ;
     MacClientToRootWindow( &x , &y ) ;
     MacClientToRootWindow( &w , &h ) ;

-    
+

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

-    
+

     int totW = 10000 , totH = 10000;
     while( iter )
     {
     int totW = 10000 , totH = 10000;
     while( iter )
     {


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

-    } 
-    
+    }
+

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


@@ -1684,13 +1801,13 @@ void wxWindowMac::MacRepositionScrollBars()
         vPoint.y = -1 ;
         vSize.y += 1 ;
     }
         vPoint.y = -1 ;
         vSize.y += 1 ;
     }

-    
+

     if ( w-x >= totW )
     {
         hSize.x += 1 ;
         vPoint.x += 1 ;
     }
     if ( w-x >= totW )
     {
         hSize.x += 1 ;
         vPoint.x += 1 ;
     }

-    
+

     if ( h-y >= totH )
     {
         vSize.y += 1 ;
     if ( h-y >= totH )
     {
         vSize.y += 1 ;


@@ -1712,12 +1829,12 @@ bool wxWindowMac::AcceptsFocus() const
     return MacCanFocus() && wxWindowBase::AcceptsFocus();
 }
 
     return MacCanFocus() && wxWindowBase::AcceptsFocus();
 }
 

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

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

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

 {
     // only window-absolute structures have to be moved i.e. controls
 
 {
     // only window-absolute structures have to be moved i.e. controls
 


@@ -1730,7 +1847,7 @@ void wxWindowMac::MacSuperChangedPosition()
     }
 }
 
     }
 }
 

-void wxWindowMac::MacTopLevelWindowChangedPosition() 
+void wxWindowMac::MacTopLevelWindowChangedPosition()

 {
     // only screen-absolute structures have to be moved i.e. glcanvas
 
 {
     // only screen-absolute structures have to be moved i.e. glcanvas
 


@@ -1749,23 +1866,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)
     {


@@ -1792,7 +1909,7 @@ long wxWindowMac::MacGetBottomBorderSize( ) const
     return MacGetLeftBorderSize() ;
 }
 
     return MacGetLeftBorderSize() ;
 }
 

-long wxWindowMac::MacRemoveBordersFromStyle( long style ) 
+long wxWindowMac::MacRemoveBordersFromStyle( long style )

 {
     return style & ~( wxDOUBLE_BORDER | wxSUNKEN_BORDER | wxRAISED_BORDER | wxBORDER | wxSTATIC_BORDER ) ;
 }
 {
     return style & ~( wxDOUBLE_BORDER | wxSUNKEN_BORDER | wxRAISED_BORDER | wxBORDER | wxSTATIC_BORDER ) ;
 }