]> git.saurik.com Git - wxWidgets.git/blobdiff - src/mac/window.cpp
projects / wxWidgets.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
more minimal stuff
[wxWidgets.git] / src / mac / window.cpp
diff --git a/src/mac/window.cpp b/src/mac/window.cpp
index 10ec3976dd283405badbaea6bddbe998945603a2..f8099265a2094b1dc026ee55dc26349fdf83653d 100644 (file)
--- a/src/mac/window.cpp
+++ b/src/mac/window.cpp
@@ -17,7 +17,7 @@
 #include "wx/menu.h"
 #include "wx/dc.h"
 #include "wx/dcclient.h"
 #include "wx/menu.h"
 #include "wx/dc.h"
 #include "wx/dcclient.h"
-#include "wx/utils.h"
+#include "wx/utils.h" 
 #include "wx/app.h"
 #include "wx/panel.h"
 #include "wx/layout.h"
 #include "wx/app.h"
 #include "wx/panel.h"
 #include "wx/layout.h"
@@ -27,10 +27,24 @@
 #include "wx/settings.h"
 #include "wx/msgdlg.h"
 #include "wx/frame.h"
 #include "wx/settings.h"
 #include "wx/msgdlg.h"
 #include "wx/frame.h"
+#include "wx/notebook.h"
+#include "wx/tabctrl.h"
+// TODO remove the line below, just for lookup-up convenience CS
+#include "wx/mac/window.h"
 
 #include "wx/menuitem.h"
 #include "wx/log.h"
 
 
 #include "wx/menuitem.h"
 #include "wx/log.h"
 
+#if wxUSE_CARET
+    #include "wx/caret.h"
+#endif // wxUSE_CARET
+
+#define wxWINDOW_HSCROLL 5998
+#define wxWINDOW_VSCROLL 5997
+#define MAC_SCROLLBAR_SIZE 16
+
+#include <wx/mac/uma.h>
+
 #if  wxUSE_DRAG_AND_DROP
 #include "wx/dnd.h"
 #endif
 #if  wxUSE_DRAG_AND_DROP
 #include "wx/dnd.h"
 #endif
@@ -38,102 +52,121 @@
 #include <string.h>
 
 extern wxList wxPendingDelete;
 #include <string.h>
 
 extern wxList wxPendingDelete;
+wxWindow* gFocusWindow = NULL ;
 
 
-#if !USE_SHARED_LIBRARY
 IMPLEMENT_DYNAMIC_CLASS(wxWindow, wxEvtHandler)
 
 BEGIN_EVENT_TABLE(wxWindow, wxEvtHandler)
 IMPLEMENT_DYNAMIC_CLASS(wxWindow, wxEvtHandler)
 
 BEGIN_EVENT_TABLE(wxWindow, wxEvtHandler)
-  EVT_CHAR(wxWindow::OnChar)
   EVT_ERASE_BACKGROUND(wxWindow::OnEraseBackground)
   EVT_SYS_COLOUR_CHANGED(wxWindow::OnSysColourChanged)
   EVT_INIT_DIALOG(wxWindow::OnInitDialog)
   EVT_IDLE(wxWindow::OnIdle)
   EVT_ERASE_BACKGROUND(wxWindow::OnEraseBackground)
   EVT_SYS_COLOUR_CHANGED(wxWindow::OnSysColourChanged)
   EVT_INIT_DIALOG(wxWindow::OnInitDialog)
   EVT_IDLE(wxWindow::OnIdle)
+//  EVT_SCROLL(wxWindow::OnScroll)
 END_EVENT_TABLE()
 
 END_EVENT_TABLE()
 
-#endif
 
 
 
 
-// Constructor
-wxWindow::wxWindow()
-{
-    // Generic
-    m_windowId = 0;
-    m_windowStyle = 0;
-    m_windowParent = NULL;
-    m_windowEventHandler = this;
-    m_windowName = "";
-    m_windowCursor = *wxSTANDARD_CURSOR;
-    m_children = new wxList;
-    m_constraints = NULL;
-    m_constraintsInvolvedIn = NULL;
-    m_windowSizer = NULL;
-    m_sizerParent = NULL;
-    m_autoLayout = FALSE;
-    m_windowValidator = NULL;
-    m_defaultItem = NULL;
-    m_returnCode = 0;
-    m_caretWidth = 0; m_caretHeight = 0;
-    m_caretEnabled = FALSE;
-    m_caretShown = FALSE;
-    m_backgroundColour = wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DFACE) ;
-    // m_backgroundColour = wxSystemSettings::GetSystemColour(wxSYS_COLOUR_WINDOW) ; ;
-    m_foregroundColour = *wxBLACK;
+
+// ===========================================================================
+// implementation
+// ===========================================================================
+
+// ---------------------------------------------------------------------------
+// wxWindow utility functions
+// ---------------------------------------------------------------------------
+
+// Find an item given the Macintosh Window Reference
+
+wxList *wxWinMacWindowList = NULL;
+wxWindow *wxFindWinFromMacWindow(WindowRef inWindowRef)
+{
+    wxNode *node = wxWinMacWindowList->Find((long)inWindowRef);
+    if (!node)
+        return NULL;
+    return (wxWindow *)node->Data();
+}
+
+void wxAssociateWinWithMacWindow(WindowRef inWindowRef, wxWindow *win)
+{
+    // adding NULL WindowRef is (first) surely a result of an error and
+    // (secondly) breaks menu command processing
+    wxCHECK_RET( inWindowRef != (WindowRef) NULL, "attempt to add a NULL WindowRef to window list" );
+
+    if ( !wxWinMacWindowList->Find((long)inWindowRef) )
+        wxWinMacWindowList->Append((long)inWindowRef, win);
+}
+
+void wxRemoveMacWindowAssociation(wxWindow *win)
+{
+    wxWinMacWindowList->DeleteObject(win);
+}
+
+// ----------------------------------------------------------------------------
+// constructors and such
+// ----------------------------------------------------------------------------
+
+void wxWindow::Init()
+{
+    // generic
+    InitBase();
+
+    // MSW specific
+    m_doubleClickAllowed = 0;
+    m_winCaptured = 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_isShown = TRUE;
+
+       m_macWindowData = NULL ;
+
+       m_x = 0;
+       m_y = 0 ;       
+       m_width = 0 ;
+       m_height = 0 ;
+
+       m_hScrollBar = NULL ;
+       m_vScrollBar = NULL ;
 
 #if  wxUSE_DRAG_AND_DROP
 
 #if  wxUSE_DRAG_AND_DROP
-    m_pDropTarget = NULL;
+  m_pDropTarget = NULL;
 #endif
 }
 
 // Destructor
 wxWindow::~wxWindow()
 {
 #endif
 }
 
 // Destructor
 wxWindow::~wxWindow()
 {
-       // Have to delete constraints/sizer FIRST otherwise
-       // sizers may try to look at deleted windows as they
-       // delete themselves.
-#if wxUSE_CONSTRAINTS
-    DeleteRelatedConstraints();
-    if (m_constraints)
-    {
-        // This removes any dangling pointers to this window
-        // in other windows' constraintsInvolvedIn lists.
-        UnsetConstraints(m_constraints);
-        delete m_constraints;
-        m_constraints = NULL;
-    }
-    if (m_windowSizer)
+    m_isBeingDeleted = TRUE;
+
+       if ( s_lastMouseWindow == this )
+       {
+               s_lastMouseWindow = NULL ;
+       }
+
+    if ( gFocusWindow == this )
     {
     {
-        delete m_windowSizer;
-        m_windowSizer = NULL;
+       gFocusWindow = NULL ;
     }
     }
-    // If this is a child of a sizer, remove self from parent
-    if (m_sizerParent)
-        m_sizerParent->RemoveChild((wxWindow *)this);
-#endif
 
 
-    if (m_windowParent)
-        m_windowParent->RemoveChild(this);
+    if ( m_parent )
+        m_parent->RemoveChild(this);
 
     DestroyChildren();
 
 
     DestroyChildren();
 
-    // TODO: destroy the window
-
-    delete m_children;
-    m_children = NULL;
-
-    // Just in case the window has been Closed, but
-    // we're then deleting immediately: don't leave
-    // dangling pointers.
-    wxPendingDelete.DeleteObject(this);
-
-    if ( m_windowValidator )
-           delete m_windowValidator;
-}
-
-// Destroy the window (delayed, if a managed window)
-bool wxWindow::Destroy()
-{
-    delete this;
-    return TRUE;
+       if ( m_macWindowData )
+       {
+       UMADisposeWindow( m_macWindowData->m_macWindow ) ;
+       delete m_macWindowData ;
+       wxRemoveMacWindowAssociation( this ) ;
+    }
 }
 
 // Constructor
 }
 
 // Constructor
@@ -143,109 +176,104 @@ bool wxWindow::Create(wxWindow *parent, wxWindowID id,
            long style,
            const wxString& name)
 {
            long style,
            const wxString& name)
 {
-    // Generic
-    m_windowId = 0;
-    m_windowStyle = 0;
-    m_windowParent = NULL;
-    m_windowEventHandler = this;
-    m_windowName = "";
-    m_windowCursor = *wxSTANDARD_CURSOR;
-    m_constraints = NULL;
-    m_constraintsInvolvedIn = NULL;
-    m_windowSizer = NULL;
-    m_sizerParent = NULL;
-    m_autoLayout = FALSE;
-    m_windowValidator = NULL;
-
-#if wxUSE_DRAG_AND_DROP
-    m_pDropTarget = NULL;
-#endif
+    wxCHECK_MSG( parent, FALSE, wxT("can't create wxWindow without parent") );
 
 
-    m_caretWidth = 0; m_caretHeight = 0;
-    m_caretEnabled = FALSE;
-    m_caretShown = FALSE;
-    m_minSizeX = -1;
-    m_minSizeY = -1;
-    m_maxSizeX = -1;
-    m_maxSizeY = -1;
-    m_defaultItem = NULL;
-    m_windowParent = NULL;
-    if (!parent)
+    if ( !CreateBase(parent, id, pos, size, style, wxDefaultValidator, name) )
         return FALSE;
 
         return FALSE;
 
-    if (parent) parent->AddChild(this);
-
-    m_returnCode = 0;
-
-    SetName(name);
+    parent->AddChild(this);
 
 
-    if ( id == -1 )
-       m_windowId = (int)NewControlId();
-    else
-       m_windowId = id;
-
-    // m_backgroundColour = wxSystemSettings::GetSystemColour(wxSYS_COLOUR_WINDOW) ; ;
-    m_backgroundColour = wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DFACE) ;
-    m_foregroundColour = *wxBLACK;
-
-    m_windowStyle = style;
-
-    if ( id == -1 )
-       m_windowId = (int)NewControlId();
-    else
-       m_windowId = id;
+       m_x = (int)pos.x;
+       m_y = (int)pos.y;
+       AdjustForParentClientOrigin(m_x, m_y, wxSIZE_USE_EXISTING);
+       m_width = WidthDefault( size.x );
+       m_height = HeightDefault( size.y ) ;
 
 
-    // TODO: create the window
+    MacCreateScrollBars( style ) ;
 
     return TRUE;
 }
 
 void wxWindow::SetFocus()
 {
 
     return TRUE;
 }
 
 void wxWindow::SetFocus()
 {
-    // TODO
+       if ( AcceptsFocus() )
+       {
+               if (gFocusWindow )
+               {
+                       #if wxUSE_CARET
+                           // Deal with caret
+                           if ( gFocusWindow->m_caret )
+                           {
+                                 gFocusWindow->m_caret->OnKillFocus();
+                           }
+                       #endif // wxUSE_CARET
+                       wxControl* control = wxDynamicCast( gFocusWindow , wxControl ) ;
+                       if ( control && control->GetMacControl() )
+                       {
+                               UMASetKeyboardFocus( gFocusWindow->GetMacRootWindow() , control->GetMacControl()  , kControlFocusNoPart ) ;
+                       }
+               wxFocusEvent event(wxEVT_KILL_FOCUS, gFocusWindow->m_windowId);
+               event.SetEventObject(gFocusWindow);
+                       gFocusWindow->GetEventHandler()->ProcessEvent(event) ;
+               }
+               gFocusWindow = this ;
+               {
+                       #if wxUSE_CARET
+                   // Deal with caret
+                   if ( m_caret )
+                   {
+                       m_caret->OnSetFocus();
+                   }
+                       #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);
+               }
+                       wxControl* control = wxDynamicCast( gFocusWindow , wxControl ) ;
+                       if ( control && control->GetMacControl() )
+                       {
+                               UMASetKeyboardFocus( gFocusWindow->GetMacRootWindow() , control->GetMacControl()  , kControlEditTextPart ) ;
+                       }
+
+               wxFocusEvent event(wxEVT_SET_FOCUS, m_windowId);
+               event.SetEventObject(this);
+                       GetEventHandler()->ProcessEvent(event) ;
+               }
+       }
 }
 
 }
 
-void wxWindow::Enable(bool enable)
+bool wxWindow::Enable(bool enable)
 {
 {
-    // TODO
-}
+    if ( !wxWindowBase::Enable(enable) )
+        return FALSE;
+/*
+    HWND hWnd = GetHwnd();
+    if ( hWnd )
+        ::EnableWindow(hWnd, (BOOL)enable);
+*/
 
 
-void wxWindow::CaptureMouse()
-{
-    // TODO
-}
+    wxWindowList::Node *node = GetChildren().GetFirst();
+    while ( node )
+    {
+        wxWindow *child = node->GetData();
+        child->Enable(enable);
 
 
-void wxWindow::ReleaseMouse()
-{
-    // TODO
+        node = node->GetNext();
+    }
+
+    return TRUE;
 }
 
 }
 
-// Push/pop event handler (i.e. allow a chain of event handlers
-// be searched)
-void wxWindow::PushEventHandler(wxEvtHandler *handler)
+void wxWindow::CaptureMouse()
 {
 {
-       handler->SetNextHandler(GetEventHandler());
-       SetEventHandler(handler);
+    wxTheApp->s_captureWindow = this ;
 }
 
 }
 
-wxEvtHandler *wxWindow::PopEventHandler(bool deleteHandler)
+void wxWindow::ReleaseMouse()
 {
 {
-       if ( GetEventHandler() )
-       {
-               wxEvtHandler *handlerA = GetEventHandler();
-               wxEvtHandler *handlerB = handlerA->GetNextHandler();
-               handlerA->SetNextHandler(NULL);
-               SetEventHandler(handlerB);
-               if ( deleteHandler )
-               {
-                       delete handlerA;
-                       return NULL;
-               }
-               else
-                       return handlerA;
-       }
-       else
-               return NULL;
+    wxTheApp->s_captureWindow = NULL ;
 }
 
 #if    wxUSE_DRAG_AND_DROP
 }
 
 #if    wxUSE_DRAG_AND_DROP
@@ -272,54 +300,288 @@ void wxWindow::DragAcceptFiles(bool accept)
 }
 
 // Get total size
 }
 
 // Get total size
-void wxWindow::GetSize(int *x, int *y) const
+void wxWindow::DoGetSize(int *x, int *y) const
 {
 {
-    // TODO
+    *x = m_width ;
+    *y = m_height ;
 }
 
 }
 
-void wxWindow::GetPosition(int *x, int *y) const
+void wxWindow::DoGetPosition(int *x, int *y) const
 {
 {
-    // TODO
+    *x = m_x ;
+    *y = m_y ;
+    if (GetParent())
+    {
+        wxPoint pt(GetParent()->GetClientAreaOrigin());
+        *x -= pt.x;
+        *y -= pt.y;
+    }
 }
 
 }
 
-void wxWindow::ScreenToClient(int *x, int *y) const
+
+
+
+
+bool wxWindow::DoPopupMenu(wxMenu *menu, int x, int y)
 {
 {
-    // TODO
+       menu->SetInvokingWindow(this);
+    menu->UpdateUI();
+       ClientToScreen( &x , &y ) ;
+
+       ::InsertMenu( menu->GetHMenu() , -1 ) ;
+       long menuResult = ::PopUpMenuSelect(menu->GetHMenu() ,y,x, 0) ;
+       menu->MacMenuSelect( this , TickCount() , HiWord(menuResult) , LoWord(menuResult) ) ;
+       ::DeleteMenu( menu->MacGetMenuId() ) ;
+       menu->SetInvokingWindow(NULL);
+
+  return TRUE;
 }
 
 }
 
-void wxWindow::ClientToScreen(int *x, int *y) const
+void wxWindow::DoScreenToClient(int *x, int *y) const
 {
 {
-    // TODO
+       WindowRef window = GetMacRootWindow() ;
+
+       Point           localwhere ;
+       localwhere.h = * x ;
+       localwhere.v = * y ;
+
+       GrafPtr         port ;  
+       ::GetPort( &port ) ;
+       ::SetPort( UMAGetWindowPort( window ) ) ;
+       ::GlobalToLocal( &localwhere ) ;
+       ::SetPort( port ) ;
+
+       *x = localwhere.h ;
+       *y = localwhere.v ;
+       
+       MacRootWindowToClient( x , y ) ;
+}
+
+void wxWindow::DoClientToScreen(int *x, int *y) const
+{
+       WindowRef window = GetMacRootWindow() ;
+       
+       MacClientToRootWindow( x , y ) ;
+       
+       Point           localwhere ;
+       localwhere.h = * x ;
+       localwhere.v = * y ;
+       
+       GrafPtr         port ;  
+       ::GetPort( &port ) ;
+       ::SetPort( UMAGetWindowPort( window ) ) ;
+       ::LocalToGlobal( &localwhere ) ;
+       ::SetPort( port ) ;
+       *x = localwhere.h ;
+       *y = localwhere.v ;
+}
+
+void wxWindow::MacClientToRootWindow( int *x , int *y ) const
+{
+       if ( m_macWindowData )
+       {
+       }
+       else
+       {
+               *x += m_x ;
+               *y += m_y ;
+               GetParent()->MacClientToRootWindow( x , y ) ;
+       }
+}
+
+void wxWindow::MacRootWindowToClient( int *x , int *y ) const
+{
+       if ( m_macWindowData )
+       {
+       }
+       else
+       {
+               *x -= m_x ;
+               *y -= m_y ;
+               GetParent()->MacRootWindowToClient( x , y ) ;
+       }
 }
 
 }
 
-void wxWindow::SetCursor(const wxCursor& cursor)
+bool wxWindow::SetCursor(const wxCursor& cursor)
 {
 {
-  m_windowCursor = cursor;
-  if (m_windowCursor.Ok())
+   if ( !wxWindowBase::SetCursor(cursor) )
+   {
+       // no change
+       return FALSE;
+   }
+
+  wxASSERT_MSG( m_cursor.Ok(),
+                  wxT("cursor must be valid after call to the base version"));
+
+  Point pt ;
+  wxWindow *mouseWin ;
+  GetMouse( &pt ) ;
+  
+  // Change the cursor NOW if we're within the correct window
+
+  if ( MacGetWindowFromPoint( wxPoint( pt.h , pt.v ) , &mouseWin ) )
   {
   {
-    // TODO
+       if ( mouseWin == this && !wxIsBusy() )
+       {
+               cursor.MacInstall() ;
+       }
   }
   }
+
+  return TRUE ;
 }
 
 
 // Get size *available for subwindows* i.e. excluding menu bar etc.
 }
 
 
 // Get size *available for subwindows* i.e. excluding menu bar etc.
-void wxWindow::GetClientSize(int *x, int *y) const
+void wxWindow::DoGetClientSize(int *x, int *y) const
 {
 {
-    // TODO
+    *x = m_width ;
+    *y = m_height ;
+
+  if (m_vScrollBar && m_vScrollBar->IsShown() )
+       (*x) -= MAC_SCROLLBAR_SIZE;
+  if (m_hScrollBar  && m_hScrollBar->IsShown() )
+       (*y) -= MAC_SCROLLBAR_SIZE;
 }
 
 }
 
-void wxWindow::SetSize(int x, int y, int width, int height, int sizeFlags)
+
+// ----------------------------------------------------------------------------
+// tooltips
+// ----------------------------------------------------------------------------
+
+#if wxUSE_TOOLTIPS
+
+void wxWindow::DoSetToolTip(wxToolTip *tooltip)
 {
 {
-    // TODO
+    wxWindowBase::DoSetToolTip(tooltip);
+
+//    if ( m_tooltip )
+//        m_tooltip->SetWindow(this);
 }
 
 }
 
-void wxWindow::SetClientSize(int width, int height)
+#endif // wxUSE_TOOLTIPS
+
+void wxWindow::DoMoveWindow(int x, int y, int width, int height)
 {
 {
-    // TODO
+       DoSetSize( x,y, 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 currentX, currentY;
+  GetPosition(&currentX, &currentY);
+  int currentW,currentH;
+  GetSize(&currentW, &currentH);
+
+  int actualWidth = width;
+  int actualHeight = height;
+  int actualX = x;
+  int actualY = y;
+  if (x == -1 || (sizeFlags & wxSIZE_ALLOW_MINUS_ONE))
+      actualX = currentX;
+  if (y == -1 || (sizeFlags & wxSIZE_ALLOW_MINUS_ONE))
+      actualY = currentY;
+  if (width == -1)
+      actualWidth = currentW ;
+  if (height == -1)
+      actualHeight = currentH ;
+
+       if ( actualX == currentX && actualY == currentY && actualWidth == currentW && actualHeight == currentH)
+       {
+               MacRepositionScrollBars() ; // we might have a real position shift
+               return ;
+       }
+
+       AdjustForParentClientOrigin(actualX, actualY, sizeFlags);
+       
+       
+       bool doMove = false ;
+       bool doResize = false ;
+       
+       if ( actualX != former_x || actualY != former_y )
+       {
+               doMove = true ;
+       }
+       if ( actualWidth != former_w || actualHeight != former_h )
+       {
+               doResize = true ;
+       }
+
+       if ( doMove || doResize )
+       {
+               if ( m_macWindowData )
+               {
+               }
+               else
+               {
+                       // erase former position
+                       {
+                               wxMacDrawingClientHelper focus( this ) ;
+                               if ( focus.Ok() )
+                               {
+                               Rect clientrect = { 0 , 0 , m_height , m_width } ;
+                           InvalRect( &clientrect ) ;
+                               }
+                       }
+               }
+               m_x = actualX ;
+               m_y = actualY ;
+               m_width = actualWidth ;
+               m_height = actualHeight ;
+               if ( m_macWindowData )
+               {
+                       if ( doMove )
+                               ::MoveWindow(m_macWindowData->m_macWindow, m_x, m_y, false); // don't make frontmost
+                       
+                       if ( doResize )
+                               ::SizeWindow(m_macWindowData->m_macWindow, m_width, m_height, true); 
+                       
+                       // the OS takes care of invalidating and erasing        
+                       
+                       if ( IsKindOf( CLASSINFO( wxFrame ) ) )
+                       {
+                               wxFrame* frame = (wxFrame*) this ;
+                         frame->PositionStatusBar();
+                       frame->PositionToolBar();
+                       }
+               }
+               else
+               {
+                       // erase new position
+                       {
+                               wxMacDrawingClientHelper focus( this ) ;
+                               if ( focus.Ok() )
+                               {
+                               Rect clientrect = { 0 , 0 , m_height , m_width } ;
+                           InvalRect( &clientrect ) ;
+                               }
+                       }
+                       if ( doMove )
+                               wxWindow::MacSuperChangedPosition() ; // like this only children will be notified
+               }
+               MacRepositionScrollBars() ;
+               if ( doMove )
+               {
+       wxMoveEvent event(wxPoint(m_x, m_y), m_windowId);
+       event.SetEventObject(this);
+       GetEventHandler()->ProcessEvent(event) ;
+    }
+    if ( doResize )
+    {
+                       MacRepositionScrollBars() ;
+           wxSizeEvent event(wxSize(m_width, m_height), m_windowId);
+           event.SetEventObject(this);
+           GetEventHandler()->ProcessEvent(event);
+    }
+       }
+}
 // For implementation purposes - sometimes decorations make the client area
 // smaller
 // For implementation purposes - sometimes decorations make the client area
 // smaller
+
 wxPoint wxWindow::GetClientAreaOrigin() const
 {
     return wxPoint(0, 0);
 wxPoint wxWindow::GetClientAreaOrigin() const
 {
     return wxPoint(0, 0);
@@ -329,50 +591,201 @@ wxPoint wxWindow::GetClientAreaOrigin() const
 // a toolbar that it manages itself).
 void wxWindow::AdjustForParentClientOrigin(int& x, int& y, int sizeFlags)
 {
 // a toolbar that it manages itself).
 void wxWindow::AdjustForParentClientOrigin(int& x, int& y, int sizeFlags)
 {
+       if( !m_macWindowData )
+       {
     if (((sizeFlags & wxSIZE_NO_ADJUSTMENTS) == 0) && GetParent())
     {
         wxPoint pt(GetParent()->GetClientAreaOrigin());
         x += pt.x; y += pt.y;
     }
     if (((sizeFlags & wxSIZE_NO_ADJUSTMENTS) == 0) && GetParent())
     {
         wxPoint pt(GetParent()->GetClientAreaOrigin());
         x += pt.x; y += pt.y;
     }
+   }
+}
+
+void wxWindow::SetTitle(const wxString& title)
+{
+       m_label = title ;
+       
+       wxString label ;
+       
+       if( wxApp::s_macDefaultEncodingIsPC )
+               label = wxMacMakeMacStringFromPC( title ) ;
+       else
+               label = title ;
+
+       if ( m_macWindowData )
+       UMASetWTitleC( m_macWindowData->m_macWindow , label ) ;
+}
+
+wxString wxWindow::GetTitle() const
+{
+       return m_label ;
 }
 
 bool wxWindow::Show(bool show)
 {
 }
 
 bool wxWindow::Show(bool show)
 {
-    // TODO
-    return FALSE;
+    if ( !wxWindowBase::Show(show) )
+        return FALSE;
+
+       if ( m_macWindowData )
+       {
+         if (show)
+         {
+               UMAShowWindow( m_macWindowData->m_macWindow ) ;
+               UMASelectWindow( m_macWindowData->m_macWindow ) ;
+                       // no need to generate events here, they will get them triggered by macos
+           wxSizeEvent event(wxSize(m_width, m_height), m_windowId);
+           event.SetEventObject(this);
+           GetEventHandler()->ProcessEvent(event);
+         }
+         else
+         {
+               UMAHideWindow( m_macWindowData->m_macWindow ) ;
+         }
+       }
+       MacSuperShown( show ) ;
+       Refresh() ;
+
+    return TRUE;
 }
 
 }
 
-bool wxWindow::IsShown() const
+void wxWindow::MacSuperShown( bool show ) 
 {
 {
-    // TODO
-    return FALSE;
+       wxNode *node = GetChildren().First();
+       while ( node )
+       {
+               wxWindow *child = (wxWindow *)node->Data();
+               if ( child->m_isShown )
+                       child->MacSuperShown( show ) ;
+               node = node->Next();
+       }
 }
 
 int wxWindow::GetCharHeight() const
 {
 }
 
 int wxWindow::GetCharHeight() const
 {
-    // TODO
-    return 0;
+       wxClientDC dc ( (wxWindow*)this ) ;
+       return dc.GetCharHeight() ;
 }
 
 int wxWindow::GetCharWidth() const
 {
 }
 
 int wxWindow::GetCharWidth() const
 {
-    // TODO
-    return 0;
+       wxClientDC dc ( (wxWindow*)this ) ;
+       return dc.GetCharWidth() ;
 }
 
 void wxWindow::GetTextExtent(const wxString& string, int *x, int *y,
 }
 
 void wxWindow::GetTextExtent(const wxString& string, int *x, int *y,
-                           int *descent, int *externalLeading, const wxFont *theFont, bool) const
+                           int *descent, int *externalLeading, const wxFont *theFont ) const
 {
 {
-  wxFont *fontToUse = (wxFont *)theFont;
-  if (!fontToUse)
-    fontToUse = (wxFont *) & m_windowFont;
+    const wxFont *fontToUse = theFont;
+    if ( !fontToUse )
+        fontToUse = &m_font;
+        
+    wxClientDC dc( this ) ;
+    long lx,ly,ld,le ;
+    dc.GetTextExtent( string , &lx , &ly , &ld, &le, fontToUse ) ;
+    *externalLeading = le ;
+    *descent = ld ;
+    *x = lx ;
+    *y = ly ;
+}
 
 
-    // TODO
+void wxWindow::MacEraseBackground( Rect *rect )
+{
+       WindowRef window = GetMacRootWindow() ;
+       if ( m_backgroundColour == wxSystemSettings::GetSystemColour(wxSYS_COLOUR_APPWORKSPACE) )
+       {
+                       UMASetThemeWindowBackground( window , kThemeBrushDocumentWindowBackground , false ) ;
+       }
+       else if (  m_backgroundColour == wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DFACE ) )
+       {
+               // on mac we have the difficult situation, that 3dface gray can be different colours, depending whether
+               // it is on a notebook panel or not, in order to take care of that we walk up the hierarchy until we have
+               // either a non gray background color or a non control window
+               
+                       wxWindow* parent = GetParent() ;
+                       while( parent )
+                       {
+                               if ( parent->m_backgroundColour != wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DFACE ) )
+                               {
+                                       // if we have any other colours in the hierarchy
+                               RGBBackColor( &parent->m_backgroundColour.GetPixel()) ;
+                               break ;
+                               }
+                               if( parent->IsKindOf( CLASSINFO( wxControl ) ) && ((wxControl*)parent)->GetMacControl() )
+                               {
+                                       // if we have the normal colours in the hierarchy but another control etc. -> use it's background
+                                       if ( parent->IsKindOf( CLASSINFO( wxNotebook ) ) || parent->IsKindOf( CLASSINFO( wxTabCtrl ) ))
+                                       {
+                                               ApplyThemeBackground                    (kThemeBackgroundTabPane, rect, kThemeStateActive,8,true);
+                                               break ;
+                                       }
+                               }
+                               else
+                               {
+                                       // we have arrived at a non control item
+                                       parent = NULL ;
+                                       break ;
+                               }
+                               parent = parent->GetParent() ;
+                       }
+                       if ( !parent )
+                       {
+                               // if there is nothing special -> use default
+                               UMASetThemeWindowBackground( window , kThemeBrushDialogBackgroundActive , false ) ;
+                       }
+       }
+       else
+       {
+               RGBBackColor( &m_backgroundColour.GetPixel()) ;
+       }
+
+       EraseRect( rect ) ;     
+       
+       for (wxNode *node = GetChildren().First(); node; node = node->Next())
+       {
+               wxWindow *child = (wxWindow*)node->Data();
+//                     int width ;
+//                     int height ;
+               
+//                     child->GetClientSize( &width , &height ) ;
+               
+               Rect clientrect = { child->m_x , child->m_y , child->m_x +child->m_width , child->m_y + child->m_height } ;
+               SectRect( &clientrect , rect , &clientrect ) ;          
+
+               OffsetRect( &clientrect , -child->m_x , -child->m_y ) ;
+               if ( child->GetMacRootWindow() == window && child->IsShown() )
+               {
+                       wxMacDrawingClientHelper focus( this ) ;
+                       if ( focus.Ok() )
+                       {
+                               child->MacEraseBackground( &clientrect ) ;
+                       }
+               }
+       }
 }
 
 void wxWindow::Refresh(bool eraseBack, const wxRect *rect)
 {
 }
 
 void wxWindow::Refresh(bool eraseBack, const wxRect *rect)
 {
-    // TODO
+       wxMacDrawingClientHelper focus( this ) ;
+       if ( focus.Ok() )
+       {
+       int width , height ;
+       GetClientSize( &width , &height ) ;
+       Rect clientrect = { 0 , 0 , height , width } ;
+       ClipRect( &clientrect ) ;
+
+    if ( rect )
+    {
+       Rect r = { rect->y , rect->x , rect->y + rect->height , rect->x + rect->width } ;
+                       SectRect( &clientrect , &r , &clientrect ) ;            
+    }
+    InvalRect( &clientrect ) ;
+    /*
+    if ( eraseBack )
+    {
+       MacEraseBackground( &clientrect ) ;
+       }
+       */
+       }
 }
 
 // Responds to colour changes: passes event on to children.
 }
 
 // Responds to colour changes: passes event on to children.
@@ -394,115 +807,77 @@ void wxWindow::OnSysColourChanged(wxSysColourChangedEvent& event)
     }
 }
 
     }
 }
 
-// This can be called by the app (or wxWindows) to do default processing for the current
-// event. Save message/event info in wxWindow so they can be used in this function.
-long wxWindow::Default()
-{
-    // TODO
-    return 0;
-}
-
-void wxWindow::InitDialog()
-{
-  wxInitDialogEvent event(GetId());
-  event.SetEventObject( this );
-  GetEventHandler()->ProcessEvent(event);
-}
-
-// Default init dialog behaviour is to transfer data to window
-void wxWindow::OnInitDialog(wxInitDialogEvent& event)
-{
-  TransferDataToWindow();
-}
-
+#if wxUSE_CARET && WXWIN_COMPATIBILITY
+// ---------------------------------------------------------------------------
 // Caret manipulation
 // Caret manipulation
+// ---------------------------------------------------------------------------
+
 void wxWindow::CreateCaret(int w, int h)
 {
 void wxWindow::CreateCaret(int w, int h)
 {
-  m_caretWidth = w;
-  m_caretHeight = h;
-  m_caretEnabled = TRUE;
+    SetCaret(new wxCaret(this, w, h));
 }
 
 void wxWindow::CreateCaret(const wxBitmap *WXUNUSED(bitmap))
 {
 }
 
 void wxWindow::CreateCaret(const wxBitmap *WXUNUSED(bitmap))
 {
-    // TODO
+    wxFAIL_MSG("not implemented");
 }
 
 void wxWindow::ShowCaret(bool show)
 {
 }
 
 void wxWindow::ShowCaret(bool show)
 {
-    // TODO
+    wxCHECK_RET( m_caret, "no caret to show" );
+
+    m_caret->Show(show);
 }
 
 void wxWindow::DestroyCaret()
 {
 }
 
 void wxWindow::DestroyCaret()
 {
-    // TODO
-    m_caretEnabled = FALSE;
+    SetCaret(NULL);
 }
 
 void wxWindow::SetCaretPos(int x, int y)
 {
 }
 
 void wxWindow::SetCaretPos(int x, int y)
 {
-    // TODO
+    wxCHECK_RET( m_caret, "no caret to move" );
+
+    m_caret->Move(x, y);
 }
 
 void wxWindow::GetCaretPos(int *x, int *y) const
 {
 }
 
 void wxWindow::GetCaretPos(int *x, int *y) const
 {
-    // TODO
+    wxCHECK_RET( m_caret, "no caret to get position of" );
+
+    m_caret->GetPosition(x, y);
 }
 }
+#endif // wxUSE_CARET
 
 wxWindow *wxGetActiveWindow()
 {
 
 wxWindow *wxGetActiveWindow()
 {
-    // TODO
+    // actually this is a windows-only concept
     return NULL;
 }
 
     return NULL;
 }
 
-void wxWindow::SetSizeHints(int minW, int minH, int maxW, int maxH, int WXUNUSED(incW), int WXUNUSED(incH))
-{
-  m_minSizeX = minW;
-  m_minSizeY = minH;
-  m_maxSizeX = maxW;
-  m_maxSizeY = maxH;
-}
-
-void wxWindow::Centre(int direction)
-{
-  int x, y, width, height, panel_width, panel_height, new_x, new_y;
-
-  wxWindow *father = (wxWindow *)GetParent();
-  if (!father)
-    return;
-
-  father->GetClientSize(&panel_width, &panel_height);
-  GetSize(&width, &height);
-  GetPosition(&x, &y);
-
-  new_x = -1;
-  new_y = -1;
-
-  if (direction & wxHORIZONTAL)
-    new_x = (int)((panel_width - width)/2);
-
-  if (direction & wxVERTICAL)
-    new_y = (int)((panel_height - height)/2);
-
-  SetSize(new_x, new_y, -1, -1);
-
-}
-
 // Coordinates relative to the window
 void wxWindow::WarpPointer (int x_pos, int y_pos)
 {
 // Coordinates relative to the window
 void wxWindow::WarpPointer (int x_pos, int y_pos)
 {
-    // TODO
+    // We really dont move the mouse programmatically under mac
 }
 
 void wxWindow::OnEraseBackground(wxEraseEvent& event)
 {
 }
 
 void wxWindow::OnEraseBackground(wxEraseEvent& event)
 {
-    // TODO
-    Default();
+    // TODO : probably we would adopt the EraseEvent structure
 }
 
 int wxWindow::GetScrollPos(int orient) const
 {
 }
 
 int wxWindow::GetScrollPos(int orient) const
 {
-    // TODO
+               if ( orient == wxHORIZONTAL )
+               {
+                       if ( m_hScrollBar )
+                               return m_hScrollBar->GetThumbPosition() ;
+               }
+               else
+               {
+                       if ( m_vScrollBar )
+                               return m_vScrollBar->GetThumbPosition() ;
+               }
     return 0;
 }
 
     return 0;
 }
 
@@ -510,783 +885,1053 @@ int wxWindow::GetScrollPos(int orient) const
 // of positions that we can scroll.
 int wxWindow::GetScrollRange(int orient) const
 {
 // of positions that we can scroll.
 int wxWindow::GetScrollRange(int orient) const
 {
-    // TODO
+               if ( orient == wxHORIZONTAL )
+               {
+                       if ( m_hScrollBar )
+                               return m_hScrollBar->GetRange() ;
+               }
+               else
+               {
+                       if ( m_vScrollBar )
+                               return m_vScrollBar->GetRange() ;
+               }
     return 0;
 }
 
 int wxWindow::GetScrollThumb(int orient) const
 {
     return 0;
 }
 
 int wxWindow::GetScrollThumb(int orient) const
 {
-    // TODO
+               if ( orient == wxHORIZONTAL )
+               {
+                       if ( m_hScrollBar )
+                               return m_hScrollBar->GetThumbSize() ;
+               }
+               else
+               {
+                       if ( m_vScrollBar )
+                               return m_vScrollBar->GetThumbSize() ;
+               }
     return 0;
 }
 
 void wxWindow::SetScrollPos(int orient, int pos, bool refresh)
 {
     return 0;
 }
 
 void wxWindow::SetScrollPos(int orient, int pos, bool refresh)
 {
-    // TODO
-    return;
+               if ( orient == wxHORIZONTAL )
+               {
+                       if ( m_hScrollBar )
+                               m_hScrollBar->SetThumbPosition( pos ) ;
+               }
+               else
+               {
+                       if ( m_vScrollBar )
+                               m_vScrollBar->SetThumbPosition( pos ) ;
+               }
+}
+
+void wxWindow::MacPaint( wxPaintEvent &event ) 
+{
+    wxPaintDC dc(this);
+    PrepareDC(dc);
+
+    if (HasFlag(wxRAISED_BORDER) || HasFlag( wxSUNKEN_BORDER) )
+    {
+       bool sunken = HasFlag( wxSUNKEN_BORDER ) ;
+
+               wxPen m_penButton3DShadow( wxSystemSettings::GetSystemColour( wxSYS_COLOUR_3DSHADOW ), 1, wxSOLID ) ;
+               wxPen m_penButton3DFace( wxSystemSettings::GetSystemColour( wxSYS_COLOUR_3DFACE ), 1, wxSOLID ) ;
+       
+               wxPen wxPen1 = sunken ? *wxWHITE_PEN : *wxBLACK_PEN;
+               wxPen wxPen2 = sunken ? m_penButton3DShadow : m_penButton3DShadow;
+               wxPen wxPen3 = sunken ? m_penButton3DFace : m_penButton3DShadow;
+               wxPen wxPen4 = sunken ? *wxBLACK_PEN : *wxWHITE_PEN;
+       
+               dc.SetPen(wxPen1);
+               dc.DrawRectangle(0, 0, m_width, m_height);          // outer - right and button
+       
+           dc.SetPen(wxPen2);
+               dc.DrawRectangle(1, 1, m_width-1, m_height-1);      // outer - left and top
+       
+           dc.SetPen(wxPen3);
+               dc.DrawRectangle(0, 0, m_width-2, m_height-2);          // inner - right and button
+       
+           dc.SetPen(wxPen4);
+               dc.DrawLine(0, 0, m_width-3, 0);                 // inner - left and top
+               dc.DrawLine(0, 0, 0, m_height-3);
+    }
+    else if (HasFlag(wxSIMPLE_BORDER))
+    {
+               dc.SetPen(*wxBLACK_PEN);
+               dc.DrawRectangle(0, 0, m_width, m_height);         
+    }
 }
 
 // New function that will replace some of the above.
 void wxWindow::SetScrollbar(int orient, int pos, int thumbVisible,
     int range, bool refresh)
 {
 }
 
 // New function that will replace some of the above.
 void wxWindow::SetScrollbar(int orient, int pos, int thumbVisible,
     int range, bool refresh)
 {
-    // TODO
+               if ( orient == wxHORIZONTAL )
+               {
+                       if ( m_hScrollBar )
+                       {
+                               if ( range == 0 || thumbVisible >= range )
+                               {
+                                       if ( m_hScrollBar->IsShown() )
+                                               m_hScrollBar->Show(false) ;
+                               }
+                               else
+                               {
+                                       if ( !m_hScrollBar->IsShown() )
+                                               m_hScrollBar->Show(true) ;
+                                       m_hScrollBar->SetScrollbar( pos , thumbVisible , range , refresh ) ;
+                               }
+                       }
+               }
+               else
+               {
+                       if ( m_vScrollBar )
+                       {
+                               if ( range == 0 || thumbVisible >= range )
+                               {
+                                       if ( m_vScrollBar->IsShown() )
+                                               m_vScrollBar->Show(false) ;
+                               }
+                               else
+                               {
+                                       if ( !m_vScrollBar->IsShown() )
+                                               m_vScrollBar->Show(true) ;
+                                       m_vScrollBar->SetScrollbar( pos , thumbVisible , range , refresh ) ;
+                               }
+                       }
+               }
+               MacRepositionScrollBars() ;
 }
 
 // Does a physical scroll
 void wxWindow::ScrollWindow(int dx, int dy, const wxRect *rect)
 {
 }
 
 // Does a physical scroll
 void wxWindow::ScrollWindow(int dx, int dy, const wxRect *rect)
 {
-    // TODO
-    return;
+       wxMacDrawingClientHelper focus( this ) ;
+       if ( focus.Ok() )
+       {
+       int width , height ;
+       GetClientSize( &width , &height ) ;
+       Rect scrollrect = { 0 , 0 , height , width } ;
+       
+       RgnHandle updateRgn = NewRgn() ;
+       ClipRect( &scrollrect ) ;
+    if ( rect )
+    {
+       Rect r = { rect->y , rect->x , rect->y + rect->height , rect->x + rect->width } ;
+                       SectRect( &scrollrect , &r , &scrollrect ) ;            
+    }
+       ScrollRect( &scrollrect , dx , dy , updateRgn ) ;
+    InvalRgn( updateRgn ) ;
+    DisposeRgn( updateRgn ) ;
+       }
 }
 
 }
 
-void wxWindow::SetFont(const wxFont& font)
+void wxWindow::MacOnScroll(wxScrollEvent &event )
 {
 {
-    m_windowFont = font;
-
-    if (!m_windowFont.Ok())
-           return;
-    // TODO
+       if ( event.m_eventObject == m_vScrollBar || event.m_eventObject == m_hScrollBar )
+       {
+           wxScrollWinEvent wevent;
+           wevent.SetPosition(event.GetPosition());
+           wevent.SetOrientation(event.GetOrientation());
+           wevent.m_eventObject = this;
+       
+           switch ( event.m_eventType )
+           {
+           case wxEVT_SCROLL_TOP:
+               wevent.m_eventType = wxEVT_SCROLLWIN_TOP;
+               break;
+       
+           case wxEVT_SCROLL_BOTTOM:
+               wevent.m_eventType = wxEVT_SCROLLWIN_BOTTOM;
+               break;
+       
+           case wxEVT_SCROLL_LINEUP:
+               wevent.m_eventType = wxEVT_SCROLLWIN_LINEUP;
+               break;
+       
+           case wxEVT_SCROLL_LINEDOWN:
+               wevent.m_eventType = wxEVT_SCROLLWIN_LINEDOWN;
+               break;
+       
+           case wxEVT_SCROLL_PAGEUP:
+               wevent.m_eventType = wxEVT_SCROLLWIN_PAGEUP;
+               break;
+       
+           case wxEVT_SCROLL_PAGEDOWN:
+               wevent.m_eventType = wxEVT_SCROLLWIN_PAGEDOWN;
+               break;
+       
+           case wxEVT_SCROLL_THUMBTRACK:
+               wevent.m_eventType = wxEVT_SCROLLWIN_THUMBTRACK;
+               break;
+       
+           }
+               
+           GetEventHandler()->ProcessEvent(wevent);
+    }
 }
 
 }
 
-void wxWindow::OnChar(wxKeyEvent& event)
+bool wxWindow::SetFont(const wxFont& font)
 {
 {
-    if ( event.KeyCode() == WXK_TAB ) {
-        // propagate the TABs to the parent - it's up to it to decide what
-        // to do with it
-        if ( GetParent() ) {
-            if ( GetParent()->ProcessEvent(event) )
-                return;
-        }
+    if ( !wxWindowBase::SetFont(font) )
+    {
+        // nothing to do
+        return FALSE;
     }
     }
+
+    return TRUE;
 }
 
 }
 
-void wxWindow::OnPaint(wxPaintEvent& event)
+// Get the window with the focus
+wxWindow *wxWindowBase::FindFocus()
 {
 {
-       Default();
+       return gFocusWindow ;
 }
 
 }
 
-bool wxWindow::IsEnabled() const
+#if WXWIN_COMPATIBILITY
+// 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)
 {
 {
-    // TODO
-    return FALSE;
+    if ( GetEventHandler()->ProcessEvent(event)  )
+        return;
+    if ( m_parent )
+        m_parent->GetEventHandler()->OnCommand(win, event);
 }
 }
+#endif // WXWIN_COMPATIBILITY_2
 
 
-// Dialog support: override these and call
-// base class members to add functionality
-// that can't be done using validators.
-// NOTE: these functions assume that controls
-// are direct children of this window, not grandchildren
-// or other levels of descendant.
-
-// Transfer values to controls. If returns FALSE,
-// it's an application error (pops up a dialog)
-bool wxWindow::TransferDataToWindow()
+#if WXWIN_COMPATIBILITY
+wxObject* wxWindow::GetChild(int number) const
 {
 {
-       wxNode *node = GetChildren().First();
-       while ( node )
-       {
-               wxWindow *child = (wxWindow *)node->Data();
-               if ( child->GetValidator() &&
-                    !child->GetValidator()->TransferToWindow() )
-               {
-                       wxMessageBox("Application Error", "Could not transfer data to window", wxOK|wxICON_EXCLAMATION);
-                       return FALSE;
-               }
-
-               node = node->Next();
-       }
-       return TRUE;
+    // Return a pointer to the Nth object in the Panel
+    wxNode *node = GetChildren().First();
+    int n = number;
+    while (node && n--)
+        node = node->Next();
+    if ( node )
+    {
+        wxObject *obj = (wxObject *)node->Data();
+        return(obj);
+    }
+    else
+        return NULL;
 }
 }
+#endif // WXWIN_COMPATIBILITY
 
 
-// Transfer values from controls. If returns FALSE,
-// validation failed: don't quit
-bool wxWindow::TransferDataFromWindow()
+void wxWindow::Clear()
 {
 {
-       wxNode *node = GetChildren().First();
-       while ( node )
+       if ( m_macWindowData )
        {
        {
-               wxWindow *child = (wxWindow *)node->Data();
-               if ( child->GetValidator() && !child->GetValidator()->TransferFromWindow() )
-               {
-                       return FALSE;
-               }
-
-               node = node->Next();
+               wxMacDrawingClientHelper helper ( this ) ;
+               int w ,h ;
+               wxPoint origin = GetClientAreaOrigin() ;
+               GetClientSize( &w , &h ) ;
+               UMASetThemeWindowBackground( m_macWindowData->m_macWindow , m_macWindowData->m_macWindowBackgroundTheme , false ) ;
+               Rect r = { origin.y , origin.x, origin.y+h , origin.x+w } ;
+               EraseRect( &r ) ;
        }
        }
-       return TRUE;
-}
-
-bool wxWindow::Validate()
-{
-       wxNode *node = GetChildren().First();
-       while ( node )
+       else
        {
        {
-               wxWindow *child = (wxWindow *)node->Data();
-               if ( child->GetValidator() && /* child->GetValidator()->Ok() && */ !child->GetValidator()->Validate(this) )
-               {
-                       return FALSE;
-               }
-
-               node = node->Next();
+               wxClientDC dc(this);
+    wxBrush brush(GetBackgroundColour(), wxSOLID);
+    dc.SetBackground(brush);
+    dc.Clear();
        }
        }
-       return TRUE;
 }
 
 }
 
-// Get the window with the focus
-wxWindow *wxWindow::FindFocus()
+// Setup background and foreground colours correctly
+void wxWindow::SetupColours()
 {
 {
-    // TODO
-    return NULL;
+    if ( GetParent() )
+        SetBackgroundColour(GetParent()->GetBackgroundColour());
 }
 
 }
 
-void wxWindow::AddChild(wxWindow *child)
+void wxWindow::OnIdle(wxIdleEvent& event)
 {
 {
-    GetChildren().Append(child);
-    child->m_windowParent = this;
+/*
+   // 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();
 }
 
 }
 
-void wxWindow::RemoveChild(wxWindow *child)
+// Raise the window to the top of the Z order
+void wxWindow::Raise()
 {
 {
-    GetChildren().DeleteObject(child);
-    child->m_windowParent = NULL;
+    // TODO
 }
 
 }
 
-void wxWindow::DestroyChildren()
+// Lower the window to the bottom of the Z order
+void wxWindow::Lower()
 {
 {
-    wxNode *node;
-    while ((node = GetChildren().First()) != (wxNode *)NULL) {
-      wxWindow *child;
-      if ((child = (wxWindow *)node->Data()) != (wxWindow *)NULL) {
-        delete child;
-               if ( GetChildren().Member(child) )
-                       delete node;
-      }
-    } /* while */
+    // TODO
 }
 
 }
 
-void wxWindow::MakeModal(bool modal)
+void wxWindow::DoSetClientSize(int width, int height)
 {
 {
-  // Disable all other windows
-  if (this->IsKindOf(CLASSINFO(wxDialog)) || this->IsKindOf(CLASSINFO(wxFrame)))
-  {
-    wxNode *node = wxTopLevelWindows.First();
-    while (node)
-    {
-      wxWindow *win = (wxWindow *)node->Data();
-      if (win != this)
-        win->Enable(!modal);
+       if ( width != -1 || height != -1 )
+       {
+               
+               if ( width != -1 && m_vScrollBar )
+                       width += MAC_SCROLLBAR_SIZE ;
+               if ( height != -1 && m_vScrollBar )
+                       height += MAC_SCROLLBAR_SIZE ;
 
 
-      node = node->Next();
-    }
-  }
+               DoSetSize( -1 , -1 , width , height ) ;
+       }
 }
 
 }
 
-// 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)
-{
-  if (GetEventHandler()->ProcessEvent(event) )
-    return;
-  if (m_windowParent)
-    m_windowParent->GetEventHandler()->OnCommand(win, event);
-}
 
 
-void wxWindow::SetConstraints(wxLayoutConstraints *c)
-{
-  if (m_constraints)
-  {
-    UnsetConstraints(m_constraints);
-    delete m_constraints;
-  }
-  m_constraints = c;
-  if (m_constraints)
-  {
-    // Make sure other windows know they're part of a 'meaningful relationship'
-    if (m_constraints->left.GetOtherWindow() && (m_constraints->left.GetOtherWindow() != this))
-      m_constraints->left.GetOtherWindow()->AddConstraintReference((wxWindow *)this);
-    if (m_constraints->top.GetOtherWindow() && (m_constraints->top.GetOtherWindow() != this))
-      m_constraints->top.GetOtherWindow()->AddConstraintReference((wxWindow *)this);
-    if (m_constraints->right.GetOtherWindow() && (m_constraints->right.GetOtherWindow() != this))
-      m_constraints->right.GetOtherWindow()->AddConstraintReference((wxWindow *)this);
-    if (m_constraints->bottom.GetOtherWindow() && (m_constraints->bottom.GetOtherWindow() != this))
-      m_constraints->bottom.GetOtherWindow()->AddConstraintReference((wxWindow *)this);
-    if (m_constraints->width.GetOtherWindow() && (m_constraints->width.GetOtherWindow() != this))
-      m_constraints->width.GetOtherWindow()->AddConstraintReference((wxWindow *)this);
-    if (m_constraints->height.GetOtherWindow() && (m_constraints->height.GetOtherWindow() != this))
-      m_constraints->height.GetOtherWindow()->AddConstraintReference((wxWindow *)this);
-    if (m_constraints->centreX.GetOtherWindow() && (m_constraints->centreX.GetOtherWindow() != this))
-      m_constraints->centreX.GetOtherWindow()->AddConstraintReference((wxWindow *)this);
-    if (m_constraints->centreY.GetOtherWindow() && (m_constraints->centreY.GetOtherWindow() != this))
-      m_constraints->centreY.GetOtherWindow()->AddConstraintReference((wxWindow *)this);
-  }
-}
+wxWindow* wxWindow::s_lastMouseWindow = NULL ;
 
 
-// This removes any dangling pointers to this window
-// in other windows' constraintsInvolvedIn lists.
-void wxWindow::UnsetConstraints(wxLayoutConstraints *c)
+bool wxWindow::MacGetWindowFromPointSub( const wxPoint &point , wxWindow** outWin ) 
 {
 {
-  if (c)
-  {
-    if (c->left.GetOtherWindow() && (c->top.GetOtherWindow() != this))
-      c->left.GetOtherWindow()->RemoveConstraintReference((wxWindow *)this);
-    if (c->top.GetOtherWindow() && (c->top.GetOtherWindow() != this))
-      c->top.GetOtherWindow()->RemoveConstraintReference((wxWindow *)this);
-    if (c->right.GetOtherWindow() && (c->right.GetOtherWindow() != this))
-      c->right.GetOtherWindow()->RemoveConstraintReference((wxWindow *)this);
-    if (c->bottom.GetOtherWindow() && (c->bottom.GetOtherWindow() != this))
-      c->bottom.GetOtherWindow()->RemoveConstraintReference((wxWindow *)this);
-    if (c->width.GetOtherWindow() && (c->width.GetOtherWindow() != this))
-      c->width.GetOtherWindow()->RemoveConstraintReference((wxWindow *)this);
-    if (c->height.GetOtherWindow() && (c->height.GetOtherWindow() != this))
-      c->height.GetOtherWindow()->RemoveConstraintReference((wxWindow *)this);
-    if (c->centreX.GetOtherWindow() && (c->centreX.GetOtherWindow() != this))
-      c->centreX.GetOtherWindow()->RemoveConstraintReference((wxWindow *)this);
-    if (c->centreY.GetOtherWindow() && (c->centreY.GetOtherWindow() != this))
-      c->centreY.GetOtherWindow()->RemoveConstraintReference((wxWindow *)this);
-  }
-}
+       if ((point.x < m_x) || (point.y < m_y) ||
+               (point.x > (m_x + m_width)) || (point.y > (m_y + m_height)))
+               return FALSE;
+       
+       WindowRef window = GetMacRootWindow() ;
 
 
-// Back-pointer to other windows we're involved with, so if we delete
-// this window, we must delete any constraints we're involved with.
-void wxWindow::AddConstraintReference(wxWindow *otherWin)
-{
-  if (!m_constraintsInvolvedIn)
-    m_constraintsInvolvedIn = new wxList;
-  if (!m_constraintsInvolvedIn->Member(otherWin))
-    m_constraintsInvolvedIn->Append(otherWin);
-}
+       wxPoint newPoint( point ) ;
 
 
-// REMOVE back-pointer to other windows we're involved with.
-void wxWindow::RemoveConstraintReference(wxWindow *otherWin)
-{
-  if (m_constraintsInvolvedIn)
-    m_constraintsInvolvedIn->DeleteObject(otherWin);
-}
+       newPoint.x -= m_x;
+       newPoint.y -= m_y;
+       
+       for (wxNode *node = GetChildren().First(); node; node = node->Next())
+       {
+               wxWindow *child = (wxWindow*)node->Data();
+               if ( child->GetMacRootWindow() == window )
+               {
+                       if (child->MacGetWindowFromPointSub(newPoint , outWin ))
+                               return TRUE;
+               }
+       }
 
 
-// Reset any constraints that mention this window
-void wxWindow::DeleteRelatedConstraints()
-{
-  if (m_constraintsInvolvedIn)
-  {
-    wxNode *node = m_constraintsInvolvedIn->First();
-    while (node)
-    {
-      wxWindow *win = (wxWindow *)node->Data();
-      wxNode *next = node->Next();
-      wxLayoutConstraints *constr = win->GetConstraints();
-
-      // Reset any constraints involving this window
-      if (constr)
-      {
-        constr->left.ResetIfWin((wxWindow *)this);
-        constr->top.ResetIfWin((wxWindow *)this);
-        constr->right.ResetIfWin((wxWindow *)this);
-        constr->bottom.ResetIfWin((wxWindow *)this);
-        constr->width.ResetIfWin((wxWindow *)this);
-        constr->height.ResetIfWin((wxWindow *)this);
-        constr->centreX.ResetIfWin((wxWindow *)this);
-        constr->centreY.ResetIfWin((wxWindow *)this);
-      }
-      delete node;
-      node = next;
-    }
-    delete m_constraintsInvolvedIn;
-    m_constraintsInvolvedIn = NULL;
-  }
+       *outWin = this ;
+       return TRUE;
 }
 
 }
 
-void wxWindow::SetSizer(wxSizer *sizer)
+bool wxWindow::MacGetWindowFromPoint( const wxPoint &screenpoint , wxWindow** outWin ) 
 {
 {
-  m_windowSizer = sizer;
-  if (sizer)
-    sizer->SetSizerParent((wxWindow *)this);
+       WindowRef window ;
+       Point pt = { screenpoint.y , screenpoint.x } ;
+       if ( ::FindWindow( pt , &window ) == 3 )
+       {
+                       wxPoint point( screenpoint ) ;
+                       wxWindow* win = wxFindWinFromMacWindow( window ) ;
+                       win->ScreenToClient( point ) ;
+                       return win->MacGetWindowFromPointSub( point , outWin ) ;
+       }
+       return FALSE ;
 }
 
 }
 
-/*
- * New version
- */
+extern int wxBusyCursorCount ;
 
 
-bool wxWindow::Layout()
+bool wxWindow::MacDispatchMouseEvent(wxMouseEvent& event)
 {
 {
-  if (GetConstraints())
-  {
-    int w, h;
-    GetClientSize(&w, &h);
-    GetConstraints()->width.SetValue(w);
-    GetConstraints()->height.SetValue(h);
-  }
-  
-  // If top level (one sizer), evaluate the sizer's constraints.
-  if (GetSizer())
-  {
-    int noChanges;
-    GetSizer()->ResetConstraints();   // Mark all constraints as unevaluated
-    GetSizer()->LayoutPhase1(&noChanges);
-    GetSizer()->LayoutPhase2(&noChanges);
-    GetSizer()->SetConstraintSizes(); // Recursively set the real window sizes
-    return TRUE;
-  }
-  else
-  {
-    // Otherwise, evaluate child constraints
-    ResetConstraints();   // Mark all constraints as unevaluated
-    DoPhase(1);           // Just one phase need if no sizers involved
-    DoPhase(2);
-    SetConstraintSizes(); // Recursively set the real window sizes
-  }
-  return TRUE;
-}
+       if ((event.m_x < m_x) || (event.m_y < m_y) ||
+               (event.m_x > (m_x + m_width)) || (event.m_y > (m_y + m_height)))
+               return FALSE;
+       
+       if ( IsKindOf( CLASSINFO ( wxStaticBox ) ) )
+               return FALSE ; 
+       
+       WindowRef window = GetMacRootWindow() ;
 
 
+       event.m_x -= m_x;
+       event.m_y -= m_y;
+       
+       int x = event.m_x ;
+       int y = event.m_y ;
 
 
-// Do a phase of evaluating constraints:
-// the default behaviour. wxSizers may do a similar
-// thing, but also impose their own 'constraints'
-// and order the evaluation differently.
-bool wxWindow::LayoutPhase1(int *noChanges)
-{
-  wxLayoutConstraints *constr = GetConstraints();
-  if (constr)
-  {
-    return constr->SatisfyConstraints((wxWindow *)this, noChanges);
-  }
-  else
-    return TRUE;
-}
+       for (wxNode *node = GetChildren().First(); node; node = node->Next())
+       {
+               wxWindow *child = (wxWindow*)node->Data();
+               if ( child->GetMacRootWindow() == window && child->IsShown() && child->IsEnabled() )
+               {
+                       if (child->MacDispatchMouseEvent(event))
+                               return TRUE;
+               }
+       }
 
 
-bool wxWindow::LayoutPhase2(int *noChanges)
-{
-  *noChanges = 0;
-  
-  // Layout children
-  DoPhase(1);
-  DoPhase(2);
-  return TRUE;
+       event.m_x = x ;
+       event.m_y = y ;
+       
+       if ( wxBusyCursorCount == 0 )
+       {
+               m_cursor.MacInstall() ;
+       }
+       GetEventHandler()->ProcessEvent( event ) ;
+       return TRUE;
 }
 
 }
 
-// Do a phase of evaluating child constraints
-bool wxWindow::DoPhase(int phase)
+void wxWindow::MacFireMouseEvent( EventRecord *ev )
 {
 {
-  int noIterations = 0;
-  int maxIterations = 500;
-  int noChanges = 1;
-  int noFailures = 0;
-  wxList succeeded;
-  while ((noChanges > 0) && (noIterations < maxIterations))
-  {
-    noChanges = 0;
-    noFailures = 0;
-    wxNode *node = GetChildren().First();
-    while (node)
-    {
-      wxWindow *child = (wxWindow *)node->Data();
-      if (!child->IsKindOf(CLASSINFO(wxFrame)) && !child->IsKindOf(CLASSINFO(wxDialog)))
-      {
-        wxLayoutConstraints *constr = child->GetConstraints();
-        if (constr)
-        {
-          if (succeeded.Member(child))
-          {
-          }
-          else
-          {
-            int tempNoChanges = 0;
-            bool success = ( (phase == 1) ? child->LayoutPhase1(&tempNoChanges) : child->LayoutPhase2(&tempNoChanges) ) ;
-            noChanges += tempNoChanges;
-            if (success)
-            {
-              succeeded.Append(child);
-            }
-          }
-        }
-      }
-      node = node->Next();
-    }
-    noIterations ++;
-  }
-  return TRUE;
-}
+       wxMouseEvent event(wxEVT_LEFT_DOWN);
+       bool isDown = !(ev->modifiers & btnState) ; // 1 is for up
+       bool controlDown = ev->modifiers & controlKey ; // for simulating right mouse
+       
+       event.m_leftDown = isDown && !controlDown;
+       event.m_middleDown = FALSE;
+       event.m_rightDown = isDown && controlDown;
 
 
-void wxWindow::ResetConstraints()
-{
-  wxLayoutConstraints *constr = GetConstraints();
-  if (constr)
-  {
-    constr->left.SetDone(FALSE);
-    constr->top.SetDone(FALSE);
-    constr->right.SetDone(FALSE);
-    constr->bottom.SetDone(FALSE);
-    constr->width.SetDone(FALSE);
-    constr->height.SetDone(FALSE);
-    constr->centreX.SetDone(FALSE);
-    constr->centreY.SetDone(FALSE);
-  }
-  wxNode *node = GetChildren().First();
-  while (node)
-  {
-    wxWindow *win = (wxWindow *)node->Data();
-    if (!win->IsKindOf(CLASSINFO(wxFrame)) && !win->IsKindOf(CLASSINFO(wxDialog)))
-      win->ResetConstraints();
-    node = node->Next();
-  }
-}
+       if ( ev->what == mouseDown )
+       {
+               if ( controlDown )
+                       event.SetEventType(wxEVT_RIGHT_DOWN ) ;
+               else
+                       event.SetEventType(wxEVT_LEFT_DOWN ) ;
+       }
+       else if ( ev->what == mouseUp )
+       {
+               if ( controlDown )
+                       event.SetEventType(wxEVT_RIGHT_UP ) ;
+               else
+                       event.SetEventType(wxEVT_LEFT_UP ) ;
+       }
+       else
+       {
+               event.SetEventType(wxEVT_MOTION ) ;
+       }
 
 
-// Need to distinguish between setting the 'fake' size for
-// windows and sizers, and setting the real values.
-void wxWindow::SetConstraintSizes(bool recurse)
-{
-  wxLayoutConstraints *constr = GetConstraints();
-  if (constr && constr->left.GetDone() && constr->right.GetDone() &&
-                constr->width.GetDone() && constr->height.GetDone())
-  {
-    int x = constr->left.GetValue();
-    int y = constr->top.GetValue();
-    int w = constr->width.GetValue();
-    int h = constr->height.GetValue();
-
-    // If we don't want to resize this window, just move it...
-    if ((constr->width.GetRelationship() != wxAsIs) ||
-        (constr->height.GetRelationship() != wxAsIs))
-    {
-      // Calls Layout() recursively. AAAGH. How can we stop that.
-      // Simply take Layout() out of non-top level OnSizes.
-      SizerSetSize(x, y, w, h);
-    }
-    else
-    {
-      SizerMove(x, y);
-    }
-  }
-  else if (constr)
-  {
-    char *windowClass = this->GetClassInfo()->GetClassName();
+       event.m_shiftDown = ev->modifiers & shiftKey;
+       event.m_controlDown = ev->modifiers & controlKey;
+       event.m_altDown = ev->modifiers & optionKey;
+       event.m_metaDown = ev->modifiers & cmdKey;
 
 
-    wxString winName;
-       if (GetName() == "")
-               winName = "unnamed";
-       else
-               winName = GetName();
-    wxDebugMsg("Constraint(s) not satisfied for window of type %s, name %s:\n", (const char *)windowClass, (const char *)winName);
-    if (!constr->left.GetDone())
-      wxDebugMsg("  unsatisfied 'left' constraint.\n");
-    if (!constr->right.GetDone())
-      wxDebugMsg("  unsatisfied 'right' constraint.\n");
-    if (!constr->width.GetDone())
-      wxDebugMsg("  unsatisfied 'width' constraint.\n");
-    if (!constr->height.GetDone())
-      wxDebugMsg("  unsatisfied 'height' constraint.\n");
-    wxDebugMsg("Please check constraints: try adding AsIs() constraints.\n");
-  }
+       Point           localwhere = ev->where ;
+               
+       GrafPtr         port ;  
+       ::GetPort( &port ) ;
+       ::SetPort( UMAGetWindowPort( m_macWindowData->m_macWindow ) ) ;
+       ::GlobalToLocal( &localwhere ) ;
+       ::SetPort( port ) ;
 
 
-  if (recurse)
-  {
-    wxNode *node = GetChildren().First();
-    while (node)
-    {
-      wxWindow *win = (wxWindow *)node->Data();
-      if (!win->IsKindOf(CLASSINFO(wxFrame)) && !win->IsKindOf(CLASSINFO(wxDialog)))
-        win->SetConstraintSizes();
-      node = node->Next();
-    }
-  }
-}
+       event.m_x = localwhere.h;
+       event.m_y = localwhere.v;
+       event.m_x += m_x;
+       event.m_y += m_y;
 
 
-// This assumes that all sizers are 'on' the same
-// window, i.e. the parent of this window.
-void wxWindow::TransformSizerToActual(int *x, int *y) const
-{
-  if (!m_sizerParent || m_sizerParent->IsKindOf(CLASSINFO(wxDialog)) ||
-                        m_sizerParent->IsKindOf(CLASSINFO(wxFrame)) )
-    return;
-    
-  int xp, yp;
-  m_sizerParent->GetPosition(&xp, &yp);
-  m_sizerParent->TransformSizerToActual(&xp, &yp);
-  *x += xp;
-  *y += yp;
-}
+/*
+       wxPoint origin = GetClientAreaOrigin() ;
 
 
-void wxWindow::SizerSetSize(int x, int y, int w, int h)
-{
-       int xx = x;
-       int yy = y;
-  TransformSizerToActual(&xx, &yy);
-  SetSize(xx, yy, w, h);
+       event.m_x += origin.x ;
+       event.m_y += origin.y ;
+*/
+       
+       event.m_timeStamp = ev->when;
+       event.SetEventObject(this);
+       if ( wxTheApp->s_captureWindow )
+       {
+               int x = event.m_x ;
+               int y = event.m_y ;
+               wxTheApp->s_captureWindow->ScreenToClient( &x , &y ) ;
+               event.m_x = x ;
+               event.m_y = y ;
+               wxTheApp->s_captureWindow->GetEventHandler()->ProcessEvent( event ) ;
+               if ( ev->what == mouseUp )
+               {
+                       wxTheApp->s_captureWindow = NULL ;
+                       if ( wxBusyCursorCount == 0 )
+                       {
+                               m_cursor.MacInstall() ;
+                       }
+               }
+       }
+       else
+       {
+               MacDispatchMouseEvent( event ) ;
+       }
 }
 
 }
 
-void wxWindow::SizerMove(int x, int y)
+void wxWindow::MacMouseDown( EventRecord *ev , short part)
 {
 {
-       int xx = x;
-       int yy = y;
-  TransformSizerToActual(&xx, &yy);
-  Move(xx, yy);
+       MacFireMouseEvent( ev ) ;
 }
 
 }
 
-// Only set the size/position of the constraint (if any)
-void wxWindow::SetSizeConstraint(int x, int y, int w, int h)
+void wxWindow::MacMouseUp( EventRecord *ev , short part)
 {
 {
-  wxLayoutConstraints *constr = GetConstraints();
-  if (constr)
-  {
-    if (x != -1)
-    {
-      constr->left.SetValue(x);
-      constr->left.SetDone(TRUE);
-    }
-    if (y != -1)
-    {
-      constr->top.SetValue(y);
-      constr->top.SetDone(TRUE);
-    }
-    if (w != -1)
-    {
-      constr->width.SetValue(w);
-      constr->width.SetDone(TRUE);
-    }
-    if (h != -1)
-    {
-      constr->height.SetValue(h);
-      constr->height.SetDone(TRUE);
-    }
-  }
+       WindowPtr frontWindow ;
+       switch (part)
+       {
+               case inContent:         
+                       {
+                               MacFireMouseEvent( ev ) ;
+                       }
+                       break ;
+       }
 }
 
 }
 
-void wxWindow::MoveConstraint(int x, int y)
+void wxWindow::MacMouseMoved( EventRecord *ev , short part)
 {
 {
-  wxLayoutConstraints *constr = GetConstraints();
-  if (constr)
-  {
-    if (x != -1)
-    {
-      constr->left.SetValue(x);
-      constr->left.SetDone(TRUE);
-    }
-    if (y != -1)
-    {
-      constr->top.SetValue(y);
-      constr->top.SetDone(TRUE);
-    }
-  }
+       WindowPtr frontWindow ;
+       switch (part)
+       {
+               case inContent:         
+                       {
+                               MacFireMouseEvent( ev ) ;
+                       }
+                       break ;
+       }
 }
 }
-
-void wxWindow::GetSizeConstraint(int *w, int *h) const
+void wxWindow::MacActivate( EventRecord *ev , bool inIsActivating )
 {
 {
-  wxLayoutConstraints *constr = GetConstraints();
-  if (constr)
-  {
-    *w = constr->width.GetValue();
-    *h = constr->height.GetValue();
-  }
-  else
-    GetSize(w, h);
+       wxActivateEvent event(wxEVT_ACTIVATE, inIsActivating);
+       event.m_timeStamp = ev->when ;
+       event.SetEventObject(this);
+       
+       GetEventHandler()->ProcessEvent(event);
+       
+       UMAHighlightAndActivateWindow( m_macWindowData->m_macWindow , inIsActivating ) ;
 }
 
 }
 
-void wxWindow::GetClientSizeConstraint(int *w, int *h) const
+void wxWindow::MacRedraw( RgnHandle updatergn , long time)
 {
 {
-  wxLayoutConstraints *constr = GetConstraints();
-  if (constr)
-  {
-    *w = constr->width.GetValue();
-    *h = constr->height.GetValue();
-  }
-  else
-    GetClientSize(w, h);
-}
+       // updatergn is always already clipped to our boundaries
+       WindowRef window = GetMacRootWindow() ;
+       wxWindow* win = wxFindWinFromMacWindow( window ) ;
+       {
+               wxMacDrawingClientHelper focus( this ) ;
+               if ( focus.Ok() )
+               {
+                       WindowRef window = GetMacRootWindow() ;
+                       bool eraseBackground = false ;
+                       if ( m_macWindowData )
+                               eraseBackground = true ;
+                       if ( m_backgroundColour == wxSystemSettings::GetSystemColour(wxSYS_COLOUR_APPWORKSPACE) )
+                       {
+                                       UMASetThemeWindowBackground( window , kThemeBrushDocumentWindowBackground , false ) ;
+                       }
+                       else if (  m_backgroundColour == wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DFACE ) )
+                       {
+                                       // on mac we have the difficult situation, that 3dface gray can be different colours, depending whether
+                                       // it is on a notebook panel or not, in order to take care of that we walk up the hierarchy until we have
+                                       // either a non gray background color or a non control window
+               
+
+                                       wxWindow* parent = GetParent() ;
+                                       while( parent )
+                                       {
+                                               if ( parent->GetMacRootWindow() != window )
+                                               {
+                                                       // we are in a different window on the mac system
+                                                       parent = NULL ;
+                                                       break ;
+                                               }
+                                               
+                                               if( parent->IsKindOf( CLASSINFO( wxControl ) ) && ((wxControl*)parent)->GetMacControl() )
+                                               {
+                                                       if ( parent->m_backgroundColour != wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DFACE ) )
+                                                       {
+                                                               // if we have any other colours in the hierarchy
+                                                               RGBBackColor( &parent->m_backgroundColour.GetPixel()) ;
+                                                               break ;
+                                                       }
+                                                       // if we have the normal colours in the hierarchy but another control etc. -> use it's background
+                                                       if ( parent->IsKindOf( CLASSINFO( wxNotebook ) ) || parent->IsKindOf( CLASSINFO( wxTabCtrl ) ))
+                                                       {
+                                                               ApplyThemeBackground(kThemeBackgroundTabPane, &(**updatergn).rgnBBox , kThemeStateActive,8,true);
+                                                               break ;
+                                                       }
+                                               }
+                                               else
+                                               {
+                                                       parent = NULL ;
+                                                       break ;
+                                               }
+                                               parent = parent->GetParent() ;
+                                       }
+                                       if ( !parent )
+                                       {
+                                               // if there is nothing special -> use default
+                                               UMASetThemeWindowBackground( window , kThemeBrushDialogBackgroundActive , false ) ;
+                                       }
+                       }
+                       else
+                       {
+                               RGBBackColor( &m_backgroundColour.GetPixel()) ;
+                       }
+                       if ( GetParent() && m_backgroundColour != GetParent()->GetBackgroundColour() )
+                               eraseBackground = true ;
+                       SetClip( updatergn ) ;
+                       if ( eraseBackground )
+                       {
+                               EraseRgn( updatergn ) ; 
+                       }
+               }
+       }
 
 
-void wxWindow::GetPositionConstraint(int *x, int *y) const
-{
-  wxLayoutConstraints *constr = GetConstraints();
-  if (constr)
-  {
-    *x = constr->left.GetValue();
-    *y = constr->top.GetValue();
-  }
-  else
-    GetPosition(x, y);
+       
+       m_updateRegion = updatergn ;
+       wxPaintEvent event;
+       event.m_timeStamp = time ;
+       event.SetEventObject(this);
+       
+       wxPaintEvent event2( event ) ;
+       GetEventHandler()->ProcessEvent(event);
+       MacPaint( event2 ) ;
+       
+       RgnHandle childupdate = NewRgn() ;
+
+       for (wxNode *node = GetChildren().First(); node; node = node->Next())
+       {
+               wxWindow *child = (wxWindow*)node->Data();
+               int width ;
+               int height ;
+               
+               child->GetClientSize( &width , &height ) ;
+               
+               SetRectRgn( childupdate , child->m_x , child->m_y , child->m_x +width ,  child->m_y + height ) ;
+               SectRgn( childupdate , m_updateRegion.GetWXHRGN() , childupdate ) ;
+               OffsetRgn( childupdate , -child->m_x , -child->m_y ) ;
+               if ( child->GetMacRootWindow() == window && child->IsShown() )
+               {
+                       // because dialogs may also be children
+                       child->MacRedraw( childupdate , time ) ;
+               }
+       }
+       DisposeRgn( childupdate ) ;
+       // eventually a draw grow box here
 }
 
 }
 
-bool wxWindow::Close(bool force)
+void wxWindow::MacUpdateImmediately()
 {
 {
-  wxCloseEvent event(wxEVT_CLOSE_WINDOW, m_windowId);
-  event.SetEventObject(this);
-  event.SetForce(force);
-
-  return GetEventHandler()->ProcessEvent(event);
+       WindowRef window = GetMacRootWindow() ;
+       if ( window )
+       {
+               wxWindow* win = wxFindWinFromMacWindow( window ) ;
+               BeginUpdate( window ) ;
+               if ( win )
+               {
+               #if ! TARGET_CARBON
+                       if ( !EmptyRgn( window->visRgn ) )
+               #endif
+                       {
+                               win->MacRedraw( window->visRgn , wxTheApp->sm_lastMessageTime ) ;
+/*
+                               {
+                                       wxMacDrawingHelper help( win ) ;
+                                       SetOrigin( 0 , 0 ) ;
+                                       UMASetThemeWindowBackground( win->m_macWindowData->m_macWindow , kThemeBrushDialogBackgroundActive , false ) ;
+                                       UMAUpdateControls( window , window->visRgn ) ;
+                                       UMASetThemeWindowBackground( win->m_macWindowData->m_macWindow , win->m_macWindowData->m_macWindowBackgroundTheme , false ) ;
+                               }
+*/
+                       }
+               }
+               EndUpdate( window ) ;
+       }
 }
 
 }
 
-wxObject* wxWindow::GetChild(int number) const
+void wxWindow::MacUpdate( EventRecord *ev )
 {
 {
-  // Return a pointer to the Nth object in the window
-  wxNode *node = GetChildren().First();
-  int n = number;
-  while (node && n--)
-    node = node->Next() ;
-  if (node)
-  {
-    wxObject *obj = (wxObject *)node->Data();
-    return(obj) ;
-  }
-  else
-    return NULL ;
+       WindowRef window = (WindowRef) ev->message ;
+       wxWindow * win = wxFindWinFromMacWindow( window ) ;
+       
+       BeginUpdate( window ) ;
+       if ( win )
+       {
+               // if windowshade gives incompatibility , take the follwing out
+               #if ! TARGET_CARBON
+               if ( !EmptyRgn( window->visRgn ) )
+               #endif
+               {
+                       MacRedraw( window->visRgn , ev->when ) ;
+                       /*
+                       {
+                               wxMacDrawingHelper help( this ) ;
+                               SetOrigin( 0 , 0 ) ;
+                               UMASetThemeWindowBackground( m_macWindowData->m_macWindow , kThemeBrushDialogBackgroundActive , false ) ;
+                               UMAUpdateControls( window , window->visRgn ) ;
+                               UMASetThemeWindowBackground( m_macWindowData->m_macWindow , m_macWindowData->m_macWindowBackgroundTheme , false ) ;
+                       }
+                       */
+               }
+       }
+       EndUpdate( window ) ;
 }
 
 }
 
-void wxWindow::OnDefaultAction(wxControl *initiatingItem)
+WindowRef wxWindow::GetMacRootWindow() const
 {
 {
-    // Obsolete function
+       WindowRef window = NULL ;
+       wxWindow *iter = (wxWindow*)this ;
+       
+       while( iter )
+       {
+               if ( iter->m_macWindowData )
+                       return iter->m_macWindowData->m_macWindow ;
+
+               iter = iter->GetParent() ;
+       } 
+       wxASSERT_MSG( 1 , "No valid mac root window" ) ;
+       return NULL ;
 }
 
 }
 
-void wxWindow::Clear()
+void wxWindow::MacCreateScrollBars( long style ) 
 {
 {
-       wxClientDC dc(this);
-    wxBrush brush(GetBackgroundColour(), wxSOLID);
-    dc.SetBackground(brush);
-    dc.Clear();
+       wxASSERT_MSG( m_vScrollBar == NULL && m_hScrollBar == NULL , "attempt to create window twice" ) ;
+       bool hasBoth = ( style & wxVSCROLL ) && ( style & wxHSCROLL ) ;
+       int adjust = hasBoth ? MAC_SCROLLBAR_SIZE - 1: 0 ;
+       
+       if ( style & wxVSCROLL )
+       {
+               m_vScrollBar = new wxScrollBar(this, wxWINDOW_VSCROLL, wxPoint(m_width-MAC_SCROLLBAR_SIZE, 0), 
+                       wxSize(MAC_SCROLLBAR_SIZE, m_height - adjust), wxVERTICAL);
+//             m_vScrollBar->PushEventHandler( this ) ;
+       }
+       if ( style  & wxHSCROLL )
+       {
+               m_hScrollBar = new wxScrollBar(this, wxWINDOW_HSCROLL, wxPoint(0 , m_height-MAC_SCROLLBAR_SIZE ), 
+                       wxSize( m_width - adjust, MAC_SCROLLBAR_SIZE), wxHORIZONTAL);
+//             m_hScrollBar->PushEventHandler( this ) ;
+       }
+       
+       // because the create does not take into account the client area origin
+       MacRepositionScrollBars() ; // we might have a real position shift
 }
 
 }
 
-// Fits the panel around the items
-void wxWindow::Fit()
+void wxWindow::MacRepositionScrollBars()
 {
 {
-       int maxX = 0;
-       int maxY = 0;
-       wxNode *node = GetChildren().First();
-       while ( node )
+       bool hasBoth = ( m_hScrollBar && m_hScrollBar->IsShown()) && ( m_vScrollBar && m_vScrollBar->IsShown()) ;
+       int adjust = hasBoth ? MAC_SCROLLBAR_SIZE - 1 : 0 ;
+       
+       if ( m_vScrollBar )
        {
        {
-               wxWindow *win = (wxWindow *)node->Data();
-               int wx, wy, ww, wh;
-               win->GetPosition(&wx, &wy);
-               win->GetSize(&ww, &wh);
-               if ( wx + ww > maxX )
-                       maxX = wx + ww;
-               if ( wy + wh > maxY )
-                       maxY = wy + wh;
-
-               node = node->Next();
+               m_vScrollBar->SetSize( m_width-MAC_SCROLLBAR_SIZE, 0, MAC_SCROLLBAR_SIZE, m_height - adjust , wxSIZE_USE_EXISTING);
+       }
+       if ( m_hScrollBar )
+       {
+               m_hScrollBar->SetSize( 0 , m_height-MAC_SCROLLBAR_SIZE ,m_width - adjust, MAC_SCROLLBAR_SIZE, wxSIZE_USE_EXISTING);
        }
        }
-       SetClientSize(maxX + 5, maxY + 5);
 }
 
 }
 
-void wxWindow::SetValidator(const wxValidator& validator)
+void wxWindow::MacKeyDown( EventRecord *ev ) 
 {
 {
-       if ( m_windowValidator )
-               delete m_windowValidator;
-       m_windowValidator = validator.Clone();
+}
 
 
-       if ( m_windowValidator )
-               m_windowValidator->SetWindow(this) ;
+
+bool wxWindow::AcceptsFocus() const
+{
+    return MacCanFocus() && wxWindowBase::AcceptsFocus();
 }
 
 }
 
-void wxWindow::SetAcceleratorTable(const wxAcceleratorTable& accel)
+ControlHandle wxWindow::MacGetContainerForEmbedding() 
 {
 {
-    m_acceleratorTable = accel;
+       if ( m_macWindowData )
+               return m_macWindowData->m_macRootControl ;
+       else
+               return GetParent()->MacGetContainerForEmbedding() ;
 }
 
 }
 
-// Find a window by id or name
-wxWindow *wxWindow::FindWindow(long id)
+void wxWindow::MacSuperChangedPosition() 
 {
 {
-       if ( GetId() == id)
-               return this;
+       // only window-absolute structures have to be moved i.e. controls
 
        wxNode *node = GetChildren().First();
        while ( node )
        {
                wxWindow *child = (wxWindow *)node->Data();
 
        wxNode *node = GetChildren().First();
        while ( node )
        {
                wxWindow *child = (wxWindow *)node->Data();
-               wxWindow *found = child->FindWindow(id);
-               if ( found )
-                       return found;
+               child->MacSuperChangedPosition() ;
                node = node->Next();
        }
                node = node->Next();
        }
-       return NULL;
+}
+       
+bool wxWindow::MacSetupFocusPort(  ) 
+{
+       Point localOrigin ;
+       Rect clipRect ;
+       WindowRef window ;
+       wxWindow *rootwin ;
+       GrafPtr port ;
+       
+       MacGetPortParams( &localOrigin , &clipRect , &window , &rootwin) ;
+       return  MacSetPortFocusParams( localOrigin, clipRect, window , rootwin ) ; 
 }
 
 }
 
-wxWindow *wxWindow::FindWindow(const wxString& name)
+bool wxWindow::MacSetupFocusClientPort(  ) 
 {
 {
-       if ( GetName() == name)
-               return this;
+       Point localOrigin ;
+       Rect clipRect ;
+       WindowRef window ;
+       wxWindow *rootwin ;
+       GrafPtr port ;
+       
+       MacGetPortClientParams( &localOrigin , &clipRect , &window , &rootwin) ;
+       return  MacSetPortFocusParams( localOrigin, clipRect, window , rootwin ) ; 
+}
 
 
-       wxNode *node = GetChildren().First();
-       while ( node )
-       {
-               wxWindow *child = (wxWindow *)node->Data();
-               wxWindow *found = child->FindWindow(name);
-               if ( found )
-                       return found;
-               node = node->Next();
-       }
-       return NULL;
+bool wxWindow::MacSetupDrawingPort(  ) 
+{
+       Point localOrigin ;
+       Rect clipRect ;
+       WindowRef window ;
+       wxWindow *rootwin ;
+       GrafPtr port ;
+       
+       MacGetPortParams( &localOrigin , &clipRect , &window , &rootwin) ;
+       return  MacSetPortDrawingParams( localOrigin, clipRect, window , rootwin ) ; 
 }
 
 }
 
-void wxWindow::OnIdle(wxIdleEvent& event)
+bool wxWindow::MacSetupDrawingClientPort(  ) 
 {
 {
-/* TODO: you may need to do something like this
- * if your GUI doesn't generate enter/leave events
+       Point localOrigin ;
+       Rect clipRect ;
+       WindowRef window ;
+       wxWindow *rootwin ;
+       GrafPtr port ;
+       
+       MacGetPortClientParams( &localOrigin , &clipRect , &window , &rootwin) ;
+       return  MacSetPortDrawingParams( localOrigin, clipRect, window , rootwin ) ; 
+}
 
 
-    // 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();
+bool wxWindow::MacSetPortFocusParams( const Point & localOrigin, const Rect & clipRect, WindowRef window , wxWindow* win ) 
+{
+       if ( window == NULL )
+               return false ;
+               
+       GrafPtr currPort;
+       GrafPtr port ;
+
+       ::GetPort(&currPort);
+       port = UMAGetWindowPort( window) ;
+       if (currPort != port )
+                       ::SetPort(port);
+                               
+       ::SetOrigin(-localOrigin.h, -localOrigin.v);
+       return true;                    
 }
 
 }
 
-// Raise the window to the top of the Z order
-void wxWindow::Raise()
+bool wxWindow::MacSetPortDrawingParams( const Point & localOrigin, const Rect & clipRect, WindowRef window , wxWindow* win ) 
 {
 {
-    // TODO
+       if ( window == NULL )
+               return false ;
+               
+       GrafPtr currPort;
+       GrafPtr port ;
+       ::GetPort(&currPort);
+       port = UMAGetWindowPort( window) ;
+       if (currPort != port )
+                       ::SetPort(port);
+                               
+       ::SetOrigin(-localOrigin.h, -localOrigin.v);
+       ::ClipRect(&clipRect);
+
+       ::PenNormal() ;
+       ::RGBBackColor(& win->GetBackgroundColour().GetPixel() ) ;
+       ::RGBForeColor(& win->GetForegroundColour().GetPixel() ) ;
+       ::BackPat( &qd.white ) ;
+       ::UMASetThemeWindowBackground(  win->m_macWindowData->m_macWindow , win->m_macWindowData->m_macWindowBackgroundTheme ,  false ) ;
+       return true;                    
 }
 
 }
 
-// Lower the window to the bottom of the Z order
-void wxWindow::Lower()
+void wxWindow::MacGetPortParams(Point* localOrigin, Rect* clipRect, WindowRef *window  , wxWindow** rootwin) 
 {
 {
-    // TODO
+       if ( m_macWindowData )
+       {
+               localOrigin->h = 0;
+               localOrigin->v = 0;
+               clipRect->left = 0;
+               clipRect->top = 0;
+               clipRect->right = m_width;
+               clipRect->bottom = m_height;
+               *window = m_macWindowData->m_macWindow ;
+               *rootwin = this ;
+       }
+       else
+       {
+               wxASSERT( GetParent() != NULL ) ;
+               GetParent()->MacGetPortParams( localOrigin , clipRect , window, rootwin) ;
+               localOrigin->h += m_x;
+               localOrigin->v += m_y;
+               OffsetRect(clipRect, -m_x, -m_y);
+       
+               Rect myClip;
+               myClip.left = 0;
+               myClip.top = 0;
+               myClip.right = m_width;
+               myClip.bottom = m_height;
+               SectRect(clipRect, &myClip, clipRect);
+       }
 }
 
 }
 
-bool wxWindow::AcceptsFocus() const
+void wxWindow::MacGetPortClientParams(Point* localOrigin, Rect* clipRect, WindowRef *window , wxWindow** rootwin ) 
 {
 {
-  return IsShown() && IsEnabled();
+       int width , height ;
+       GetClientSize( &width , &height ) ;
+       
+       if ( m_macWindowData )
+       {
+               localOrigin->h = 0;
+               localOrigin->v = 0;
+               clipRect->left = 0;
+               clipRect->top = 0;
+               clipRect->right = m_width ;//width;
+               clipRect->bottom = m_height ;// height;
+               *window = m_macWindowData->m_macWindow ;
+               *rootwin = this ;
+       }
+       else
+       {
+               wxASSERT( GetParent() != NULL ) ;
+               
+               GetParent()->MacGetPortClientParams( localOrigin , clipRect , window, rootwin) ;
+
+               localOrigin->h += m_x;
+               localOrigin->v += m_y;
+               OffsetRect(clipRect, -m_x, -m_y);
+       
+               Rect myClip;
+               myClip.left = 0;
+               myClip.top = 0;
+               myClip.right = width;
+               myClip.bottom = height;
+               SectRect(clipRect, &myClip, clipRect);
+       }
 }
 
 }
 
-// Update region access
-wxRegion wxWindow::GetUpdateRegion() const
+wxMacFocusHelper::wxMacFocusHelper( wxWindow * theWindow ) 
 {
 {
-    return m_updateRegion;
+       m_ok = false ;
+       Point localOrigin ;
+       Rect clipRect ;
+       WindowRef window ;
+       wxWindow *rootwin ;
+       m_currentPort = NULL ;
+       GetPort( &m_formerPort ) ;
+       if ( theWindow )
+       {
+       
+               theWindow->MacGetPortParams( &localOrigin , &clipRect , &window , &rootwin) ;
+               m_currentPort = UMAGetWindowPort( window ) ;
+               theWindow->MacSetPortFocusParams( localOrigin, clipRect, window , rootwin ) ; 
+               m_ok = true ;
+       }
 }
 }
-
-bool wxWindow::IsExposed(int x, int y, int w, int h) const
+       
+wxMacFocusHelper::~wxMacFocusHelper() 
 {
 {
-    return (m_updateRegion.Contains(x, y, w, h) != wxOutRegion);
+       if ( m_ok )
+       {
+               SetOrigin( 0 , 0 ) ;
+       }
+       if ( m_formerPort != m_currentPort )
+               SetPort( m_formerPort ) ;
 }
 
 }
 
-bool wxWindow::IsExposed(const wxPoint& pt) const
+wxMacDrawingHelper::wxMacDrawingHelper( wxWindow * theWindow ) 
 {
 {
-    return (m_updateRegion.Contains(pt) != wxOutRegion);
+       m_ok = false ;
+       Point localOrigin ;
+       Rect clipRect ;
+       WindowRef window ;
+       wxWindow *rootwin ;
+       m_currentPort = NULL ;
+       
+       GetPort( &m_formerPort ) ;
+       if ( theWindow )
+       {
+               theWindow->MacGetPortParams( &localOrigin , &clipRect , &window , &rootwin) ;
+               m_currentPort = UMAGetWindowPort( window ) ;
+               if ( m_formerPort != m_currentPort )
+                       SetPort( m_currentPort ) ;
+               GetPenState( &m_savedPenState ) ;
+               theWindow->MacSetPortDrawingParams( localOrigin, clipRect, window , rootwin ) ; 
+               m_ok = true ;
+       }
 }
 }
-
-bool wxWindow::IsExposed(const wxRect& rect) const
+       
+wxMacDrawingHelper::~wxMacDrawingHelper() 
 {
 {
-    return (m_updateRegion.Contains(rect) != wxOutRegion);
+       if ( m_ok )
+       {
+               SetPenState( &m_savedPenState ) ;
+               SetOrigin( 0 , 0 ) ;
+               ClipRect( &m_currentPort->portRect ) ;
+       }
+               
+       if ( m_formerPort != m_currentPort )
+               SetPort( m_formerPort ) ;
 }
 
 }
 
-/*
- * Allocates control IDs
- */
+wxMacFocusClientHelper::wxMacFocusClientHelper( wxWindow * theWindow ) 
+{
+       m_ok = false ;
+       Point localOrigin ;
+       Rect clipRect ;
+       WindowRef window ;
+       wxWindow *rootwin ;
+       m_currentPort = NULL ;
+       
+       GetPort( &m_formerPort ) ;
 
 
-int wxWindow::NewControlId()
+       if ( theWindow )
+       {
+               theWindow->MacGetPortClientParams( &localOrigin , &clipRect , &window , &rootwin) ;
+               m_currentPort = UMAGetWindowPort( window ) ;
+               theWindow->MacSetPortFocusParams( localOrigin, clipRect, window , rootwin ) ; 
+               m_ok = true ;
+       }
+}
+       
+wxMacFocusClientHelper::~wxMacFocusClientHelper() 
 {
 {
-    static int s_controlId = 0;
-    s_controlId ++;
-    return s_controlId;
+       if ( m_ok )
+       {
+               SetOrigin( 0 , 0 ) ;
+       }
+       if ( m_formerPort != m_currentPort )
+               SetPort( m_formerPort ) ;
 }
 
 }
 
+wxMacDrawingClientHelper::wxMacDrawingClientHelper( wxWindow * theWindow ) 
+{
+       m_ok = false ;
+       Point localOrigin ;
+       Rect clipRect ;
+       WindowRef window ;
+       wxWindow *rootwin ;
+       m_currentPort = NULL ;
+       
+       GetPort( &m_formerPort ) ;
 
 
+       if ( theWindow )
+       {
+               theWindow->MacGetPortClientParams( &localOrigin , &clipRect , &window , &rootwin) ;
+               m_currentPort = UMAGetWindowPort( window ) ;
+               if ( m_formerPort != m_currentPort )
+                       SetPort( m_currentPort ) ;
+               GetPenState( &m_savedPenState ) ;
+               theWindow->MacSetPortDrawingParams( localOrigin, clipRect, window , rootwin ) ; 
+               m_ok = true ;
+       }
+}
+       
+wxMacDrawingClientHelper::~wxMacDrawingClientHelper() 
+{
+       if ( m_ok )
+       {
+               SetPenState( &m_savedPenState ) ;
+               SetOrigin( 0 , 0 ) ;
+               ClipRect( &m_currentPort->portRect ) ;
+       }
+               
+       if ( m_formerPort != m_currentPort )
+               SetPort( m_formerPort ) ;
+}
wxWidgets (Impactor)