toplevel fixes

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

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

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

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


@@ -54,16 +54,22 @@
 #include <string.h>
 
 extern wxList wxPendingDelete;
 #include <string.h>
 
 extern wxList wxPendingDelete;

-wxWindow* gFocusWindow = NULL ;
+wxWindowMac* gFocusWindow = NULL ;
+
+#ifdef __WXUNIVERSAL__
+    IMPLEMENT_ABSTRACT_CLASS(wxWindowMac, wxWindowBase)
+#else // __WXMAC__
+    IMPLEMENT_DYNAMIC_CLASS(wxWindow, wxWindowBase)
+#endif // __WXUNIVERSAL__/__WXMAC__

 
 #if !USE_SHARED_LIBRARY
 
 #if !USE_SHARED_LIBRARY

-IMPLEMENT_DYNAMIC_CLASS(wxWindow, wxEvtHandler)
-BEGIN_EVENT_TABLE(wxWindow, wxEvtHandler)
-  EVT_ERASE_BACKGROUND(wxWindow::OnEraseBackground)
-  EVT_SYS_COLOUR_CHANGED(wxWindow::OnSysColourChanged)
-  EVT_INIT_DIALOG(wxWindow::OnInitDialog)
-  EVT_IDLE(wxWindow::OnIdle)
-  EVT_SET_FOCUS(wxWindow::OnSetFocus)
+
+BEGIN_EVENT_TABLE(wxWindowMac, wxWindowBase)
+  EVT_ERASE_BACKGROUND(wxWindowMac::OnEraseBackground)
+  EVT_SYS_COLOUR_CHANGED(wxWindowMac::OnSysColourChanged)
+  EVT_INIT_DIALOG(wxWindowMac::OnInitDialog)
+  EVT_IDLE(wxWindowMac::OnIdle)
+  EVT_SET_FOCUS(wxWindowMac::OnSetFocus)

 END_EVENT_TABLE()
 
 #endif
 END_EVENT_TABLE()
 
 #endif


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

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

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

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

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

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

 }
 
 }
 

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

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


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

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

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


@@ -108,9 +114,9 @@ void wxRemoveMacWindowAssociation(wxWindow *win)
 // constructors and such
 // ----------------------------------------------------------------------------
 
 // constructors and such
 // ----------------------------------------------------------------------------
 

-WindowRef wxWindow::s_macWindowInUpdate = NULL;
+WindowRef wxWindowMac::s_macWindowInUpdate = NULL;

 
 

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

 {
     // generic
     InitBase();
 {
     // generic
     InitBase();


@@ -150,11 +156,11 @@ void wxWindow::Init()
 }
 
 // Destructor
 }
 
 // Destructor

-wxWindow::~wxWindow()
+wxWindowMac::~wxWindowMac()

 {
     // deleting a window while it is shown invalidates the region
     if ( IsShown() ) {
 {
     // deleting a window while it is shown invalidates the region
     if ( IsShown() ) {

-        wxWindow* iter = this ;
+        wxWindowMac* iter = this ;

         while( iter ) {
             if ( iter->m_macWindowData )
             {
         while( iter ) {
             if ( iter->m_macWindowData )
             {


@@ -193,13 +199,13 @@ wxWindow::~wxWindow()
 }
 
 // Constructor
 }
 
 // Constructor

-bool wxWindow::Create(wxWindow *parent, wxWindowID id,
+bool wxWindowMac::Create(wxWindowMac *parent, wxWindowID id,

            const wxPoint& pos,
            const wxSize& size,
            long style,
            const wxString& name)
 {
            const wxPoint& pos,
            const wxSize& size,
            long style,
            const wxString& name)
 {

-    wxCHECK_MSG( parent, FALSE, wxT("can't create wxWindow without parent") );
+    wxCHECK_MSG( parent, FALSE, wxT("can't create wxWindowMac without parent") );

 
     if ( !CreateBase(parent, id, pos, size, style, wxDefaultValidator, name) )
         return FALSE;
 
     if ( !CreateBase(parent, id, pos, size, style, wxDefaultValidator, name) )
         return FALSE;


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

-
+#ifndef __WXUNIVERSAL__

        if ( ! IsKindOf( CLASSINFO ( wxControl ) ) && ! IsKindOf( CLASSINFO( wxStatusBar ) ) )
        {
        MacCreateScrollBars( style ) ;
        }
        if ( ! IsKindOf( CLASSINFO ( wxControl ) ) && ! IsKindOf( CLASSINFO( wxStatusBar ) ) )
        {
        MacCreateScrollBars( style ) ;
        }

-
+#endif

     return TRUE;
 }
 
     return TRUE;
 }
 

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

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


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

+      #ifndef __WXUNIVERSAL__

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

+                       #endif

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


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

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

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

-
+      #endif

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


@@ -274,7 +281,7 @@ void wxWindow::SetFocus()
        }
 }
 
        }
 }
 

-bool wxWindow::Enable(bool enable)
+bool wxWindowMac::Enable(bool enable)

 {
     if ( !wxWindowBase::Enable(enable) )
         return FALSE;
 {
     if ( !wxWindowBase::Enable(enable) )
         return FALSE;


@@ -282,7 +289,7 @@ bool wxWindow::Enable(bool enable)
     wxWindowList::Node *node = GetChildren().GetFirst();
     while ( node )
     {
     wxWindowList::Node *node = GetChildren().GetFirst();
     while ( node )
     {

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

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


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

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

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

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

 {
     wxTheApp->s_captureWindow = NULL ;
 }
 
 #if    wxUSE_DRAG_AND_DROP
 
 {
     wxTheApp->s_captureWindow = NULL ;
 }
 
 #if    wxUSE_DRAG_AND_DROP
 

-void wxWindow::SetDropTarget(wxDropTarget *pDropTarget)
+void wxWindowMac::SetDropTarget(wxDropTarget *pDropTarget)

 {
   if ( m_pDropTarget != 0 ) {
     delete m_pDropTarget;
 {
   if ( m_pDropTarget != 0 ) {
     delete m_pDropTarget;


@@ -319,32 +331,36 @@ void wxWindow::SetDropTarget(wxDropTarget *pDropTarget)
 #endif
 
 // Old style file-manager drag&drop
 #endif
 
 // Old style file-manager drag&drop

-void wxWindow::DragAcceptFiles(bool accept)
+void wxWindowMac::DragAcceptFiles(bool accept)

 {
     // TODO
 }
 
 // Get total size
 {
     // TODO
 }
 
 // Get total size

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

 {
 {

-    *x = m_width ;
-    *y = m_height ;
+     if(x)   *x = m_width ;
+     if(y)   *y = m_height ;

 }
 
 }
 

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

 {
 {

-    *x = m_x ;
-    *y = m_y ;
+    int xx,yy;
+ 
+    xx = m_x ;
+    yy = m_y ;

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

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

     }
     }

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

 }
 
 }
 

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

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


@@ -358,14 +374,16 @@ bool wxWindow::DoPopupMenu(wxMenu *menu, int x, int y)
 
   return TRUE;
 }
 
   return TRUE;
 }

+#endif

 
 

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

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

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

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


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

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

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

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

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

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

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


@@ -395,37 +413,31 @@ void wxWindow::DoClientToScreen(int *x, int *y) const
        ::SetOrigin( 0 , 0 ) ;
        ::LocalToGlobal( &localwhere ) ;
        ::SetPort( port ) ;
        ::SetOrigin( 0 , 0 ) ;
        ::LocalToGlobal( &localwhere ) ;
        ::SetPort( port ) ;

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

 }
 
 }
 

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

 {
 {

-       if ( m_macWindowData )
+       if ( m_macWindowData == NULL)

        {
        {

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

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

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

 {
 {

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

        {
        {

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

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

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

 {
     if (m_cursor == cursor)
        return FALSE;
 {
     if (m_cursor == cursor)
        return FALSE;


@@ -445,7 +457,7 @@ bool wxWindow::SetCursor(const wxCursor& cursor)
                   wxT("cursor must be valid after call to the base version"));
 
   Point pt ;
                   wxT("cursor must be valid after call to the base version"));
 
   Point pt ;

-  wxWindow *mouseWin ;
+  wxWindowMac *mouseWin ;

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


@@ -463,13 +475,14 @@ bool wxWindow::SetCursor(const wxCursor& cursor)
 
 
 // Get size *available for subwindows* i.e. excluding menu bar etc.
 
 
 // Get size *available for subwindows* i.e. excluding menu bar etc.

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

 {
 {

-    *x = m_width ;
-    *y = m_height ;
+    int ww, hh;
+    ww = m_width ;
+    hh = m_height ;

 
 

-       *x -= MacGetLeftBorderSize(  )  + MacGetRightBorderSize(  ) ;
-       *y -= 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()) )
   {


@@ -481,8 +494,7 @@ void wxWindow::DoGetClientSize(int *x, int *y) const
        MacClientToRootWindow( &x1 , &y1 ) ;
        MacClientToRootWindow( &w , &h ) ;
        
        MacClientToRootWindow( &x1 , &y1 ) ;
        MacClientToRootWindow( &w , &h ) ;
        

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

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


@@ -499,21 +511,23 @@ void wxWindow::DoGetClientSize(int *x, int *y) const
        
        if (m_hScrollBar  && m_hScrollBar->IsShown() )
        {
        
        if (m_hScrollBar  && m_hScrollBar->IsShown() )
        {

-               (*y) -= MAC_SCROLLBAR_SIZE;
+               hh -= MAC_SCROLLBAR_SIZE;

                if ( h-y1 >= totH )
                {
                if ( h-y1 >= totH )
                {

-                       (*y)+= 1 ;
+                       hh += 1 ;

                }
     }
        if (m_vScrollBar  && m_vScrollBar->IsShown() )
        {
                }
     }
        if (m_vScrollBar  && m_vScrollBar->IsShown() )
        {

-       (*x) -= MAC_SCROLLBAR_SIZE;
+       ww -= MAC_SCROLLBAR_SIZE;

                if ( w-x1 >= totW )
                {
                if ( w-x1 >= totW )
                {

-               (*x) += 1 ;
+               ww += 1 ;

        }
        }
   }
        }
        }
   }

+  if(x)   *x = ww;
+  if(y)   *y = hh;

 }
 
 
 }
 
 


@@ -523,7 +537,7 @@ void wxWindow::DoGetClientSize(int *x, int *y) const
 
 #if wxUSE_TOOLTIPS
 
 
 #if wxUSE_TOOLTIPS
 

-void wxWindow::DoSetToolTip(wxToolTip *tooltip)
+void wxWindowMac::DoSetToolTip(wxToolTip *tooltip)

 {
     wxWindowBase::DoSetToolTip(tooltip);
 
 {
     wxWindowBase::DoSetToolTip(tooltip);
 


@@ -533,75 +547,18 @@ void wxWindow::DoSetToolTip(wxToolTip *tooltip)
 
 #endif // wxUSE_TOOLTIPS
 
 
 #endif // wxUSE_TOOLTIPS
 

-void wxWindow::DoMoveWindow(int x, int y, int width, int height)
+void wxWindowMac::DoMoveWindow(int x, int y, int width, int height)

 {
 {

-       DoSetSize( x,y, width, height ) ;
-}
-
-// set the size of the window: if the dimensions are positive, just use them,
-// but if any of them is equal to -1, it means that we must find the value for
-// it ourselves (unless sizeFlags contains wxSIZE_ALLOW_MINUS_ONE flag, in
-// which case -1 is a valid value for x and y)
-//
-// If sizeFlags contains wxSIZE_AUTO_WIDTH/HEIGHT flags (default), we calculate
-// the width/height to best suit our contents, otherwise we reuse the current
-// width/height
-void wxWindow::DoSetSize(int x, int y, int width, int height, int sizeFlags)
-{
-

        int former_x = m_x ;
        int former_y = m_y ;
        int former_w = m_width ;
        int former_h = m_height ;
        
        int former_x = m_x ;
        int former_y = m_y ;
        int former_w = m_width ;
        int former_h = m_height ;
        

-  int currentX, currentY;
-  GetPosition(&currentX, &currentY);
-  int currentW,currentH;
-  GetSize(&currentW, &currentH);
-

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

-  if (x == -1 && !(sizeFlags & wxSIZE_ALLOW_MINUS_ONE))
-      actualX = currentX;
-  if (y == -1 && !(sizeFlags & wxSIZE_ALLOW_MINUS_ONE))
-      actualY = currentY;
-  
-  wxSize size( -1 , -1 ) ;

   
   

-  if (width == -1 || height == -1 )
-  {
-       size = DoGetBestSize() ;
-  }
-  
-  if ( width == -1 )
-  {
-       if ( sizeFlags & wxSIZE_AUTO_WIDTH )
-    {
-      actualWidth = size.x ;   
-      if ( actualWidth == -1 )
-       actualWidth = 80 ;
-    }
-    else
-    {
-      actualWidth = currentW ;
-    }
-  }
-  if (height == -1)
-  {
-       if ( sizeFlags & wxSIZE_AUTO_HEIGHT )
-       {
-               actualHeight = size.y ;
-               if ( actualHeight == -1 )
-                       actualHeight = 26 ;
-       }
-       else 
-       {
-      actualHeight = currentH ;
-    }
-  }
-

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


@@ -610,15 +567,7 @@ void wxWindow::DoSetSize(int x, int y, int width, int height, int sizeFlags)
        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;

-       if ( actualX == currentX && actualY == currentY && actualWidth == currentW && actualHeight == currentH)
-       {
-               MacRepositionScrollBars() ; // we might have a real position shift
-               return ;
-       }

 
 

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

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


@@ -684,7 +633,7 @@ void wxWindow::DoSetSize(int x, int y, int width, int height, int sizeFlags)
                        }
                        
                        if ( doMove )
                        }
                        
                        if ( doMove )

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

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


@@ -696,25 +645,95 @@ void wxWindow::DoSetSize(int x, int y, int width, int height, int sizeFlags)
        }
        if ( doResize )
        {
        }
        if ( doResize )
        {

-           MacRepositionScrollBars() ;
-           wxSize size(m_width, m_height);
-           wxSizeEvent event(size, m_windowId);
-           event.SetEventObject(this);
-           GetEventHandler()->ProcessEvent(event);
+                MacRepositionScrollBars() ;
+                wxSize size(m_width, m_height);
+                wxSizeEvent event(size, m_windowId);
+                event.SetEventObject(this);
+                GetEventHandler()->ProcessEvent(event);

        }
        }
        }
        }

+       
+}
+
+// set the size of the window: if the dimensions are positive, just use them,
+// but if any of them is equal to -1, it means that we must find the value for
+// it ourselves (unless sizeFlags contains wxSIZE_ALLOW_MINUS_ONE flag, in
+// which case -1 is a valid value for x and y)
+//
+// If sizeFlags contains wxSIZE_AUTO_WIDTH/HEIGHT flags (default), we calculate
+// the width/height to best suit our contents, otherwise we reuse the current
+// width/height
+void wxWindowMac::DoSetSize(int x, int y, int width, int height, int sizeFlags)
+{
+    // get the current size and position...
+    int currentX, currentY;
+    GetPosition(&currentX, &currentY);
+    int currentW,currentH;
+    GetSize(&currentW, &currentH);
+
+    // ... and don't do anything (avoiding flicker) if it's already ok
+    if ( x == currentX && y == currentY &&
+         width == currentW && height == currentH )
+    {
+               MacRepositionScrollBars() ; // we might have a real position shift
+        return;
+    }
+
+    if ( x == -1 && !(sizeFlags & wxSIZE_ALLOW_MINUS_ONE) )
+        x = currentX;
+    if ( y == -1 && !(sizeFlags & wxSIZE_ALLOW_MINUS_ONE) )
+        y = currentY;
+
+    AdjustForParentClientOrigin(x, y, sizeFlags);
+
+    wxSize size(-1, -1);
+    if ( width == -1 )
+    {
+        if ( sizeFlags & wxSIZE_AUTO_WIDTH )
+        {
+            size = DoGetBestSize();
+            width = size.x;
+        }
+        else
+        {
+            // just take the current one
+            width = currentW;
+        }
+    }
+
+    if ( height == -1 )
+    {
+        if ( sizeFlags & wxSIZE_AUTO_HEIGHT )
+        {
+            if ( size.x == -1 )
+            {
+                size = DoGetBestSize();
+            }
+            //else: already called DoGetBestSize() above
+
+            height = size.y;
+        }
+        else
+        {
+            // just take the current one
+            height = currentH;
+        }
+    }
+
+    DoMoveWindow(x, y, width, height);
+

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

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

 {
     return wxPoint(MacGetLeftBorderSize(  ) , MacGetTopBorderSize(  ) );
 }
 
 // Makes an adjustment to the window position (for example, a frame that has
 // a toolbar that it manages itself).
 {
     return wxPoint(MacGetLeftBorderSize(  ) , MacGetTopBorderSize(  ) );
 }
 
 // Makes an adjustment to the window position (for example, a frame that has
 // a toolbar that it manages itself).

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

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


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

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

 {
        m_label = title ;
        
 {
        m_label = title ;
        


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

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

 {
        return m_label ;
 }
 
 {
        return m_label ;
 }
 

-bool wxWindow::Show(bool show)
+bool wxWindowMac::Show(bool show)

 {
     if ( !wxWindowBase::Show(show) )
         return FALSE;
 {
     if ( !wxWindowBase::Show(show) )
         return FALSE;


@@ -770,24 +789,34 @@ bool wxWindow::Show(bool show)
          }
        }
        MacSuperShown( show ) ;
          }
        }
        MacSuperShown( show ) ;

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

 
     return TRUE;
 }
 
 
     return TRUE;
 }
 

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

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

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

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

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

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


@@ -795,7 +824,7 @@ bool wxWindow::MacIsReallyShown() const
        return m_isShown;
 /*     
        bool status = m_isShown ;
        return m_isShown;
 /*     
        bool status = m_isShown ;

-       wxWindow * win = this ;
+       wxWindowMac * win = this ;

        while ( status && win->m_parent != NULL )
        {
                win = win->m_parent ;
        while ( status && win->m_parent != NULL )
        {
                win = win->m_parent ;


@@ -805,26 +834,26 @@ bool wxWindow::MacIsReallyShown() const
 */
 }
 
 */
 }
 

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

 {
 {

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

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

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

 {
 {

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

        return dc.GetCharWidth() ;
 }
 
        return dc.GetCharWidth() ;
 }
 

-void wxWindow::GetTextExtent(const wxString& string, int *x, int *y,
+void wxWindowMac::GetTextExtent(const wxString& string, int *x, int *y,

                            int *descent, int *externalLeading, const wxFont *theFont ) const
 {
     const wxFont *fontToUse = theFont;
     if ( !fontToUse )
         fontToUse = &m_font;
         
                            int *descent, int *externalLeading, const wxFont *theFont ) const
 {
     const wxFont *fontToUse = theFont;
     if ( !fontToUse )
         fontToUse = &m_font;
         

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

     long lx,ly,ld,le ;
     dc.GetTextExtent( string , &lx , &ly , &ld, &le, (wxFont *)fontToUse ) ;
     if ( externalLeading )
     long lx,ly,ld,le ;
     dc.GetTextExtent( string , &lx , &ly , &ld, &le, (wxFont *)fontToUse ) ;
     if ( externalLeading )


@@ -837,7 +866,7 @@ void wxWindow::GetTextExtent(const wxString& string, int *x, int *y,
        *y = ly ;
 }
 
        *y = ly ;
 }
 

-void wxWindow::MacEraseBackground( Rect *rect )
+void wxWindowMac::MacEraseBackground( Rect *rect )

 {
 /*
        WindowRef window = GetMacRootWindow() ;
 {
 /*
        WindowRef window = GetMacRootWindow() ;


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

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

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


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

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

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


@@ -910,15 +939,17 @@ void wxWindow::MacEraseBackground( Rect *rect )
 */
 }
 
 */
 }
 

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

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

-       wxMacDrawingHelper focus( this ) ;
+       wxMacDrawingClientHelper focus( this ) ;

        if ( focus.Ok() )
        {
        if ( focus.Ok() )
        {

-               Rect clientrect = { 0 , 0 , m_height , m_width } ;
+           wxPoint client ;
+           client = GetClientAreaOrigin( ) ;
+               Rect clientrect = { -client.y , -client.x , m_height - client.y , m_width - client.x} ;

                // ClipRect( &clientrect ) ;
 
        if ( rect )
                // ClipRect( &clientrect ) ;
 
        if ( rect )


@@ -935,13 +966,13 @@ void wxWindow::Refresh(bool eraseBack, const wxRect *rect)
 }
 
 // Responds to colour changes: passes event on to children.
 }
 
 // Responds to colour changes: passes event on to children.

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

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

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

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


@@ -958,36 +989,36 @@ void wxWindow::OnSysColourChanged(wxSysColourChangedEvent& event)
 // Caret manipulation
 // ---------------------------------------------------------------------------
 
 // Caret manipulation
 // ---------------------------------------------------------------------------
 

-void wxWindow::CreateCaret(int w, int h)
+void wxWindowMac::CreateCaret(int w, int h)

 {
     SetCaret(new wxCaret(this, w, h));
 }
 
 {
     SetCaret(new wxCaret(this, w, h));
 }
 

-void wxWindow::CreateCaret(const wxBitmap *WXUNUSED(bitmap))
+void wxWindowMac::CreateCaret(const wxBitmap *WXUNUSED(bitmap))

 {
     wxFAIL_MSG("not implemented");
 }
 
 {
     wxFAIL_MSG("not implemented");
 }
 

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

 {
     wxCHECK_RET( m_caret, "no caret to show" );
 
     m_caret->Show(show);
 }
 
 {
     wxCHECK_RET( m_caret, "no caret to show" );
 
     m_caret->Show(show);
 }
 

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

 {
     SetCaret(NULL);
 }
 
 {
     SetCaret(NULL);
 }
 

-void wxWindow::SetCaretPos(int x, int y)
+void wxWindowMac::SetCaretPos(int x, int y)

 {
     wxCHECK_RET( m_caret, "no caret to move" );
 
     m_caret->Move(x, y);
 }
 
 {
     wxCHECK_RET( m_caret, "no caret to move" );
 
     m_caret->Move(x, y);
 }
 

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

 {
     wxCHECK_RET( m_caret, "no caret to get position of" );
 
 {
     wxCHECK_RET( m_caret, "no caret to get position of" );
 


@@ -995,24 +1026,24 @@ void wxWindow::GetCaretPos(int *x, int *y) const
 }
 #endif // wxUSE_CARET
 
 }
 #endif // wxUSE_CARET
 

-wxWindow *wxGetActiveWindow()
+wxWindowMac *wxGetActiveWindow()

 {
     // actually this is a windows-only concept
     return NULL;
 }
 
 // Coordinates relative to the window
 {
     // actually this is a windows-only concept
     return NULL;
 }
 
 // Coordinates relative to the window

-void wxWindow::WarpPointer (int x_pos, int y_pos)
+void wxWindowMac::WarpPointer (int x_pos, int y_pos)

 {
     // We really dont move the mouse programmatically under mac
 }
 
 {
     // We really dont move the mouse programmatically under mac
 }
 

-void wxWindow::OnEraseBackground(wxEraseEvent& event)
+void wxWindowMac::OnEraseBackground(wxEraseEvent& event)

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

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

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


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

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

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


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

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

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


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

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

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


@@ -1073,7 +1104,7 @@ void wxWindow::SetScrollPos(int orient, int pos, bool refresh)
                }
 }
 
                }
 }
 

-void  wxWindow::MacCreateRealWindow( const wxString& title,
+void  wxWindowMac::MacCreateRealWindow( const wxString& title,

            const wxPoint& pos,
            const wxSize& size,
            long style,
            const wxPoint& pos,
            const wxSize& size,
            long style,


@@ -1162,11 +1193,11 @@ void  wxWindow::MacCreateRealWindow( const wxString& title,
        m_macWindowData->m_macHasReceivedFirstActivate = true ;
 }
 
        m_macWindowData->m_macHasReceivedFirstActivate = true ;
 }
 

-void wxWindow::MacPaint( wxPaintEvent &event ) 
+void wxWindowMac::MacPaint( wxPaintEvent &event ) 

 {
 }
 
 {
 }
 

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

 {
        if( m_macWindowData )
                return ;
 {
        if( m_macWindowData )
                return ;


@@ -1280,7 +1311,7 @@ void wxWindow::MacPaintBorders( )
 }
 
 // New function that will replace some of the above.
 }
 
 // New function that will replace some of the above.

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

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


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

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

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


@@ -1345,7 +1376,7 @@ void wxWindow::ScrollWindow(int dx, int dy, const wxRect *rect)
        
        for (wxNode *node = GetChildren().First(); node; node = node->Next())
        {
        
        for (wxNode *node = GetChildren().First(); node; node = node->Next())
        {

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

                if (child == 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;


@@ -1358,7 +1389,7 @@ void wxWindow::ScrollWindow(int dx, int dy, const wxRect *rect)
        
 }
 
        
 }
 

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

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


@@ -1393,7 +1424,7 @@ void wxWindow::MacOnScroll(wxScrollEvent &event )
     }
 }
 
     }
 }
 

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

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


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

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

 {
        return gFocusWindow ;
 }
 {
        return gFocusWindow ;
 }


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

-void wxWindow::OnCommand(wxWindow& win, wxCommandEvent& event)
+void wxWindowMac::OnCommand(wxWindowMac& win, wxCommandEvent& event)

 {
     if ( GetEventHandler()->ProcessEvent(event)  )
         return;
 {
     if ( GetEventHandler()->ProcessEvent(event)  )
         return;


@@ -1424,7 +1455,7 @@ void wxWindow::OnCommand(wxWindow& win, wxCommandEvent& event)
 #endif // WXWIN_COMPATIBILITY_2
 
 #if WXWIN_COMPATIBILITY
 #endif // WXWIN_COMPATIBILITY_2
 
 #if WXWIN_COMPATIBILITY

-wxObject* wxWindow::GetChild(int number) const
+wxObject* wxWindowMac::GetChild(int number) const

 {
     // Return a pointer to the Nth object in the Panel
     wxNode *node = GetChildren().First();
 {
     // Return a pointer to the Nth object in the Panel
     wxNode *node = GetChildren().First();


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

-void wxWindow::OnSetFocus(wxFocusEvent& event)
+void wxWindowMac::OnSetFocus(wxFocusEvent& event)

 {
     // panel wants to track the window which was the last to have focus in it,
     // so we want to set ourselves as the window which last had focus
 {
     // panel wants to track the window which was the last to have focus in it,
     // so we want to set ourselves as the window which last had focus


@@ -1449,23 +1480,15 @@ void wxWindow::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

-    wxWindow *win = this;
-    while ( win )
-    {
-        wxWindow *parent = win->GetParent();
-        wxPanel *panel = wxDynamicCast(parent, wxPanel);
-        if ( panel )
-        {
-            panel->SetLastFocus(win);
-        }
-
-        win = parent;
-    }
+    
+    // CS:don't know if this is still needed:
+    //wxChildFocusEvent eventFocus(this);
+    //(void)GetEventHandler()->ProcessEvent(eventFocus);

 
     event.Skip();
 }
 
 
     event.Skip();
 }
 

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

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


@@ -1487,13 +1510,13 @@ void wxWindow::Clear()
 }
 
 // Setup background and foreground colours correctly
 }
 
 // Setup background and foreground colours correctly

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

 {
     if ( GetParent() )
         SetBackgroundColour(GetParent()->GetBackgroundColour());
 }
 
 {
     if ( GetParent() )
         SetBackgroundColour(GetParent()->GetBackgroundColour());
 }
 

-void wxWindow::OnIdle(wxIdleEvent& event)
+void wxWindowMac::OnIdle(wxIdleEvent& event)

 {
 /*
    // Check if we need to send a LEAVE event
 {
 /*
    // Check if we need to send a LEAVE event


@@ -1516,7 +1539,7 @@ void wxWindow::OnIdle(wxIdleEvent& event)
 }
 
 // Raise the window to the top of the Z order
 }
 
 // Raise the window to the top of the Z order

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

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


@@ -1525,7 +1548,7 @@ void wxWindow::Raise()
 }
 
 // Lower the window to the bottom of the Z order
 }
 
 // Lower the window to the bottom of the Z order

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

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


@@ -1533,7 +1556,7 @@ void wxWindow::Lower()
     }
 }
 
     }
 }
 

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

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


@@ -1551,9 +1574,9 @@ void wxWindow::DoSetClientSize(int width, int height)
 }
 
 
 }
 
 

-wxWindow* wxWindow::s_lastMouseWindow = NULL ;
+wxWindowMac* wxWindowMac::s_lastMouseWindow = NULL ;

 
 

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

 {
        if ((point.x < m_x) || (point.y < m_y) ||
                (point.x > (m_x + m_width)) || (point.y > (m_y + m_height)))
 {
        if ((point.x < m_x) || (point.y < m_y) ||
                (point.x > (m_x + m_width)) || (point.y > (m_y + m_height)))


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

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

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


@@ -1581,14 +1604,14 @@ bool wxWindow::MacGetWindowFromPointSub( const wxPoint &point , wxWindow** outWi
        return TRUE;
 }
 
        return TRUE;
 }
 

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

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

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

                        if ( win )
                        {
                        win->ScreenToClient( point ) ;
                        if ( win )
                        {
                        win->ScreenToClient( point ) ;


@@ -1600,7 +1623,7 @@ bool wxWindow::MacGetWindowFromPoint( const wxPoint &screenpoint , wxWindow** ou
 
 extern int wxBusyCursorCount ;
 
 
 extern int wxBusyCursorCount ;
 

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

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


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

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

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


@@ -1656,7 +1679,7 @@ bool wxWindow::MacDispatchMouseEvent(wxMouseEvent& event)
 Point lastWhere ;
 long lastWhen = 0 ;
 
 Point lastWhere ;
 long lastWhen = 0 ;
 

-wxString wxWindow::MacGetToolTipString( wxPoint &pt )
+wxString wxWindowMac::MacGetToolTipString( wxPoint &pt )

 {
        if ( m_tooltip )
        {
 {
        if ( m_tooltip )
        {


@@ -1664,7 +1687,7 @@ wxString wxWindow::MacGetToolTipString( wxPoint &pt )
        }
        return "" ;
 }
        }
        return "" ;
 }

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

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


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

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

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

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

 {
 {

-       WindowPtr frontWindow ;

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


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

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

 {
 {

-       WindowPtr frontWindow ;

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


@@ -1793,7 +1814,7 @@ void wxWindow::MacMouseMoved( EventRecord *ev , short part)
                        break ;
        }
 }
                        break ;
        }
 }

-void wxWindow::MacActivate( EventRecord *ev , bool inIsActivating )
+void wxWindowMac::MacActivate( EventRecord *ev , bool inIsActivating )

 {
     if ( !m_macWindowData->m_macHasReceivedFirstActivate )
         m_macWindowData->m_macHasReceivedFirstActivate = true ;
 {
     if ( !m_macWindowData->m_macHasReceivedFirstActivate )
         m_macWindowData->m_macHasReceivedFirstActivate = true ;


@@ -1809,14 +1830,14 @@ void wxWindow::MacActivate( EventRecord *ev , bool inIsActivating )
 //     MacUpdateImmediately() ;
 }
 
 //     MacUpdateImmediately() ;
 }
 

-void wxWindow::MacRedraw( RgnHandle updatergn , long time)
+void wxWindowMac::MacRedraw( RgnHandle updatergn , long time)

 {
        // updatergn is always already clipped to our boundaries
        WindowRef window = GetMacRootWindow() ;
        // ownUpdateRgn is the area that this window has to invalidate i.e. its own area without its children
        RgnHandle ownUpdateRgn = NewRgn() ;
        CopyRgn( updatergn , ownUpdateRgn ) ;
 {
        // updatergn is always already clipped to our boundaries
        WindowRef window = GetMacRootWindow() ;
        // ownUpdateRgn is the area that this window has to invalidate i.e. its own area without its children
        RgnHandle ownUpdateRgn = NewRgn() ;
        CopyRgn( updatergn , ownUpdateRgn ) ;

-       wxWindow* win = wxFindWinFromMacWindow( window ) ;
+

        {
                wxMacDrawingHelper focus( this ) ; // was client
                if ( focus.Ok() )
        {
                wxMacDrawingHelper focus( this ) ; // was client
                if ( focus.Ok() )


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

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

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


@@ -1885,7 +1906,7 @@ void wxWindow::MacRedraw( RgnHandle updatergn , long time)
            RgnHandle childarea = NewRgn() ;
                for (wxNode *node = GetChildren().First(); node; node = node->Next())
                {
            RgnHandle childarea = NewRgn() ;
                for (wxNode *node = GetChildren().First(); node; node = node->Next())
                {

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

                        // eventually test for transparent windows
                        if ( child->GetMacRootWindow() == window && child->IsShown() )
                        {
                        // eventually test for transparent windows
                        if ( child->GetMacRootWindow() == window && child->IsShown() )
                        {


@@ -1936,7 +1957,7 @@ void wxWindow::MacRedraw( RgnHandle updatergn , long time)
                        
        for (wxNode *node = GetChildren().First(); node; node = node->Next())
        {
                        
        for (wxNode *node = GetChildren().First(); node; node = node->Next())
        {

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

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


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

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

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

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

                #if TARGET_CARBON
                AGAPortHelper help( GetWindowPort(window) ) ;
                #else
                #if TARGET_CARBON
                AGAPortHelper help( GetWindowPort(window) ) ;
                #else


@@ -1983,10 +2004,10 @@ void wxWindow::MacUpdateImmediately()
        }
 }
 
        }
 }
 

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

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

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

        #if TARGET_CARBON
        AGAPortHelper help( GetWindowPort(window) ) ;
        #else
        #if TARGET_CARBON
        AGAPortHelper help( GetWindowPort(window) ) ;
        #else


@@ -2013,10 +2034,9 @@ void wxWindow::MacUpdate( EventRecord *ev )
        EndUpdate( window ) ;
 }
 
        EndUpdate( window ) ;
 }
 

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

 {
 {

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

        
        while( iter )
        {
        
        while( iter )
        {


@@ -2029,7 +2049,7 @@ WindowRef wxWindow::GetMacRootWindow() const
        return NULL ;
 }
 
        return NULL ;
 }
 

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

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


@@ -2068,7 +2088,7 @@ void wxWindow::MacCreateScrollBars( long style )
        MacRepositionScrollBars() ; // we might have a real position shift
 }
 
        MacRepositionScrollBars() ; // we might have a real position shift
 }
 

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

 {
        bool hasBoth = ( m_hScrollBar && m_hScrollBar->IsShown()) && ( m_vScrollBar && m_vScrollBar->IsShown()) ;
        int adjust = hasBoth ? MAC_SCROLLBAR_SIZE - 1 : 0 ;
 {
        bool hasBoth = ( m_hScrollBar && m_hScrollBar->IsShown()) && ( m_vScrollBar && m_vScrollBar->IsShown()) ;
        int adjust = hasBoth ? MAC_SCROLLBAR_SIZE - 1 : 0 ;


@@ -2094,8 +2114,7 @@ void wxWindow::MacRepositionScrollBars()
        MacClientToRootWindow( &x , &y ) ;
        MacClientToRootWindow( &w , &h ) ;
        
        MacClientToRootWindow( &x , &y ) ;
        MacClientToRootWindow( &w , &h ) ;
        

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

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


@@ -2143,18 +2162,18 @@ void wxWindow::MacRepositionScrollBars()
        }
 }
 
        }
 }
 

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

 {
 
 }
 
 
 {
 
 }
 
 

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

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

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

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


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

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

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

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

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

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

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


@@ -2193,7 +2212,7 @@ bool wxWindow::MacSetPortFocusParams( const Point & localOrigin, const Rect & cl
        return true;                    
 }
 
        return true;                    
 }
 

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

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


@@ -2218,7 +2237,7 @@ bool wxWindow::MacSetPortDrawingParams( const Point & localOrigin, const Rect &
        return true;                    
 }
 
        return true;                    
 }
 

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

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


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

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

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


@@ -2283,7 +2302,7 @@ void wxWindow::MacDoGetPortClientParams(Point* localOrigin, Rect* clipRect, Wind
        }
 }
 
        }
 }
 

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

 {
        MacDoGetPortClientParams( localOrigin , clipRect , window , rootwin ) ;
 
 {
        MacDoGetPortClientParams( localOrigin , clipRect , window , rootwin ) ;
 


@@ -2304,7 +2323,7 @@ void wxWindow::MacGetPortClientParams(Point* localOrigin, Rect* clipRect, Window
        SectRect(clipRect, &myClip, clipRect);
 }
 
        SectRect(clipRect, &myClip, clipRect);
 }
 

-long wxWindow::MacGetLeftBorderSize( ) const
+long wxWindowMac::MacGetLeftBorderSize( ) const

 {
        if( m_macWindowData )
                return 0 ;
 {
        if( m_macWindowData )
                return 0 ;


@@ -2324,7 +2343,7 @@ long wxWindow::MacGetLeftBorderSize( ) const
        return 0 ;
 }
 
        return 0 ;
 }
 

-long wxWindow::MacGetRightBorderSize( ) const
+long wxWindowMac::MacGetRightBorderSize( ) const

 {
        if( m_macWindowData )
                return 0 ;
 {
        if( m_macWindowData )
                return 0 ;


@@ -2344,7 +2363,7 @@ long wxWindow::MacGetRightBorderSize( ) const
        return 0 ;
 }
 
        return 0 ;
 }
 

-long wxWindow::MacGetTopBorderSize( ) const
+long wxWindowMac::MacGetTopBorderSize( ) const

 {
        if( m_macWindowData )
                return 0 ;
 {
        if( m_macWindowData )
                return 0 ;


@@ -2364,7 +2383,7 @@ long wxWindow::MacGetTopBorderSize( ) const
        return 0 ;
 }
 
        return 0 ;
 }
 

-long wxWindow::MacGetBottomBorderSize( ) const
+long wxWindowMac::MacGetBottomBorderSize( ) const

 {
        if( m_macWindowData )
                return 0 ;
 {
        if( m_macWindowData )
                return 0 ;


@@ -2384,19 +2403,19 @@ long wxWindow::MacGetBottomBorderSize( ) const
        return 0 ;
 }
 
        return 0 ;
 }
 

-long wxWindow::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 ) ;
 }
 
 

-wxMacDrawingHelper::wxMacDrawingHelper( wxWindow * theWindow ) 
+wxMacDrawingHelper::wxMacDrawingHelper( wxWindowMac * theWindow ) 

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

-       wxWindow *rootwin ;
+       wxWindowMac *rootwin ;

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


@@ -2428,13 +2447,13 @@ wxMacDrawingHelper::~wxMacDrawingHelper()
                SetPort( m_formerPort ) ;
 }
 
                SetPort( m_formerPort ) ;
 }
 

-wxMacDrawingClientHelper::wxMacDrawingClientHelper( wxWindow * theWindow ) 
+wxMacDrawingClientHelper::wxMacDrawingClientHelper( wxWindowMac * theWindow ) 

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

-       wxWindow *rootwin ;
+       wxWindowMac *rootwin ;

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


@@ -2467,12 +2486,12 @@ wxMacDrawingClientHelper::~wxMacDrawingClientHelper()
                SetPort( m_formerPort ) ;
 }
 
                SetPort( m_formerPort ) ;
 }
 

-// Find the wxWindow at the current mouse position, returning the mouse
+// Find the wxWindowMac at the current mouse position, returning the mouse

 // position.
 // position.

-wxWindow* wxFindWindowAtPointer(wxPoint& pt)
+wxWindowMac* wxFindWindowAtPointer(wxPoint& pt)

 {
     pt = wxGetMousePosition();
 {
     pt = wxGetMousePosition();

-    wxWindow* found = wxFindWindowAtPoint(pt);
+    wxWindowMac* found = wxFindWindowAtPoint(pt);

     return found;
 }
 
     return found;
 }