Added wxGUIAppTraits::GetOSVersion() implementation.

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

diff --git a/src/mac/window.cpp b/src/mac/window.cpp
index 9f7a20f4e7a0be3afa0b3844757d33b1002d5032..9587ffa3a7f9f7baca1c066f4bf2a33e29b8a930 100644 (file)
--- a/src/mac/window.cpp
+++ b/src/mac/window.cpp
@@ -104,17 +104,7 @@ void wxWindowMac::Init()
     // generic
     InitBase();
 
     // generic
     InitBase();
 

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

     m_isBeingDeleted = FALSE;
     m_isBeingDeleted = FALSE;

-
-    m_useCtl3D = FALSE;
-    m_mouseInWindow = FALSE;
-
-    m_xThumbSize = 0;
-    m_yThumbSize = 0;

     m_backgroundTransparent = FALSE;
 
     // as all windows are created with WS_VISIBLE style...
     m_backgroundTransparent = FALSE;
 
     // as all windows are created with WS_VISIBLE style...


@@ -340,7 +330,7 @@ void wxWindowMac::SetDropTarget(wxDropTarget *pDropTarget)
     if ( m_dropTarget != 0 ) {
         delete m_dropTarget;
     }
     if ( m_dropTarget != 0 ) {
         delete m_dropTarget;
     }

-    
+

     m_dropTarget = pDropTarget;
     if ( m_dropTarget != 0 )
     {
     m_dropTarget = pDropTarget;
     if ( m_dropTarget != 0 )
     {


@@ -398,7 +388,7 @@ bool wxWindowMac::DoPopupMenu(wxMenu *menu, int x, int y)
         if (item->IsCheckable())
         {
             item->Check( !item->IsChecked() ) ;
         if (item->IsCheckable())
         {
             item->Check( !item->IsChecked() ) ;

-        }        
+        }

         menu->SendEvent( id , item->IsCheckable() ? item->IsChecked() : -1 ) ;
     }
     menu->MacAfterDisplay( true ) ;
         menu->SendEvent( id , item->IsCheckable() ? item->IsChecked() : -1 ) ;
     }
     menu->MacAfterDisplay( true ) ;


@@ -426,7 +416,7 @@ 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 ;

-    
+

     MacRootWindowToWindow( x , y ) ;
     if ( x )
         *x -= MacGetLeftBorderSize() ;
     MacRootWindowToWindow( x , y ) ;
     if ( x )
         *x -= MacGetLeftBorderSize() ;


@@ -500,7 +490,7 @@ bool wxWindowMac::SetCursor(const wxCursor& cursor)
 {
     if (m_cursor == cursor)
         return FALSE;
 {
     if (m_cursor == cursor)
         return FALSE;

-    
+

     if (wxNullCursor == cursor)
     {
         if ( ! wxWindowBase::SetCursor( *wxSTANDARD_CURSOR ) )
     if (wxNullCursor == cursor)
     {
         if ( ! wxWindowBase::SetCursor( *wxSTANDARD_CURSOR ) )


@@ -511,16 +501,16 @@ bool wxWindowMac::SetCursor(const wxCursor& cursor)
         if ( ! wxWindowBase::SetCursor( cursor ) )
             return FALSE ;
     }
         if ( ! wxWindowBase::SetCursor( cursor ) )
             return FALSE ;
     }

-    
+

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

-    
+

     Point pt ;
     wxWindowMac *mouseWin ;
     GetMouse( &pt ) ;
     Point pt ;
     wxWindowMac *mouseWin ;
     GetMouse( &pt ) ;

-    
+

     // Change the cursor NOW if we're within the correct window
     // Change the cursor NOW if we're within the correct window

-    
+

     if ( MacGetWindowFromPoint( wxPoint( pt.h , pt.v ) , &mouseWin ) )
     {
         if ( mouseWin == this && !wxIsBusy() )
     if ( MacGetWindowFromPoint( wxPoint( pt.h , pt.v ) , &mouseWin ) )
     {
         if ( mouseWin == this && !wxIsBusy() )


@@ -528,7 +518,7 @@ bool wxWindowMac::SetCursor(const wxCursor& cursor)
             m_cursor.MacInstall() ;
         }
     }
             m_cursor.MacInstall() ;
         }
     }

-    
+

     return TRUE ;
 }
 
     return TRUE ;
 }
 


@@ -539,22 +529,22 @@ void wxWindowMac::DoGetClientSize(int *x, int *y) const
     int ww, hh;
     ww = m_width ;
     hh = m_height ;
     int ww, hh;
     ww = m_width ;
     hh = m_height ;

-    
+

     ww -= MacGetLeftBorderSize(  )  + MacGetRightBorderSize(  ) ;
     hh -= MacGetTopBorderSize(  ) + MacGetBottomBorderSize( );
     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 ;
     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 ) ;
         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 )
         {


@@ -564,10 +554,10 @@ void wxWindowMac::DoGetClientSize(int *x, int *y) const
                 totH = iter->m_height ;
                 break ;
             }
                 totH = iter->m_height ;
                 break ;
             }

-            
+

             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;


@@ -599,7 +589,7 @@ void wxWindowMac::DoGetClientSize(int *x, int *y) const
 void wxWindowMac::DoSetToolTip(wxToolTip *tooltip)
 {
     wxWindowBase::DoSetToolTip(tooltip);
 void wxWindowMac::DoSetToolTip(wxToolTip *tooltip)
 {
     wxWindowBase::DoSetToolTip(tooltip);

-    
+

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


@@ -612,12 +602,12 @@ 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))
         actualWidth = m_minWidth;
     if ((m_minHeight != -1) && (actualHeight < m_minHeight))
     if ((m_minWidth != -1) && (actualWidth < m_minWidth))
         actualWidth = m_minWidth;
     if ((m_minHeight != -1) && (actualHeight < m_minHeight))


@@ -626,10 +616,10 @@ void wxWindowMac::DoMoveWindow(int x, int y, int width, int height)
         actualWidth = m_maxWidth;
     if ((m_maxHeight != -1) && (actualHeight > m_maxHeight))
         actualHeight = m_maxHeight;
         actualWidth = m_maxWidth;
     if ((m_maxHeight != -1) && (actualHeight > m_maxHeight))
         actualHeight = m_maxHeight;

-    
+

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

-    
+

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


@@ -638,13 +628,13 @@ void wxWindowMac::DoMoveWindow(int x, int y, int width, int height)
     {
         doResize = true ;
     }
     {
         doResize = true ;
     }

-    
+

     if ( doMove || doResize )
     {
         // erase former position
     if ( doMove || doResize )
     {
         // erase former position

-        
+

         bool partialRepaint = false ;
         bool partialRepaint = false ;

-        
+

         if ( HasFlag(wxNO_FULL_REPAINT_ON_RESIZE) )
         {
             wxPoint oldPos( m_x , m_y ) ;
         if ( HasFlag(wxNO_FULL_REPAINT_ON_RESIZE) )
         {
             wxPoint oldPos( m_x , m_y ) ;


@@ -669,25 +659,25 @@ void wxWindowMac::DoMoveWindow(int x, int y, int width, int height)
                 DisposeRgn(diffRgn) ;
             }
         }
                 DisposeRgn(diffRgn) ;
             }
         }

-        
+

         if ( !partialRepaint )
             Refresh() ;
         if ( !partialRepaint )
             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 ;

-        
+

         // update any low-level frame-relative positions
         // update any low-level frame-relative positions

-        
+

         MacUpdateDimensions() ;
         // erase new position
         MacUpdateDimensions() ;
         // erase new position

-        
+

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

-        
+

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


@@ -705,7 +695,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,


@@ -721,10 +711,10 @@ 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);

-    
+

     // ... and don't do anything (avoiding flicker) if it's already ok
     if ( x == currentX && y == currentY &&
         width == currentW && height == currentH )
     // ... and don't do anything (avoiding flicker) if it's already ok
     if ( x == currentX && y == currentY &&
         width == currentW && height == currentH )


@@ -732,14 +722,14 @@ void wxWindowMac::DoSetSize(int x, int y, int width, int height, int sizeFlags)
         MacRepositionScrollBars() ; // we might have a real position shift
         return;
     }
         MacRepositionScrollBars() ; // we might have a real position shift
         return;
     }

-    
+

     if ( x == -1 && !(sizeFlags & wxSIZE_ALLOW_MINUS_ONE) )
         x = currentX;
     if ( y == -1 && !(sizeFlags & wxSIZE_ALLOW_MINUS_ONE) )
         y = currentY;
     if ( x == -1 && !(sizeFlags & wxSIZE_ALLOW_MINUS_ONE) )
         x = currentX;
     if ( y == -1 && !(sizeFlags & wxSIZE_ALLOW_MINUS_ONE) )
         y = currentY;

-    
+

     AdjustForParentClientOrigin(x, y, sizeFlags);
     AdjustForParentClientOrigin(x, y, sizeFlags);

-    
+

     wxSize size(-1, -1);
     if ( width == -1 )
     {
     wxSize size(-1, -1);
     if ( width == -1 )
     {


@@ -754,7 +744,7 @@ void wxWindowMac::DoSetSize(int x, int y, int width, int height, int sizeFlags)
             width = currentW;
         }
     }
             width = currentW;
         }
     }

-    
+

     if ( height == -1 )
     {
         if ( sizeFlags & wxSIZE_AUTO_HEIGHT )
     if ( height == -1 )
     {
         if ( sizeFlags & wxSIZE_AUTO_HEIGHT )


@@ -764,7 +754,7 @@ void wxWindowMac::DoSetSize(int x, int y, int width, int height, int sizeFlags)
                 size = DoGetBestSize();
             }
             //else: already called DoGetBestSize() above
                 size = DoGetBestSize();
             }
             //else: already called DoGetBestSize() above

-            
+

             height = size.y;
         }
         else
             height = size.y;
         }
         else


@@ -773,9 +763,9 @@ void wxWindowMac::DoSetSize(int x, int y, int width, int height, int sizeFlags)
             height = currentH;
         }
     }
             height = currentH;
         }
     }

-    
+

     DoMoveWindow(x, y, width, height);
     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


@@ -800,25 +790,9 @@ 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 ) ;
     Refresh() ;
     MacSuperShown( show ) ;
     Refresh() ;

-/*
-    if ( !show )
-    {
-        if ( win && !win->m_isBeingDeleted )
-            Refresh() ;
-    }
-    else
-    {
-        Refresh() ;
-    }
-*/
+

     return TRUE;
 }
 
     return TRUE;
 }
 


@@ -827,7 +801,7 @@ void wxWindowMac::MacSuperShown( bool show )
     wxWindowListNode *node = GetChildren().GetFirst();
     while ( node )
     {
     wxWindowListNode *node = GetChildren().GetFirst();
     while ( node )
     {

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

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


@@ -1011,9 +985,9 @@ const wxBrush& wxWindowMac::MacGetBackgroundBrush()
         // 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 )
         {


@@ -1023,7 +997,7 @@ const wxBrush& wxWindowMac::MacGetBackgroundBrush()
                 parent = NULL ;
                 break ;
             }
                 parent = NULL ;
                 break ;
             }

-            
+

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


@@ -1060,8 +1034,8 @@ const wxBrush& wxWindowMac::MacGetBackgroundBrush()
     {
         m_macBackgroundBrush.SetColour( m_backgroundColour ) ;
     }
     {
         m_macBackgroundBrush.SetColour( m_backgroundColour ) ;
     }

-    
-    return m_macBackgroundBrush ;    
+
+    return m_macBackgroundBrush ;

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


@@ -1257,11 +1231,11 @@ void wxWindowMac::ScrollWindow(int dx, int dy, const wxRect *rect)
 {
     wxClientDC dc(this) ;
     wxMacPortSetter helper(&dc) ;
 {
     wxClientDC dc(this) ;
     wxMacPortSetter helper(&dc) ;

-    
+

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

-        
+

         Rect scrollrect = { dc.YLOG2DEVMAC(0) , dc.XLOG2DEVMAC(0) , dc.YLOG2DEVMAC(height) , dc.XLOG2DEVMAC(width) } ;
         RgnHandle updateRgn = NewRgn() ;
         ClipRect( &scrollrect ) ;
         Rect scrollrect = { dc.YLOG2DEVMAC(0) , dc.XLOG2DEVMAC(0) , dc.YLOG2DEVMAC(height) , dc.XLOG2DEVMAC(width) } ;
         RgnHandle updateRgn = NewRgn() ;
         ClipRect( &scrollrect ) ;


@@ -1275,21 +1249,21 @@ void wxWindowMac::ScrollWindow(int dx, int dy, const wxRect *rect)
         InvalWindowRgn( (WindowRef) MacGetRootWindow() ,  updateRgn ) ;
         DisposeRgn( updateRgn ) ;
     }
         InvalWindowRgn( (WindowRef) MacGetRootWindow() ,  updateRgn ) ;
         DisposeRgn( updateRgn ) ;
     }

-    
+

     for (wxWindowListNode *node = GetChildren().GetFirst(); node; node = node->GetNext())
     {
     for (wxWindowListNode *node = GetChildren().GetFirst(); node; node = node->GetNext())
     {

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

         if (child == m_vScrollBar) continue;
         if (child == m_hScrollBar) continue;
         if (child->IsTopLevel()) continue;
         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 )


@@ -1300,30 +1274,25 @@ 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) {
+
+        if (event.m_eventType == wxEVT_SCROLL_TOP)

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

-        } else
-            if (event.m_eventType == wxEVT_SCROLL_BOTTOM) {
-                wevent.m_eventType = wxEVT_SCROLLWIN_BOTTOM;
-            } else
-                if (event.m_eventType == wxEVT_SCROLL_LINEUP) {
-                    wevent.m_eventType = wxEVT_SCROLLWIN_LINEUP;
-                } else
-                    if (event.m_eventType == wxEVT_SCROLL_LINEDOWN) {
-                        wevent.m_eventType = wxEVT_SCROLLWIN_LINEDOWN;
-                    } else
-                        if (event.m_eventType == wxEVT_SCROLL_PAGEUP) {
-                            wevent.m_eventType = wxEVT_SCROLLWIN_PAGEUP;
-                        } else
-                            if (event.m_eventType == wxEVT_SCROLL_PAGEDOWN) {
-                                wevent.m_eventType = wxEVT_SCROLLWIN_PAGEDOWN;
-                            } else
-                                if (event.m_eventType == wxEVT_SCROLL_THUMBTRACK) {
-                                    wevent.m_eventType = wxEVT_SCROLLWIN_THUMBTRACK;
-                                }
-                                
-                                GetEventHandler()->ProcessEvent(wevent);
+        else if (event.m_eventType == wxEVT_SCROLL_BOTTOM)
+            wevent.m_eventType = wxEVT_SCROLLWIN_BOTTOM;
+        else if (event.m_eventType == wxEVT_SCROLL_LINEUP)
+            wevent.m_eventType = wxEVT_SCROLLWIN_LINEUP;
+        else if (event.m_eventType == wxEVT_SCROLL_LINEDOWN)
+            wevent.m_eventType = wxEVT_SCROLLWIN_LINEDOWN;
+        else if (event.m_eventType == wxEVT_SCROLL_PAGEUP)
+            wevent.m_eventType = wxEVT_SCROLLWIN_PAGEUP;
+        else if (event.m_eventType == wxEVT_SCROLL_PAGEDOWN)
+            wevent.m_eventType = wxEVT_SCROLLWIN_PAGEDOWN;
+        else if (event.m_eventType == wxEVT_SCROLL_THUMBTRACK)
+            wevent.m_eventType = wxEVT_SCROLLWIN_THUMBTRACK;
+        else if (event.m_eventType == wxEVT_SCROLL_THUMBRELEASE)
+            wevent.m_eventType = wxEVT_SCROLLWIN_THUMBRELEASE;
+
+        GetEventHandler()->ProcessEvent(wevent);

     }
 }
 
     }
 }
 


@@ -1372,7 +1341,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);


@@ -1397,21 +1366,6 @@ void wxWindowMac::SetupColours()
 
 void wxWindowMac::OnIdle(wxIdleEvent& event)
 {
 
 void wxWindowMac::OnIdle(wxIdleEvent& event)
 {

-/*
-   // Check if we need to send a LEAVE event
-   if (m_mouseInWindow)
-   {
-       POINT pt;
-       ::GetCursorPos(&pt);
-       if (::WindowFromPoint(pt) != (HWND) GetHWND())
-       {
-           // Generate a LEAVE event
-           m_mouseInWindow = FALSE;
-           MSWOnMouseLeave(pt.x, pt.y, 0);
-       }
-    }
-*/
-

     // This calls the UI-update mechanism (querying windows for
     // menu/toolbar/control state information)
     UpdateWindowUI();
     // This calls the UI-update mechanism (querying windows for
     // menu/toolbar/control state information)
     UpdateWindowUI();


@@ -1461,20 +1415,20 @@ 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() ;
     WindowRef window = (WindowRef) MacGetRootWindow() ;

-    
+

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

-    
+

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

-    
+

     for (wxWindowListNode *node = GetChildren().GetFirst(); node; node = node->GetNext())
     {
     for (wxWindowListNode *node = GetChildren().GetFirst(); node; node = node->GetNext())
     {

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

         // added the m_isShown test --dmazzoni
         if ( child->MacGetRootWindow() == window && child->m_isShown )
         {
         // added the m_isShown test --dmazzoni
         if ( child->MacGetRootWindow() == window && child->m_isShown )
         {


@@ -1482,7 +1436,7 @@ bool wxWindowMac::MacGetWindowFromPointSub( const wxPoint &point , wxWindowMac**
                 return TRUE;
         }
     }
                 return TRUE;
         }
     }

-    
+

     *outWin = this ;
     return TRUE;
 }
     *outWin = this ;
     return TRUE;
 }


@@ -1490,25 +1444,25 @@ 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 )
     {

-        
+

         wxWindowMac* win = wxFindWinFromMacWindow( window ) ;
         if ( win )
         {
             // No, this yields the CLIENT are, we need the whole frame. RR.
             // point = 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 ) ;
             GrafPtr     port;
             ::GetPort( &port ) ;
             ::SetPort( UMAGetWindowPort( window ) ) ;
             ::GlobalToLocal( &pt ) ;
             ::SetPort( port ) ;

-            
+

             wxPoint point( pt.h, pt.v ) ;
             wxPoint point( pt.h, pt.v ) ;

-            
+

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


@@ -1520,14 +1474,14 @@ static wxWindow *gs_lastWhich = NULL;
 bool wxWindowMac::MacSetupCursor( const wxPoint& pt)
 {
     // first trigger a set cursor event
 bool wxWindowMac::MacSetupCursor( const wxPoint& pt)
 {
     // first trigger a set cursor event

-    
+

     wxPoint clientorigin = GetClientAreaOrigin() ;
     wxSize clientsize = GetClientSize() ;
     wxCursor cursor ;
     if ( wxRect2DInt( clientorigin.x , clientorigin.y , clientsize.x , clientsize.y ).Contains( wxPoint2DInt( pt ) ) )
     {
         wxSetCursorEvent event( pt.x , pt.y );
     wxPoint clientorigin = GetClientAreaOrigin() ;
     wxSize clientsize = GetClientSize() ;
     wxCursor cursor ;
     if ( wxRect2DInt( clientorigin.x , clientorigin.y , clientsize.x , clientsize.y ).Contains( wxPoint2DInt( pt ) ) )
     {
         wxSetCursorEvent event( pt.x , pt.y );

-        
+

         bool processedEvtSetCursor = GetEventHandler()->ProcessEvent(event);
         if ( processedEvtSetCursor && event.HasCursor() )
         {
         bool processedEvtSetCursor = GetEventHandler()->ProcessEvent(event);
         if ( processedEvtSetCursor && event.HasCursor() )
         {


@@ -1535,7 +1489,7 @@ bool wxWindowMac::MacSetupCursor( const wxPoint& pt)
         }
         else
         {
         }
         else
         {

-            
+

             // the test for processedEvtSetCursor is here to prevent using m_cursor
             // if the user code caught EVT_SET_CURSOR() and returned nothing from
             // it - this is a way to say that our cursor shouldn't be used for this
             // the test for processedEvtSetCursor is here to prevent using m_cursor
             // if the user code caught EVT_SET_CURSOR() and returned nothing from
             // it - this is a way to say that our cursor shouldn't be used for this


@@ -1564,32 +1518,32 @@ 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 ) ) /* || IsKindOf( CLASSINFO( wxSpinCtrl ) ) */)
         return FALSE ;
     if ( IsKindOf( CLASSINFO ( wxStaticBox ) ) /* || IsKindOf( CLASSINFO( wxSpinCtrl ) ) */)
         return FALSE ;

-    
+

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

-    
+

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

-    
+

     for (wxWindowListNode *node = GetChildren().GetFirst(); node; node = node->GetNext())
     {
     for (wxWindowListNode *node = GetChildren().GetFirst(); node; node = node->GetNext())
     {

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

         if ( child->MacGetRootWindow() == window && child->IsShown() && child->IsEnabled() )
         {
             if (child->MacDispatchMouseEvent(event))
                 return TRUE;
         }
     }
         if ( child->MacGetRootWindow() == window && child->IsShown() && child->IsEnabled() )
         {
             if (child->MacDispatchMouseEvent(event))
                 return TRUE;
         }
     }

-    
+

     wxWindow* cursorTarget = this ;
     wxPoint cursorPoint( x , y ) ;
     wxWindow* cursorTarget = this ;
     wxPoint cursorPoint( x , y ) ;

-    
+

     while( cursorTarget && !cursorTarget->MacSetupCursor( cursorPoint ) )
     {
         cursorTarget = cursorTarget->GetParent() ;
     while( cursorTarget && !cursorTarget->MacSetupCursor( cursorPoint ) )
     {
         cursorTarget = cursorTarget->GetParent() ;


@@ -1599,40 +1553,40 @@ bool wxWindowMac::MacDispatchMouseEvent(wxMouseEvent& event)
     event.m_x = x ;
     event.m_y = y ;
     event.SetEventObject( this ) ;
     event.m_x = x ;
     event.m_y = y ;
     event.SetEventObject( this ) ;

-    
+

     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 ( event.GetEventType() == wxEVT_MOTION
         || event.GetEventType() == wxEVT_ENTER_WINDOW
         || event.GetEventType() == wxEVT_LEAVE_WINDOW )
         wxToolTip::RelayEvent( this , event);
 #endif // wxUSE_TOOLTIPS
 #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

-    
+

     if (gs_lastWhich != this)
     {
         gs_lastWhich = this;
     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 );
         // 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;
     }
         // 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;
 }
 


@@ -1676,19 +1630,19 @@ const wxRegion& wxWindowMac::MacGetVisibleRegion( bool respectChildrenAndSibling
     RgnHandle visRgn = NewRgn() ;
     RgnHandle tempRgn = NewRgn() ;
     RgnHandle tempStaticBoxRgn = NewRgn() ;
     RgnHandle visRgn = NewRgn() ;
     RgnHandle tempRgn = NewRgn() ;
     RgnHandle tempStaticBoxRgn = NewRgn() ;

-    
+

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

-    
+

     //TODO : as soon as the new scheme has proven to work correctly, move this to wxStaticBox
     if ( IsKindOf( CLASSINFO( wxStaticBox ) ) )
     {
         int borderTop = 14 ;
         int borderOther = 4 ;
     //TODO : as soon as the new scheme has proven to work correctly, move this to wxStaticBox
     if ( IsKindOf( CLASSINFO( wxStaticBox ) ) )
     {
         int borderTop = 14 ;
         int borderOther = 4 ;

-        
+

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

-    
+

     if ( !IsTopLevel() )
     {
         wxWindow* parent = GetParent() ;
     if ( !IsTopLevel() )
     {
         wxWindow* parent = GetParent() ;


@@ -1699,12 +1653,12 @@ const wxRegion& wxWindowMac::MacGetVisibleRegion( bool respectChildrenAndSibling
             x = y = 0 ;
             parent->MacWindowToRootWindow( &x, &y ) ;
             MacRootWindowToWindow( &x , &y ) ;
             x = y = 0 ;
             parent->MacWindowToRootWindow( &x, &y ) ;
             MacRootWindowToWindow( &x , &y ) ;

-            
+

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

-            
+

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


@@ -1717,8 +1671,8 @@ const wxRegion& wxWindowMac::MacGetVisibleRegion( bool respectChildrenAndSibling
         {
             for (wxWindowListNode *node = GetChildren().GetFirst(); node; node = node->GetNext())
             {
         {
             for (wxWindowListNode *node = GetChildren().GetFirst(); node; node = node->GetNext())
             {

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

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


@@ -1726,7 +1680,7 @@ const wxRegion& wxWindowMac::MacGetVisibleRegion( bool respectChildrenAndSibling
                     {
                         int borderTop = 14 ;
                         int borderOther = 4 ;
                     {
                         int borderTop = 14 ;
                         int borderOther = 4 ;

-                        
+

                         SetRectRgn( tempStaticBoxRgn , child->m_x + borderOther , child->m_y + borderTop , child->m_x + child->m_width - borderOther , child->m_y + child->m_height - borderOther ) ;
                         DiffRgn( tempRgn , tempStaticBoxRgn , tempRgn ) ;
                     }
                         SetRectRgn( tempStaticBoxRgn , child->m_x + borderOther , child->m_y + borderTop , child->m_x + child->m_width - borderOther , child->m_y + child->m_height - borderOther ) ;
                         DiffRgn( tempRgn , tempStaticBoxRgn , tempRgn ) ;
                     }


@@ -1734,13 +1688,13 @@ const wxRegion& wxWindowMac::MacGetVisibleRegion( bool respectChildrenAndSibling
                 }
             }
         }
                 }
             }
         }

-        
+

         if ( (GetWindowStyle() & wxCLIP_SIBLINGS) && GetParent() )
         {
             bool thisWindowThrough = false ;
             for (wxWindowListNode *node = GetParent()->GetChildren().GetFirst(); node; node = node->GetNext())
             {
         if ( (GetWindowStyle() & wxCLIP_SIBLINGS) && GetParent() )
         {
             bool thisWindowThrough = false ;
             for (wxWindowListNode *node = GetParent()->GetChildren().GetFirst(); node; node = node->GetNext())
             {

-                wxWindowMac *sibling = (wxWindowMac*)node->GetData();
+                wxWindowMac *sibling = node->GetData();

                 if ( sibling == this )
                 {
                     thisWindowThrough = true ;
                 if ( sibling == this )
                 {
                     thisWindowThrough = true ;


@@ -1750,7 +1704,7 @@ const wxRegion& wxWindowMac::MacGetVisibleRegion( bool respectChildrenAndSibling
                 {
                     continue ;
                 }
                 {
                     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 ) ;
                 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 ) ;


@@ -1758,7 +1712,7 @@ const wxRegion& wxWindowMac::MacGetVisibleRegion( bool respectChildrenAndSibling
                     {
                         int borderTop = 14 ;
                         int borderOther = 4 ;
                     {
                         int borderTop = 14 ;
                         int borderOther = 4 ;

-                        
+

                         SetRectRgn( tempStaticBoxRgn , sibling->m_x - m_x + borderOther , sibling->m_y - m_y + borderTop , sibling->m_x + sibling->m_width - m_x - borderOther , sibling->m_y + sibling->m_height - m_y - borderOther ) ;
                         DiffRgn( tempRgn , tempStaticBoxRgn , tempRgn ) ;
                     }
                         SetRectRgn( tempStaticBoxRgn , sibling->m_x - m_x + borderOther , sibling->m_y - m_y + borderTop , sibling->m_x + sibling->m_width - m_x - borderOther , sibling->m_y + sibling->m_height - m_y - borderOther ) ;
                         DiffRgn( tempRgn , tempStaticBoxRgn , tempRgn ) ;
                     }


@@ -1779,16 +1733,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() ;
     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 , (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() ;


@@ -1798,7 +1752,7 @@ 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) )
         {
             wxWindowDC dc(this);
         if ( erase && !EmptyRgn(ownUpdateRgn) )
         {
             wxWindowDC dc(this);


@@ -1807,7 +1761,7 @@ void wxWindowMac::MacRedraw( WXHRGN updatergnr , long time, bool erase)
             wxEraseEvent eevent( GetId(), &dc );
             eevent.SetEventObject( this );
             GetEventHandler()->ProcessEvent( eevent );
             wxEraseEvent eevent( GetId(), &dc );
             eevent.SetEventObject( this );
             GetEventHandler()->ProcessEvent( eevent );

-            
+

             wxNcPaintEvent eventNc( GetId() );
             eventNc.SetEventObject( this );
             GetEventHandler()->ProcessEvent( eventNc );
             wxNcPaintEvent eventNc( GetId() );
             eventNc.SetEventObject( this );
             GetEventHandler()->ProcessEvent( eventNc );


@@ -1821,15 +1775,15 @@ void wxWindowMac::MacRedraw( WXHRGN updatergnr , long time, bool erase)
             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() ;
     for (wxWindowListNode *node = GetChildren().GetFirst(); node; node = node->GetNext())
     {
         // calculate the update region for the child windows by intersecting the window rectangle with our own
         // passed in update region and then offset it to be client-wise window coordinates again
     RgnHandle childupdate = NewRgn() ;
     for (wxWindowListNode *node = GetChildren().GetFirst(); node; node = node->GetNext())
     {
         // calculate the update region for the child windows by intersecting the window rectangle with our own
         // passed in update region and then offset it to be client-wise window coordinates again

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

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


@@ -1841,7 +1795,7 @@ 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
 }
 
 WXHWND wxWindowMac::MacGetRootWindow() const


@@ -1989,7 +1943,7 @@ void wxWindowMac::MacSuperChangedPosition()
     wxWindowListNode *node = GetChildren().GetFirst();
     while ( node )
     {
     wxWindowListNode *node = GetChildren().GetFirst();
     while ( node )
     {

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

         child->MacSuperChangedPosition() ;
         node = node->GetNext();
     }
         child->MacSuperChangedPosition() ;
         node = node->GetNext();
     }


@@ -2002,7 +1956,7 @@ void wxWindowMac::MacTopLevelWindowChangedPosition()
     wxWindowListNode *node = GetChildren().GetFirst();
     while ( node )
     {
     wxWindowListNode *node = GetChildren().GetFirst();
     while ( node )
     {

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

         child->MacTopLevelWindowChangedPosition() ;
         node = node->GetNext();
     }
         child->MacTopLevelWindowChangedPosition() ;
         node = node->GetNext();
     }


@@ -2079,12 +2033,12 @@ wxPoint wxGetMousePosition()
     return wxPoint(x, y);
 }
 
     return wxPoint(x, y);
 }
 

-void wxWindowMac::OnMouseEvent( wxMouseEvent &event ) 
+void wxWindowMac::OnMouseEvent( wxMouseEvent &event )

 {
        if ( event.GetEventType() == wxEVT_RIGHT_DOWN )
        {
                // copied from wxGTK : CS
 {
        if ( event.GetEventType() == wxEVT_RIGHT_DOWN )
        {
                // copied from wxGTK : CS

-        // generate a "context menu" event: this is similar to wxEVT_RIGHT_UP
+        // generate a "context menu" event: this is similar to wxEVT_RIGHT_DOWN

         // except that:
         //
         // (a) it's a command event and so is propagated to the parent
         // except that:
         //
         // (a) it's a command event and so is propagated to the parent


@@ -2093,7 +2047,8 @@ void wxWindowMac::OnMouseEvent( wxMouseEvent &event )
         wxContextMenuEvent evtCtx(wxEVT_CONTEXT_MENU,
                                   this->GetId(),
                                   this->ClientToScreen(event.GetPosition()));
         wxContextMenuEvent evtCtx(wxEVT_CONTEXT_MENU,
                                   this->GetId(),
                                   this->ClientToScreen(event.GetPosition()));

-        this->GetEventHandler()->ProcessEvent(evtCtx);
+        if ( ! GetEventHandler()->ProcessEvent(evtCtx) )
+            event.Skip() ;

        }
        else
        {
        }
        else
        {