X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e306597309a120f2ae91385c731a5cb2722c52aa..050c9e3c90c58b05d5b3f7384d1556ca9669f13e:/src/mac/carbon/window.cpp?ds=sidebyside

diff --git a/src/mac/carbon/window.cpp b/src/mac/carbon/window.cpp
index a54fd3331d..6c1095f8d3 100644
--- a/src/mac/carbon/window.cpp
+++ b/src/mac/carbon/window.cpp
@@ -1,6 +1,6 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        windows.cpp
-// Purpose:     wxWindow
+// Purpose:     wxWindowMac
 // Author:      AUTHOR
 // Modified by:
 // Created:     ??/??/98
@@ -15,22 +15,38 @@
 
 #include "wx/setup.h"
 #include "wx/menu.h"
+#include "wx/window.h"
 #include "wx/dc.h"
 #include "wx/dcclient.h"
-#include "wx/utils.h"
+#include "wx/utils.h" 
 #include "wx/app.h"
 #include "wx/panel.h"
 #include "wx/layout.h"
 #include "wx/dialog.h"
 #include "wx/listbox.h"
+#include "wx/scrolbar.h"
+#include "wx/statbox.h"
 #include "wx/button.h"
 #include "wx/settings.h"
 #include "wx/msgdlg.h"
 #include "wx/frame.h"
-
+#include "wx/notebook.h"
+#include "wx/tabctrl.h"
+#include "wx/tooltip.h"
+#include "wx/statusbr.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
@@ -38,219 +54,268 @@
 #include <string.h>
 
 extern wxList wxPendingDelete;
+wxWindowMac* gFocusWindow = NULL ;
+
+#ifdef __WXUNIVERSAL__
+    IMPLEMENT_ABSTRACT_CLASS(wxWindowMac, wxWindowBase)
+#else // __WXMAC__
+    IMPLEMENT_DYNAMIC_CLASS(wxWindow, wxWindowBase)
+#endif // __WXUNIVERSAL__/__WXMAC__
 
 #if !USE_SHARED_LIBRARY
-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)
+
+BEGIN_EVENT_TABLE(wxWindowMac, wxWindowBase)
+  EVT_ERASE_BACKGROUND(wxWindowMac::OnEraseBackground)
+  EVT_SYS_COLOUR_CHANGED(wxWindowMac::OnSysColourChanged)
+  EVT_INIT_DIALOG(wxWindowMac::OnInitDialog)
+  EVT_IDLE(wxWindowMac::OnIdle)
+  EVT_SET_FOCUS(wxWindowMac::OnSetFocus)
 END_EVENT_TABLE()
 
 #endif
 
 
-// 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
+// ===========================================================================
+
+// ---------------------------------------------------------------------------
+// wxWindowMac utility functions
+// ---------------------------------------------------------------------------
+
+// Find an item given the Macintosh Window Reference
+
+wxList *wxWinMacWindowList = NULL;
+wxWindowMac *wxFindWinFromMacWindow(WindowRef inWindowRef)
+{
+    wxNode *node = wxWinMacWindowList->Find((long)inWindowRef);
+    if (!node)
+        return NULL;
+    return (wxWindowMac *)node->Data();
+}
+
+void wxAssociateWinWithMacWindow(WindowRef inWindowRef, wxWindowMac *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(wxWindowMac *win)
+{
+    wxWinMacWindowList->DeleteObject(win);
+}
+
+// ----------------------------------------------------------------------------
+// constructors and such
+// ----------------------------------------------------------------------------
+
+WindowRef wxWindowMac::s_macWindowInUpdate = NULL;
+
+void wxWindowMac::Init()
+{
+    // generic
+    InitBase();
+
+    m_macEraseOnRedraw = true ;
+
+    // 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_macEraseOnRedraw = true ;
+
+	m_x = 0;
+	m_y = 0 ;	
+	m_width = 0 ;
+	m_height = 0 ;
+
+	m_hScrollBar = NULL ;
+	m_vScrollBar = NULL ;
 
 #if  wxUSE_DRAG_AND_DROP
-    m_pDropTarget = NULL;
+  m_pDropTarget = NULL;
 #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;
+wxWindowMac::~wxWindowMac()
+{
+    // deleting a window while it is shown invalidates the region
+    if ( IsShown() ) {
+        wxWindowMac* iter = this ;
+        while( iter ) {
+            if ( iter->m_macWindowData )
+            {
+                Refresh() ;
+                break ;
+            }
+            iter = iter->GetParent() ;
+            
+        }
     }
-    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();
 
-    // 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 )
+	{
+		wxToolTip::NotifyWindowDelete(m_macWindowData->m_macWindow) ;
+    	UMADisposeWindow( m_macWindowData->m_macWindow ) ;
+    	delete m_macWindowData ;
+    	wxRemoveMacWindowAssociation( this ) ;
+    }
 }
 
 // Constructor
-bool wxWindow::Create(wxWindow *parent, wxWindowID id,
+bool wxWindowMac::Create(wxWindowMac *parent, wxWindowID id,
            const wxPoint& pos,
            const wxSize& size,
            long style,
            const wxString& name)
 {
-    // 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 wxWindowMac 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;
 
-    if (parent) parent->AddChild(this);
-
-    m_returnCode = 0;
-
-    SetName(name);
-
-    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;
-
-    // TODO: create the window
+    parent->AddChild(this);
 
+  	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 ) ;
+#ifndef __WXUNIVERSAL__
+	if ( ! IsKindOf( CLASSINFO ( wxControl ) ) && ! IsKindOf( CLASSINFO( wxStatusBar ) ) )
+	{
+    	MacCreateScrollBars( style ) ;
+	}
+#endif
     return TRUE;
 }
 
-void wxWindow::SetFocus()
+void wxWindowMac::SetFocus()
 {
-    // TODO
+	if ( gFocusWindow == this )
+		return ;
+		
+	if ( AcceptsFocus() )
+	{
+		if (gFocusWindow )
+		{
+			#if wxUSE_CARET
+			    // Deal with caret
+			    if ( gFocusWindow->m_caret )
+			    {
+			          gFocusWindow->m_caret->OnKillFocus();
+			    }
+			#endif // wxUSE_CARET
+      #ifndef __WXUNIVERSAL__
+			wxControl* control = wxDynamicCast( gFocusWindow , wxControl ) ;
+			if ( control && control->GetMacControl() )
+			{
+				UMASetKeyboardFocus( gFocusWindow->GetMacRootWindow() , control->GetMacControl()  , kControlFocusNoPart ) ;
+				control->MacRedrawControl() ;
+			}
+			#endif
+	    	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
+            wxChildFocusEvent eventFocus(this);
+            (void)GetEventHandler()->ProcessEvent(eventFocus);
+
+      #ifndef __WXUNIVERSAL__
+			wxControl* control = wxDynamicCast( gFocusWindow , wxControl ) ;
+			if ( control && control->GetMacControl() )
+			{
+				UMASetKeyboardFocus( gFocusWindow->GetMacRootWindow() , control->GetMacControl()  , kControlEditTextPart ) ;
+			}
+      #endif
+	    	wxFocusEvent event(wxEVT_SET_FOCUS, m_windowId);
+	    	event.SetEventObject(this);
+			GetEventHandler()->ProcessEvent(event) ;
+		}
+	}
 }
 
-void wxWindow::Enable(bool enable)
+bool wxWindowMac::Enable(bool enable)
 {
-    // TODO
-}
+    if ( !wxWindowBase::Enable(enable) )
+        return FALSE;
 
-void wxWindow::CaptureMouse()
-{
-    // TODO
+    wxWindowList::Node *node = GetChildren().GetFirst();
+    while ( node )
+    {
+        wxWindowMac *child = node->GetData();
+        child->Enable(enable);
+
+        node = node->GetNext();
+    }
+
+    return TRUE;
 }
 
-void wxWindow::ReleaseMouse()
+void wxWindowMac::CaptureMouse()
 {
-    // TODO
+    wxTheApp->s_captureWindow = this ;
 }
 
-// Push/pop event handler (i.e. allow a chain of event handlers
-// be searched)
-void wxWindow::PushEventHandler(wxEvtHandler *handler)
+wxWindow* wxWindowBase::GetCapture()
 {
-	handler->SetNextHandler(GetEventHandler());
-	SetEventHandler(handler);
+    return wxTheApp->s_captureWindow ;
 }
 
-wxEvtHandler *wxWindow::PopEventHandler(bool deleteHandler)
+void wxWindowMac::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
 
-void wxWindow::SetDropTarget(wxDropTarget *pDropTarget)
+void wxWindowMac::SetDropTarget(wxDropTarget *pDropTarget)
 {
   if ( m_pDropTarget != 0 ) {
     delete m_pDropTarget;
@@ -266,1030 +331,2128 @@ void wxWindow::SetDropTarget(wxDropTarget *pDropTarget)
 #endif
 
 // Old style file-manager drag&drop
-void wxWindow::DragAcceptFiles(bool accept)
+void wxWindowMac::DragAcceptFiles(bool accept)
 {
     // TODO
 }
 
 // Get total size
-void wxWindow::GetSize(int *x, int *y) const
+void wxWindowMac::DoGetSize(int *x, int *y) const
 {
-    // TODO
+     if(x)   *x = m_width ;
+     if(y)   *y = m_height ;
 }
 
-void wxWindow::GetPosition(int *x, int *y) const
+void wxWindowMac::DoGetPosition(int *x, int *y) const
 {
-    // TODO
+    int xx,yy;
+ 
+    xx = m_x ;
+    yy = m_y ;
+    if (GetParent())
+    {
+        wxPoint pt(GetParent()->GetClientAreaOrigin());
+        xx -= pt.x;
+        yy -= pt.y;
+    }
+    if(x)   *x = xx;
+    if(y)   *y = yy;
 }
 
-void wxWindow::ScreenToClient(int *x, int *y) const
+#if wxUSE_MENUS
+bool wxWindowMac::DoPopupMenu(wxMenu *menu, int x, int y)
 {
-    // TODO
-}
+	menu->SetInvokingWindow(this);
+    menu->UpdateUI();
+	ClientToScreen( &x , &y ) ;
 
-void wxWindow::ClientToScreen(int *x, int *y) const
-{
-    // TODO
+	::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;
 }
+#endif
 
-void wxWindow::SetCursor(const wxCursor& cursor)
+void wxWindowMac::DoScreenToClient(int *x, int *y) const
 {
-  m_windowCursor = cursor;
-  if (m_windowCursor.Ok())
-  {
-    // TODO
-  }
-}
+	WindowRef window = GetMacRootWindow() ;
 
+	Point		localwhere = {0,0} ;
 
-// Get size *available for subwindows* i.e. excluding menu bar etc.
-void wxWindow::GetClientSize(int *x, int *y) const
-{
-    // TODO
+    if(x)   localwhere.h = * x ;
+    if(y)   localwhere.v = * y ;
+
+	GrafPtr		port ;	
+	::GetPort( &port ) ;
+	::SetPort( UMAGetWindowPort( window ) ) ;
+	::GlobalToLocal( &localwhere ) ;
+	::SetPort( port ) ;
+
+    if(x)   *x = localwhere.h ;
+    if(y)   *y = localwhere.v ;
+	
+	MacRootWindowToClient( x , y ) ;
 }
 
-void wxWindow::SetSize(int x, int y, int width, int height, int sizeFlags)
+void wxWindowMac::DoClientToScreen(int *x, int *y) const
 {
-    // TODO
+	WindowRef window = GetMacRootWindow() ;
+	
+	MacClientToRootWindow( x , y ) ;
+	
+	Point		localwhere = { 0,0 };
+    if(x)   localwhere.h = * x ;
+    if(y)   localwhere.v = * y ;
+	
+	GrafPtr		port ;	
+	::GetPort( &port ) ;
+	::SetPort( UMAGetWindowPort( window ) ) ;
+	::SetOrigin( 0 , 0 ) ;
+	::LocalToGlobal( &localwhere ) ;
+	::SetPort( port ) ;
+    if(x)   *x = localwhere.h ;
+    if(y)   *y = localwhere.v ;
 }
 
-void wxWindow::SetClientSize(int width, int height)
+void wxWindowMac::MacClientToRootWindow( int *x , int *y ) const
 {
-    // TODO
+ 	if ( m_macWindowData == NULL)
+	{
+        if(x)   *x += m_x + MacGetLeftBorderSize();
+        if(y)   *y += m_y + MacGetTopBorderSize();
+		GetParent()->MacClientToRootWindow( x , y ) ;
+	}
 }
 
-// For implementation purposes - sometimes decorations make the client area
-// smaller
-wxPoint wxWindow::GetClientAreaOrigin() const
+void wxWindowMac::MacRootWindowToClient( int *x , int *y ) const
 {
-    return wxPoint(0, 0);
+	if ( m_macWindowData == NULL)
+	{
+       if(x)   *x -= m_x + MacGetLeftBorderSize();
+      if(y)   *y -= m_y + MacGetTopBorderSize();
+		GetParent()->MacRootWindowToClient( x , y ) ;
+	}
 }
 
-// Makes an adjustment to the window position (for example, a frame that has
-// a toolbar that it manages itself).
-void wxWindow::AdjustForParentClientOrigin(int& x, int& y, int sizeFlags)
+bool wxWindowMac::SetCursor(const wxCursor& cursor)
 {
-    if (((sizeFlags & wxSIZE_NO_ADJUSTMENTS) == 0) && GetParent())
+    if (m_cursor == cursor)
+       return FALSE;
+
+    if (wxNullCursor == cursor)
     {
-        wxPoint pt(GetParent()->GetClientAreaOrigin());
-        x += pt.x; y += pt.y;
+       if ( ! wxWindowBase::SetCursor( *wxSTANDARD_CURSOR ) )
+        return FALSE ;
+    }
+    else
+    {
+       if ( ! wxWindowBase::SetCursor( cursor ) )
+        return FALSE ;
     }
-}
 
-bool wxWindow::Show(bool show)
-{
-    // TODO
-    return FALSE;
-}
+  wxASSERT_MSG( m_cursor.Ok(),
+                  wxT("cursor must be valid after call to the base version"));
 
-bool wxWindow::IsShown() const
-{
-    // TODO
-    return FALSE;
-}
+  Point pt ;
+  wxWindowMac *mouseWin ;
+  GetMouse( &pt ) ;
+  
+  // Change the cursor NOW if we're within the correct window
 
-int wxWindow::GetCharHeight() const
-{
-    // TODO
-    return 0;
-}
+  if ( MacGetWindowFromPoint( wxPoint( pt.h , pt.v ) , &mouseWin ) )
+  {
+  	if ( mouseWin == this && !wxIsBusy() )
+  	{
+		m_cursor.MacInstall() ;
+  	}
+  }
 
-int wxWindow::GetCharWidth() const
-{
-    // TODO
-    return 0;
+  return TRUE ;
 }
 
-void wxWindow::GetTextExtent(const wxString& string, int *x, int *y,
-                           int *descent, int *externalLeading, const wxFont *theFont, bool) const
+
+// Get size *available for subwindows* i.e. excluding menu bar etc.
+void wxWindowMac::DoGetClientSize(int *x, int *y) const
 {
-  wxFont *fontToUse = (wxFont *)theFont;
-  if (!fontToUse)
-    fontToUse = (wxFont *) & m_windowFont;
+    int ww, hh;
+    ww = m_width ;
+    hh = m_height ;
 
-    // TODO
+	ww -= MacGetLeftBorderSize(  )  + MacGetRightBorderSize(  ) ;
+	hh -= MacGetTopBorderSize(  ) + MacGetBottomBorderSize( );
+	
+  if ( (m_vScrollBar && m_vScrollBar->IsShown()) || (m_hScrollBar  && m_hScrollBar->IsShown()) )
+  {
+	int x1 = 0 ; 
+	int y1 = 0 ;
+	int w = m_width ;
+	int h = m_height ;
+	
+	MacClientToRootWindow( &x1 , &y1 ) ;
+	MacClientToRootWindow( &w , &h ) ;
+	
+	wxWindowMac *iter = (wxWindowMac*)this ;
+	
+	int totW = 10000 , totH = 10000;
+	while( iter )
+	{
+		if ( iter->m_macWindowData )
+		{
+			totW = iter->m_width ;
+			totH = iter->m_height ;
+			break ;
+		}
+
+		iter = iter->GetParent() ;
+	} 
+	
+  	if (m_hScrollBar  && m_hScrollBar->IsShown() )
+  	{
+  		hh -= MAC_SCROLLBAR_SIZE;
+		if ( h-y1 >= totH )
+		{
+			hh += 1 ;
+		}
+    }
+  	if (m_vScrollBar  && m_vScrollBar->IsShown() )
+  	{
+    	ww -= MAC_SCROLLBAR_SIZE;
+		if ( w-x1 >= totW )
+		{
+    		ww += 1 ;
+    	}
+  	}
+  }
+  if(x)   *x = ww;
+  if(y)   *y = hh;
 }
 
-void wxWindow::Refresh(bool eraseBack, const wxRect *rect)
+
+// ----------------------------------------------------------------------------
+// tooltips
+// ----------------------------------------------------------------------------
+
+#if wxUSE_TOOLTIPS
+
+void wxWindowMac::DoSetToolTip(wxToolTip *tooltip)
 {
-    // TODO
+    wxWindowBase::DoSetToolTip(tooltip);
+
+	if ( m_tooltip )
+		m_tooltip->SetWindow(this);
 }
 
-// Responds to colour changes: passes event on to children.
-void wxWindow::OnSysColourChanged(wxSysColourChangedEvent& event)
+#endif // wxUSE_TOOLTIPS
+
+void wxWindowMac::DoMoveWindow(int x, int y, int width, int height)
 {
-    wxNode *node = GetChildren().First();
-    while ( node )
+	int former_x = m_x ;
+	int former_y = m_y ;
+	int former_w = m_width ;
+	int former_h = m_height ;
+	
+  int actualWidth = width;
+  int actualHeight = height;
+  int actualX = x;
+  int actualY = y;
+  
+    if ((m_minWidth != -1) && (actualWidth < m_minWidth)) 
+    	actualWidth = m_minWidth;
+    if ((m_minHeight != -1) && (actualHeight < m_minHeight)) 
+    	actualHeight = m_minHeight;
+    if ((m_maxWidth != -1) && (actualWidth > m_maxWidth)) 
+    	actualWidth = m_maxWidth;
+    if ((m_maxHeight != -1) && (actualHeight > m_maxHeight)) 
+    	actualHeight = m_maxHeight;
+
+	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
+			wxMacDrawingHelper focus( this ) ;
+			if ( focus.Ok() )
+			{
+		  		Rect clientrect = { 0 , 0 , m_height , m_width } ;
+				// ClipRect( &clientrect ) ;
+		    	InvalWindowRect( GetMacRootWindow() , &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 the new area
+			// we have erased the old one	
+			
+			if ( IsKindOf( CLASSINFO( wxFrame ) ) )
+			{
+				wxFrame* frame = (wxFrame*) this ;
+			  	frame->PositionStatusBar();
+  				frame->PositionToolBar();
+			}
+			if ( doMove )
+				wxWindowMac::MacTopLevelWindowChangedPosition() ; // like this only children will be notified
+		}
+		else
+		{
+			// erase new position
+			
+			{
+				wxMacDrawingHelper focus( this ) ;
+				if ( focus.Ok() )
+				{
+			  		Rect clientrect = { 0 , 0 , m_height , m_width } ;
+  					// ClipRect( &clientrect ) ;
+			    	InvalWindowRect( GetMacRootWindow() , &clientrect ) ;
+				}
+			}
+			
+			if ( doMove )
+				wxWindowMac::MacSuperChangedPosition() ; // like this only children will be notified
+		}
+		MacRepositionScrollBars() ;
+		if ( doMove )
+		{
+	        wxPoint point(m_x, m_y);
+    		wxMoveEvent event(point, m_windowId);
+    		event.SetEventObject(this);
+    		GetEventHandler()->ProcessEvent(event) ;
+    	}
+    	if ( doResize )
+    	{
+	         MacRepositionScrollBars() ;
+	         wxSize size(m_width, m_height);
+	         wxSizeEvent event(size, m_windowId);
+	         event.SetEventObject(this);
+	         GetEventHandler()->ProcessEvent(event);
+    	}
+	}
+	
+}
+
+// set the size of the window: if the dimensions are positive, just use them,
+// but if any of them is equal to -1, it means that we must find the value for
+// it ourselves (unless sizeFlags contains wxSIZE_ALLOW_MINUS_ONE flag, in
+// which case -1 is a valid value for x and y)
+//
+// If sizeFlags contains wxSIZE_AUTO_WIDTH/HEIGHT flags (default), we calculate
+// the width/height to best suit our contents, otherwise we reuse the current
+// width/height
+void wxWindowMac::DoSetSize(int x, int y, int width, int height, int sizeFlags)
+{
+    // get the current size and position...
+    int currentX, currentY;
+    GetPosition(&currentX, &currentY);
+    int currentW,currentH;
+    GetSize(&currentW, &currentH);
+
+    // ... and don't do anything (avoiding flicker) if it's already ok
+    if ( x == currentX && y == currentY &&
+         width == currentW && height == currentH )
     {
-        // Only propagate to non-top-level windows
-        wxWindow *win = (wxWindow *)node->Data();
-        if ( win->GetParent() )
+		MacRepositionScrollBars() ; // we might have a real position shift
+        return;
+    }
+
+    if ( x == -1 && !(sizeFlags & wxSIZE_ALLOW_MINUS_ONE) )
+        x = currentX;
+    if ( y == -1 && !(sizeFlags & wxSIZE_ALLOW_MINUS_ONE) )
+        y = currentY;
+
+    AdjustForParentClientOrigin(x, y, sizeFlags);
+
+    wxSize size(-1, -1);
+    if ( width == -1 )
+    {
+        if ( sizeFlags & wxSIZE_AUTO_WIDTH )
         {
-            wxSysColourChangedEvent event2;
-            event.m_eventObject = win;
-            win->GetEventHandler()->ProcessEvent(event2);
+            size = DoGetBestSize();
+            width = size.x;
+        }
+        else
+        {
+            // just take the current one
+            width = currentW;
         }
+    }
 
-        node = node->Next();
+    if ( height == -1 )
+    {
+        if ( sizeFlags & wxSIZE_AUTO_HEIGHT )
+        {
+            if ( size.x == -1 )
+            {
+                size = DoGetBestSize();
+            }
+            //else: already called DoGetBestSize() above
+
+            height = size.y;
+        }
+        else
+        {
+            // just take the current one
+            height = currentH;
+        }
     }
-}
 
-// 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;
+    DoMoveWindow(x, y, width, height);
+
 }
+// For implementation purposes - sometimes decorations make the client area
+// smaller
 
-void wxWindow::InitDialog()
+wxPoint wxWindowMac::GetClientAreaOrigin() const
 {
-  wxInitDialogEvent event(GetId());
-  event.SetEventObject( this );
-  GetEventHandler()->ProcessEvent(event);
+    return wxPoint(MacGetLeftBorderSize(  ) , MacGetTopBorderSize(  ) );
 }
 
-// Default init dialog behaviour is to transfer data to window
-void wxWindow::OnInitDialog(wxInitDialogEvent& event)
+// Makes an adjustment to the window position (for example, a frame that has
+// a toolbar that it manages itself).
+void wxWindowMac::AdjustForParentClientOrigin(int& x, int& y, int sizeFlags)
 {
-  TransferDataToWindow();
+	if( !m_macWindowData )
+	{
+    if (((sizeFlags & wxSIZE_NO_ADJUSTMENTS) == 0) && GetParent())
+    {
+        wxPoint pt(GetParent()->GetClientAreaOrigin());
+        x += pt.x; y += pt.y;
+    }
+   }
 }
 
-// Caret manipulation
-void wxWindow::CreateCaret(int w, int h)
+void wxWindowMac::SetTitle(const wxString& title)
 {
-  m_caretWidth = w;
-  m_caretHeight = h;
-  m_caretEnabled = TRUE;
+	m_label = title ;
+	
+	wxString label ;
+	
+	if( wxApp::s_macDefaultEncodingIsPC )
+		label = wxMacMakeMacStringFromPC( title ) ;
+	else
+		label = title ;
+
+	if ( m_macWindowData )
+    	UMASetWTitleC( m_macWindowData->m_macWindow , label ) ;
 }
 
-void wxWindow::CreateCaret(const wxBitmap *WXUNUSED(bitmap))
+wxString wxWindowMac::GetTitle() const
 {
-    // TODO
+	return m_label ;
 }
 
-void wxWindow::ShowCaret(bool show)
+bool wxWindowMac::Show(bool show)
 {
-    // TODO
+    if ( !wxWindowBase::Show(show) )
+        return FALSE;
+
+	if ( m_macWindowData )
+	{
+	  if (show)
+	  {
+	  	::ShowWindow( m_macWindowData->m_macWindow ) ;
+	  	::SelectWindow( m_macWindowData->m_macWindow ) ;
+		// no need to generate events here, they will get them triggered by macos
+		// actually they should be , but apparently they are not
+	    wxSize size(m_width, m_height);
+	    wxSizeEvent event(size, m_windowId);
+	    event.SetEventObject(this);
+	    GetEventHandler()->ProcessEvent(event);
+	  }
+	  else
+	  {
+	  	::HideWindow( m_macWindowData->m_macWindow ) ;
+	  }
+	}
+	MacSuperShown( show ) ;
+	if ( !show )
+	{
+	    WindowRef window = GetMacRootWindow() ;
+	    wxWindowMac* win = wxFindWinFromMacWindow( window ) ;
+	    if ( win && !win->m_isBeingDeleted )
+   	        Refresh() ;	
+	}
+	else
+	{
+    	Refresh() ;	
+	}
+
+    return TRUE;
 }
 
-void wxWindow::DestroyCaret()
+void wxWindowMac::MacSuperShown( bool show ) 
 {
-    // TODO
-    m_caretEnabled = FALSE;
+	wxNode *node = GetChildren().First();
+	while ( node )
+	{
+		wxWindowMac *child = (wxWindowMac *)node->Data();
+		if ( child->m_isShown )
+			child->MacSuperShown( show ) ;
+		node = node->Next();
+	}
 }
 
-void wxWindow::SetCaretPos(int x, int y)
+bool wxWindowMac::MacIsReallyShown() const 
 {
-    // TODO
+	if ( m_isShown && (m_parent != NULL) ) {
+		return m_parent->MacIsReallyShown();
+	}
+	return m_isShown;
+/*	
+	bool status = m_isShown ;
+	wxWindowMac * win = this ;
+	while ( status && win->m_parent != NULL )
+	{
+		win = win->m_parent ;
+		status = win->m_isShown ;
+	}
+	return status ;
+*/
 }
 
-void wxWindow::GetCaretPos(int *x, int *y) const
+int wxWindowMac::GetCharHeight() const
 {
-    // TODO
+	wxClientDC dc ( (wxWindowMac*)this ) ;
+	return dc.GetCharHeight() ;
 }
 
-wxWindow *wxGetActiveWindow()
+int wxWindowMac::GetCharWidth() const
 {
-    // TODO
-    return NULL;
+	wxClientDC dc ( (wxWindowMac*)this ) ;
+	return dc.GetCharWidth() ;
 }
 
-void wxWindow::SetSizeHints(int minW, int minH, int maxW, int maxH, int WXUNUSED(incW), int WXUNUSED(incH))
+void wxWindowMac::GetTextExtent(const wxString& string, int *x, int *y,
+                           int *descent, int *externalLeading, const wxFont *theFont ) const
 {
-  m_minSizeX = minW;
-  m_minSizeY = minH;
-  m_maxSizeX = maxW;
-  m_maxSizeY = maxH;
+    const wxFont *fontToUse = theFont;
+    if ( !fontToUse )
+        fontToUse = &m_font;
+        
+    wxClientDC dc( (wxWindowMac*) this ) ;
+    long lx,ly,ld,le ;
+    dc.GetTextExtent( string , &lx , &ly , &ld, &le, (wxFont *)fontToUse ) ;
+    if ( externalLeading )
+    	*externalLeading = le ;
+    if ( descent )
+    	*descent = ld ;
+    if ( x )
+    	*x = lx ;
+    if ( y )
+    	*y = ly ;
 }
 
-void wxWindow::Centre(int direction)
+void wxWindowMac::MacEraseBackground( Rect *rect )
 {
-  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);
+/*
+	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
+		
+			wxWindowMac* 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 ) ))
+					{
+						UMAApplyThemeBackground(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()) ;
+	}
 
-  new_x = -1;
-  new_y = -1;
+	EraseRect( rect ) ;	
+	
+	for (wxNode *node = GetChildren().First(); node; node = node->Next())
+	{
+		wxWindowMac *child = (wxWindowMac*)node->Data();
+		
+		Rect clientrect = { child->m_x , child->m_y , child->m_x +child->m_width , child->m_y + child->m_height } ;
+		SectRect( &clientrect , rect , &clientrect ) ;    	
 
-  if (direction & wxHORIZONTAL)
-    new_x = (int)((panel_width - width)/2);
+		OffsetRect( &clientrect , -child->m_x , -child->m_y ) ;
+		if ( child->GetMacRootWindow() == window && child->IsShown() )
+		{
+			wxMacDrawingClientHelper focus( this ) ;
+			if ( focus.Ok() )
+			{
+				child->MacEraseBackground( &clientrect ) ;
+			}
+		}
+	}
+*/
+}
 
-  if (direction & wxVERTICAL)
-    new_y = (int)((panel_height - height)/2);
+void wxWindowMac::Refresh(bool eraseBack, const wxRect *rect)
+{
+//    if ( !IsShown() )
+//        return ;
+        
+	wxMacDrawingClientHelper focus( this ) ;
+	if ( focus.Ok() )
+	{
+  	    wxPoint client ;
+	    client = GetClientAreaOrigin( ) ;
+	  	Rect clientrect = { -client.y , -client.x , m_height - client.y , m_width - client.x} ;
+  		// ClipRect( &clientrect ) ;
+
+    	if ( rect )
+    	{
+    		Rect r = { rect->y , rect->x , rect->y + rect->height , rect->x + rect->width } ;
+			SectRect( &clientrect , &r , &clientrect ) ;    	
+    	}
+    	InvalWindowRect( GetMacRootWindow() , &clientrect ) ;
+	}
+	if ( !eraseBack )
+		m_macEraseOnRedraw = false ;
+	else
+		m_macEraseOnRedraw = true ;
+}
 
-  SetSize(new_x, new_y, -1, -1);
+// Responds to colour changes: passes event on to children.
+void wxWindowMac::OnSysColourChanged(wxSysColourChangedEvent& event)
+{
+    wxNode *node = GetChildren().First();
+    while ( node )
+    {
+        // Only propagate to non-top-level windows
+        wxWindowMac *win = (wxWindowMac *)node->Data();
+        if ( win->GetParent() )
+        {
+            wxSysColourChangedEvent event2;
+            event.m_eventObject = win;
+            win->GetEventHandler()->ProcessEvent(event2);
+        }
 
+        node = node->Next();
+    }
 }
 
-// Coordinates relative to the window
-void wxWindow::WarpPointer (int x_pos, int y_pos)
+#if wxUSE_CARET && WXWIN_COMPATIBILITY
+// ---------------------------------------------------------------------------
+// Caret manipulation
+// ---------------------------------------------------------------------------
+
+void wxWindowMac::CreateCaret(int w, int h)
 {
-    // TODO
+    SetCaret(new wxCaret(this, w, h));
 }
 
-void wxWindow::OnEraseBackground(wxEraseEvent& event)
+void wxWindowMac::CreateCaret(const wxBitmap *WXUNUSED(bitmap))
 {
-    // TODO
-    Default();
+    wxFAIL_MSG("not implemented");
 }
 
-int wxWindow::GetScrollPos(int orient) const
+void wxWindowMac::ShowCaret(bool show)
 {
-    // TODO
-    return 0;
+    wxCHECK_RET( m_caret, "no caret to show" );
+
+    m_caret->Show(show);
 }
 
-// This now returns the whole range, not just the number
-// of positions that we can scroll.
-int wxWindow::GetScrollRange(int orient) const
+void wxWindowMac::DestroyCaret()
 {
-    // TODO
-    return 0;
+    SetCaret(NULL);
 }
 
-int wxWindow::GetScrollThumb(int orient) const
+void wxWindowMac::SetCaretPos(int x, int y)
 {
-    // TODO
-    return 0;
+    wxCHECK_RET( m_caret, "no caret to move" );
+
+    m_caret->Move(x, y);
 }
 
-void wxWindow::SetScrollPos(int orient, int pos, bool refresh)
+void wxWindowMac::GetCaretPos(int *x, int *y) const
 {
-    // TODO
-    return;
+    wxCHECK_RET( m_caret, "no caret to get position of" );
+
+    m_caret->GetPosition(x, y);
 }
+#endif // wxUSE_CARET
 
-// New function that will replace some of the above.
-void wxWindow::SetScrollbar(int orient, int pos, int thumbVisible,
-    int range, bool refresh)
+wxWindowMac *wxGetActiveWindow()
 {
-    // TODO
+    // actually this is a windows-only concept
+    return NULL;
 }
 
-// Does a physical scroll
-void wxWindow::ScrollWindow(int dx, int dy, const wxRect *rect)
+// Coordinates relative to the window
+void wxWindowMac::WarpPointer (int x_pos, int y_pos)
 {
-    // TODO
-    return;
+    // We really dont move the mouse programmatically under mac
 }
 
-void wxWindow::SetFont(const wxFont& font)
+void wxWindowMac::OnEraseBackground(wxEraseEvent& event)
 {
-    m_windowFont = font;
-
-    if (!m_windowFont.Ok())
-	    return;
-    // TODO
+    // TODO : probably we would adopt the EraseEvent structure
 }
 
-void wxWindow::OnChar(wxKeyEvent& event)
+int wxWindowMac::GetScrollPos(int orient) const
 {
-    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 ( orient == wxHORIZONTAL )
+		{
+			if ( m_hScrollBar )
+				return m_hScrollBar->GetThumbPosition() ;
+		}
+		else
+		{
+			if ( m_vScrollBar )
+				return m_vScrollBar->GetThumbPosition() ;
+		}
+    return 0;
 }
 
-void wxWindow::OnPaint(wxPaintEvent& event)
+// This now returns the whole range, not just the number
+// of positions that we can scroll.
+int wxWindowMac::GetScrollRange(int orient) const
 {
-	Default();
+		if ( orient == wxHORIZONTAL )
+		{
+			if ( m_hScrollBar )
+				return m_hScrollBar->GetRange() ;
+		}
+		else
+		{
+			if ( m_vScrollBar )
+				return m_vScrollBar->GetRange() ;
+		}
+    return 0;
 }
 
-bool wxWindow::IsEnabled() const
+int wxWindowMac::GetScrollThumb(int orient) const
 {
-    // TODO
-    return FALSE;
+		if ( orient == wxHORIZONTAL )
+		{
+			if ( m_hScrollBar )
+				return m_hScrollBar->GetThumbSize() ;
+		}
+		else
+		{
+			if ( m_vScrollBar )
+				return m_vScrollBar->GetThumbSize() ;
+		}
+    return 0;
 }
 
-// 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()
+void wxWindowMac::SetScrollPos(int orient, int pos, bool refresh)
 {
-	wxNode *node = GetChildren().First();
-	while ( node )
-	{
-		wxWindow *child = (wxWindow *)node->Data();
-		if ( child->GetValidator() &&
-		     !child->GetValidator()->TransferToWindow() )
+		if ( orient == wxHORIZONTAL )
 		{
-			wxMessageBox("Application Error", "Could not transfer data to window", wxOK|wxICON_EXCLAMATION);
-			return FALSE;
+			if ( m_hScrollBar )
+				m_hScrollBar->SetThumbPosition( pos ) ;
+		}
+		else
+		{
+			if ( m_vScrollBar )
+				m_vScrollBar->SetThumbPosition( pos ) ;
 		}
-
-		node = node->Next();
-	}
-	return TRUE;
 }
 
-// Transfer values from controls. If returns FALSE,
-// validation failed: don't quit
-bool wxWindow::TransferDataFromWindow()
+void  wxWindowMac::MacCreateRealWindow( const wxString& title,
+           const wxPoint& pos,
+           const wxSize& size,
+           long style,
+           const wxString& name ) 
 {
-	wxNode *node = GetChildren().First();
-	while ( node )
+  SetName(name);
+  m_windowStyle = style;
+  m_isShown = FALSE;
+
+  // create frame.
+
+	Rect theBoundsRect;
+
+  m_x = (int)pos.x;
+  m_y = (int)pos.y;
+  if ( m_y < 50 )
+  	m_y = 50 ;
+  if ( m_x < 20 )
+  	m_x = 20 ;
+  	
+  m_width = size.x;
+	if (m_width == -1) 
+		m_width = 20;
+  m_height = size.y;
+	if (m_height == -1) 
+		m_height = 20;
+
+	m_macWindowData = new MacWindowData() ;
+
+	::SetRect(&theBoundsRect, m_x, m_y , m_x + m_width, m_y + m_height);
+
+	// translate the window attributes in the appropriate window class and attributes
+
+	WindowClass wclass = 0;
+	WindowAttributes attr = kWindowNoAttributes ;
+	
+	if ( HasFlag(wxTINY_CAPTION_HORIZ) ||  HasFlag(wxTINY_CAPTION_VERT) )
 	{
-		wxWindow *child = (wxWindow *)node->Data();
-		if ( child->GetValidator() && !child->GetValidator()->TransferFromWindow() )
+		wclass = kFloatingWindowClass ;
+		if ( HasFlag(wxTINY_CAPTION_VERT) )
 		{
-			return FALSE;
+			attr |= kWindowSideTitlebarAttribute ;
 		}
-
-		node = node->Next();
 	}
-	return TRUE;
-}
-
-bool wxWindow::Validate()
-{
-	wxNode *node = GetChildren().First();
-	while ( node )
+	else if ( HasFlag( wxCAPTION ) )
 	{
-		wxWindow *child = (wxWindow *)node->Data();
-		if ( child->GetValidator() && /* child->GetValidator()->Ok() && */ !child->GetValidator()->Validate(this) )
+		if ( HasFlag( wxDIALOG_MODAL ) )
 		{
-			return FALSE;
+			wclass = kMovableModalWindowClass ;
+		}
+		else 
+		{
+			wclass = kDocumentWindowClass ;
 		}
-
-		node = node->Next();
 	}
-	return TRUE;
+	else
+	{
+		wclass = kModalWindowClass ;
+	}
+	
+	if ( HasFlag( wxMINIMIZE_BOX ) || HasFlag( wxMAXIMIZE_BOX ) )
+	{
+		attr |= kWindowFullZoomAttribute ;
+		attr |= kWindowCollapseBoxAttribute ;
+	}
+	if ( HasFlag( wxRESIZE_BORDER ) )
+	{
+		attr |= kWindowResizableAttribute ;
+	}
+	if ( HasFlag( wxSYSTEM_MENU ) )
+	{
+		attr |= kWindowCloseBoxAttribute ;
+	}
+	
+	::CreateNewWindow( wclass , attr , &theBoundsRect , &m_macWindowData->m_macWindow ) ;
+	wxAssociateWinWithMacWindow( m_macWindowData->m_macWindow , this ) ;
+	wxString label ;
+	if( wxApp::s_macDefaultEncodingIsPC )
+		label = wxMacMakeMacStringFromPC( title ) ;
+	else
+		label = title ;
+	UMASetWTitleC( m_macWindowData->m_macWindow , label ) ;
+	::CreateRootControl( m_macWindowData->m_macWindow , &m_macWindowData->m_macRootControl ) ;
+
+	m_macWindowData->m_macFocus = NULL ;
+	m_macWindowData->m_macHasReceivedFirstActivate = true ;
 }
 
-// Get the window with the focus
-wxWindow *wxWindow::FindFocus()
+void wxWindowMac::MacPaint( wxPaintEvent &event ) 
 {
-    // TODO
-    return NULL;
 }
 
-void wxWindow::AddChild(wxWindow *child)
+void wxWindowMac::MacPaintBorders( ) 
 {
-    GetChildren().Append(child);
-    child->m_windowParent = this;
+	if( m_macWindowData )
+		return ;
+		
+	RGBColor white = { 0xFFFF, 0xFFFF , 0xFFFF } ;
+	RGBColor black = { 0x0000, 0x0000 , 0x0000 } ;
+	RGBColor face = { 0xDDDD, 0xDDDD , 0xDDDD } ;
+	RGBColor shadow = { 0x4444, 0x4444 , 0x4444 } ;
+	PenNormal() ;
+
+    if (HasFlag(wxRAISED_BORDER) || HasFlag( wxSUNKEN_BORDER) || HasFlag(wxDOUBLE_BORDER) )
+    {
+    	bool sunken = HasFlag( wxSUNKEN_BORDER ) ;
+        RGBForeColor( &face );
+        MoveTo( 0 , m_height - 2 );
+        LineTo( 0 , 0 );
+        LineTo( m_width - 2 , 0 );
+
+        MoveTo( 2 , m_height - 3 );
+        LineTo( m_width - 3 , m_height - 3 );
+        LineTo( m_width - 3 , 2 );
+
+        RGBForeColor( sunken ? &face : &black );
+        MoveTo( 0 , m_height - 1 );
+        LineTo( m_width - 1 , m_height - 1 );
+        LineTo( m_width - 1 , 0 );
+
+        RGBForeColor( sunken ? &shadow : &white );
+        MoveTo( 1 , m_height - 3 );
+        LineTo( 1, 1 );
+        LineTo( m_width - 3 , 1 );
+
+        RGBForeColor( sunken ? &white : &shadow );
+        MoveTo( 1 , m_height - 2 );
+        LineTo( m_width - 2 , m_height - 2 );
+        LineTo( m_width - 2 , 1 );
+
+        RGBForeColor( sunken ? &black : &face );
+        MoveTo( 2 , m_height - 4 );
+        LineTo( 2 , 2 );
+        LineTo( m_width - 4 , 2 );
+    }
+    else if (HasFlag(wxSIMPLE_BORDER))
+    {
+		Rect rect = { 0 , 0 , m_height , m_width } ;
+		RGBForeColor( &black ) ;
+    	FrameRect( &rect ) ;
+    }
 }
 
-void wxWindow::RemoveChild(wxWindow *child)
+// New function that will replace some of the above.
+void wxWindowMac::SetScrollbar(int orient, int pos, int thumbVisible,
+    int range, bool refresh)
 {
-    GetChildren().DeleteObject(child);
-    child->m_windowParent = NULL;
+		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 , thumbVisible , 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 , thumbVisible , refresh ) ;
+				}
+			}
+		}
+		MacRepositionScrollBars() ;
 }
 
-void wxWindow::DestroyChildren()
+// Does a physical scroll
+void wxWindowMac::ScrollWindow(int dx, int dy, const wxRect *rect)
 {
-    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 */
+	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 ) ;
+    	InvalWindowRgn( GetMacRootWindow() ,  updateRgn ) ;
+    	DisposeRgn( updateRgn ) ;
+	}
+	
+	for (wxNode *node = GetChildren().First(); node; node = node->Next())
+	{
+		wxWindowMac *child = (wxWindowMac*)node->Data();
+		if (child == m_vScrollBar) continue;
+		if (child == m_hScrollBar) continue;
+		if (child->IsTopLevel()) continue;
+		int x,y;
+		child->GetPosition( &x, &y );
+		int w,h;
+		child->GetSize( &w, &h );
+		child->SetSize( x+dx, y+dy, w, h );
+	}
+	
 }
 
-void wxWindow::MakeModal(bool modal)
+void wxWindowMac::MacOnScroll(wxScrollEvent &event )
 {
-  // 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 ( event.m_eventObject == m_vScrollBar || event.m_eventObject == m_hScrollBar )
+	{
+	    wxScrollWinEvent wevent;
+	    wevent.SetPosition(event.GetPosition());
+	    wevent.SetOrientation(event.GetOrientation());
+	    wevent.m_eventObject = this;
+	
+    	if (event.m_eventType == wxEVT_SCROLL_TOP) {
+	        wevent.m_eventType = wxEVT_SCROLLWIN_TOP;
+	    } else
+    	if (event.m_eventType == wxEVT_SCROLL_BOTTOM) {
+	        wevent.m_eventType = wxEVT_SCROLLWIN_BOTTOM;
+	    } else
+    	if (event.m_eventType == wxEVT_SCROLL_LINEUP) {
+	        wevent.m_eventType = wxEVT_SCROLLWIN_LINEUP;
+	    } else
+    	if (event.m_eventType == wxEVT_SCROLL_LINEDOWN) {
+	        wevent.m_eventType = wxEVT_SCROLLWIN_LINEDOWN;
+	    } else
+    	if (event.m_eventType == wxEVT_SCROLL_PAGEUP) {
+	        wevent.m_eventType = wxEVT_SCROLLWIN_PAGEUP;
+	    } else
+    	if (event.m_eventType == wxEVT_SCROLL_PAGEDOWN) {
+	        wevent.m_eventType = wxEVT_SCROLLWIN_PAGEDOWN;
+	    } else
+    	if (event.m_eventType == wxEVT_SCROLL_THUMBTRACK) {
+	        wevent.m_eventType = wxEVT_SCROLLWIN_THUMBTRACK;
+	    }
+		
+	    GetEventHandler()->ProcessEvent(wevent);
+    }
+}
 
-      node = node->Next();
+bool wxWindowMac::SetFont(const wxFont& font)
+{
+    if ( !wxWindowBase::SetFont(font) )
+    {
+        // nothing to do
+        return FALSE;
     }
-  }
+
+    return TRUE;
+}
+
+// Get the window with the focus
+wxWindowMac *wxWindowBase::FindFocus()
+{
+	return gFocusWindow ;
 }
 
+#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)
+void wxWindowMac::OnCommand(wxWindowMac& win, wxCommandEvent& event)
 {
-  if (GetEventHandler()->ProcessEvent(event) )
-    return;
-  if (m_windowParent)
-    m_windowParent->GetEventHandler()->OnCommand(win, event);
+    if ( GetEventHandler()->ProcessEvent(event)  )
+        return;
+    if ( m_parent )
+        m_parent->GetEventHandler()->OnCommand(win, event);
 }
+#endif // WXWIN_COMPATIBILITY_2
 
-void wxWindow::SetConstraints(wxLayoutConstraints *c)
+#if WXWIN_COMPATIBILITY
+wxObject* wxWindowMac::GetChild(int number) const
 {
-  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);
-  }
+    // 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
 
-// This removes any dangling pointers to this window
-// in other windows' constraintsInvolvedIn lists.
-void wxWindow::UnsetConstraints(wxLayoutConstraints *c)
+void wxWindowMac::OnSetFocus(wxFocusEvent& event)
 {
-  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);
-  }
+    // panel wants to track the window which was the last to have focus in it,
+    // so we want to set ourselves as the window which last had focus
+    //
+    // notice that it's also important to do it upwards the tree becaus
+    // otherwise when the top level panel gets focus, it won't set it back to
+    // us, but to some other sibling
+    
+    // CS:don't know if this is still needed:
+    //wxChildFocusEvent eventFocus(this);
+    //(void)GetEventHandler()->ProcessEvent(eventFocus);
+
+    event.Skip();
 }
 
-// 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)
+void wxWindowMac::Clear()
 {
-  if (!m_constraintsInvolvedIn)
-    m_constraintsInvolvedIn = new wxList;
-  if (!m_constraintsInvolvedIn->Member(otherWin))
-    m_constraintsInvolvedIn->Append(otherWin);
+	if ( m_macWindowData )
+	{
+		wxMacDrawingClientHelper helper ( this ) ;
+		int w ,h ;
+		wxPoint origin = GetClientAreaOrigin() ;
+		GetClientSize( &w , &h ) ;
+		::SetThemeWindowBackground( m_macWindowData->m_macWindow , m_macWindowData->m_macWindowBackgroundTheme , false ) ;
+		Rect r = { origin.y , origin.x, origin.y+h , origin.x+w } ;
+		EraseRect( &r ) ;
+	}
+	else
+	{
+		wxClientDC dc(this);
+    	wxBrush brush(GetBackgroundColour(), wxSOLID);
+    	dc.SetBackground(brush);
+    	dc.Clear();
+	}
 }
 
-// REMOVE back-pointer to other windows we're involved with.
-void wxWindow::RemoveConstraintReference(wxWindow *otherWin)
+// Setup background and foreground colours correctly
+void wxWindowMac::SetupColours()
 {
-  if (m_constraintsInvolvedIn)
-    m_constraintsInvolvedIn->DeleteObject(otherWin);
+    if ( GetParent() )
+        SetBackgroundColour(GetParent()->GetBackgroundColour());
 }
 
-// Reset any constraints that mention this window
-void wxWindow::DeleteRelatedConstraints()
+void wxWindowMac::OnIdle(wxIdleEvent& event)
 {
-  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;
+/*
+   // 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);
+       }
     }
-    delete m_constraintsInvolvedIn;
-    m_constraintsInvolvedIn = NULL;
-  }
+*/
+
+    // This calls the UI-update mechanism (querying windows for
+    // menu/toolbar/control state information)
+	UpdateWindowUI();
 }
 
-void wxWindow::SetSizer(wxSizer *sizer)
+// Raise the window to the top of the Z order
+void wxWindowMac::Raise()
 {
-  m_windowSizer = sizer;
-  if (sizer)
-    sizer->SetSizerParent((wxWindow *)this);
+    if ( m_macWindowData )
+    {
+        ::BringToFront( m_macWindowData->m_macWindow ) ;
+    }
 }
 
-/*
- * New version
- */
+// Lower the window to the bottom of the Z order
+void wxWindowMac::Lower()
+{
+    if ( m_macWindowData )
+    {
+        ::SendBehind( m_macWindowData->m_macWindow , NULL ) ;
+    }
+}
 
-bool wxWindow::Layout()
+void wxWindowMac::DoSetClientSize(int width, int height)
 {
-  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 ( width != -1 || height != -1 )
+	{
+		
+		if ( width != -1 && m_vScrollBar )
+			width += MAC_SCROLLBAR_SIZE ;
+		if ( height != -1 && m_vScrollBar )
+			height += MAC_SCROLLBAR_SIZE ;
+
+		width += MacGetLeftBorderSize(  ) + MacGetRightBorderSize( ) ;
+		height += MacGetTopBorderSize(  ) + MacGetBottomBorderSize( ) ;
+
+		DoSetSize( -1 , -1 , width , height ) ;
+	}
 }
 
 
-// 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)
+wxWindowMac* wxWindowMac::s_lastMouseWindow = NULL ;
+
+bool wxWindowMac::MacGetWindowFromPointSub( const wxPoint &point , wxWindowMac** outWin ) 
 {
-  wxLayoutConstraints *constr = GetConstraints();
-  if (constr)
-  {
-    return constr->SatisfyConstraints((wxWindow *)this, noChanges);
-  }
-  else
-    return TRUE;
+	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() ;
+
+	wxPoint newPoint( point ) ;
+
+	newPoint.x -= m_x;
+	newPoint.y -= m_y;
+	
+	for (wxNode *node = GetChildren().First(); node; node = node->Next())
+	{
+		wxWindowMac *child = (wxWindowMac*)node->Data();
+		// added the m_isShown test --dmazzoni
+		if ( child->GetMacRootWindow() == window && child->m_isShown )
+		{
+			if (child->MacGetWindowFromPointSub(newPoint , outWin ))
+				return TRUE;
+		}
+	}
+
+	*outWin = this ;
+	return TRUE;
 }
 
-bool wxWindow::LayoutPhase2(int *noChanges)
+bool wxWindowMac::MacGetWindowFromPoint( const wxPoint &screenpoint , wxWindowMac** outWin ) 
 {
-  *noChanges = 0;
-  
-  // Layout children
-  DoPhase(1);
-  DoPhase(2);
-  return TRUE;
+	WindowRef window ;
+	Point pt = { screenpoint.y , screenpoint.x } ;
+	if ( ::FindWindow( pt , &window ) == 3 )
+	{
+			wxPoint point( screenpoint ) ;
+			wxWindowMac* win = wxFindWinFromMacWindow( window ) ;
+			if ( win )
+			{
+			win->ScreenToClient( point ) ;
+			return win->MacGetWindowFromPointSub( point , outWin ) ;
+	}
+	}
+	return FALSE ;
 }
 
-// Do a phase of evaluating child constraints
-bool wxWindow::DoPhase(int phase)
+extern int wxBusyCursorCount ;
+
+bool wxWindowMac::MacDispatchMouseEvent(wxMouseEvent& event)
 {
-  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();
+	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 ;
+
+	for (wxNode *node = GetChildren().First(); node; node = node->Next())
+	{
+		wxWindowMac *child = (wxWindowMac*)node->Data();
+		if ( child->GetMacRootWindow() == window && child->IsShown() && child->IsEnabled() )
+		{
+			if (child->MacDispatchMouseEvent(event))
+				return TRUE;
+		}
+	}
+
+	event.m_x = x ;
+	event.m_y = y ;
+	
+	if ( wxBusyCursorCount == 0 )
+	{
+		m_cursor.MacInstall() ;
+	}
+	
+	if ( event.GetEventType() == wxEVT_LEFT_DOWN )
+	{
+    	// set focus to this window
+        if (AcceptsFocus() && FindFocus()!=this)
+        	SetFocus();
     }
-    noIterations ++;
-  }
-  return TRUE;
+
+#if wxUSE_TOOLTIPS
+    if ( event.GetEventType() == wxEVT_MOTION 
+        	|| event.GetEventType() == wxEVT_ENTER_WINDOW
+        	|| event.GetEventType() == wxEVT_LEAVE_WINDOW )
+        wxToolTip::RelayEvent( this , event);
+#endif // wxUSE_TOOLTIPS
+	GetEventHandler()->ProcessEvent( event ) ;
+	return TRUE;
 }
 
-void wxWindow::ResetConstraints()
+Point lastWhere ;
+long lastWhen = 0 ;
+
+wxString wxWindowMac::MacGetToolTipString( wxPoint &pt )
 {
-  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 ( m_tooltip )
+	{
+		return m_tooltip->GetTip() ;
+	}
+	return "" ;
 }
-
-// Need to distinguish between setting the 'fake' size for
-// windows and sizers, and setting the real values.
-void wxWindow::SetConstraintSizes(bool recurse)
+void wxWindowMac::MacFireMouseEvent( EventRecord *ev )
 {
-  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();
+	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;
 
-    wxString winName;
-	if (GetName() == "")
-		winName = "unnamed";
+	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
-		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");
-  }
+	{
+		event.SetEventType(wxEVT_MOTION ) ;
+	}
 
-  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_shiftDown = ev->modifiers & shiftKey;
+	event.m_controlDown = ev->modifiers & controlKey;
+	event.m_altDown = ev->modifiers & optionKey;
+	event.m_metaDown = ev->modifiers & cmdKey;
 
-// 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;
-}
+	Point		localwhere = ev->where ;
+		
+	GrafPtr		port ;	
+	::GetPort( &port ) ;
+	::SetPort( UMAGetWindowPort( m_macWindowData->m_macWindow ) ) ;
+	::GlobalToLocal( &localwhere ) ;
+	::SetPort( port ) ;
 
-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);
-}
+	if ( ev->what == mouseDown )
+	{
+		if ( ev->when - lastWhen <= GetDblTime() )
+		{
+			if ( abs( localwhere.h - lastWhere.h ) < 3 || abs( localwhere.v - lastWhere.v ) < 3 )
+			{
+				if ( controlDown )
+					event.SetEventType(wxEVT_RIGHT_DCLICK ) ;
+				else
+					event.SetEventType(wxEVT_LEFT_DCLICK ) ;
+			}
+		    lastWhen = 0 ;
+		}
+		else
+		{
+		    lastWhen = ev->when ;
+		}
+		lastWhere = localwhere ;
+	}
 
-void wxWindow::SizerMove(int x, int y)
-{
-	int xx = x;
-	int yy = y;
-  TransformSizerToActual(&xx, &yy);
-  Move(xx, yy);
-}
+	event.m_x = localwhere.h;
+	event.m_y = localwhere.v;
+	event.m_x += m_x;
+	event.m_y += m_y;
 
-// Only set the size/position of the constraint (if any)
-void wxWindow::SetSizeConstraint(int x, int y, int w, int h)
-{
-  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);
-    }
-  }
+/*
+	wxPoint origin = GetClientAreaOrigin() ;
+
+	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::MoveConstraint(int x, int y)
+void wxWindowMac::MacMouseDown( 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);
-    }
-  }
+	MacFireMouseEvent( ev ) ;
 }
 
-void wxWindow::GetSizeConstraint(int *w, int *h) const
+void wxWindowMac::MacMouseUp( EventRecord *ev , short part)
 {
-  wxLayoutConstraints *constr = GetConstraints();
-  if (constr)
-  {
-    *w = constr->width.GetValue();
-    *h = constr->height.GetValue();
-  }
-  else
-    GetSize(w, h);
+	switch (part)
+	{
+		case inContent:		
+			{
+				MacFireMouseEvent( ev ) ;
+			}
+			break ;
+	}
 }
 
-void wxWindow::GetClientSizeConstraint(int *w, int *h) const
+void wxWindowMac::MacMouseMoved( EventRecord *ev , short part)
 {
-  wxLayoutConstraints *constr = GetConstraints();
-  if (constr)
-  {
-    *w = constr->width.GetValue();
-    *h = constr->height.GetValue();
-  }
-  else
-    GetClientSize(w, h);
+	switch (part)
+	{
+		case inContent:		
+			{
+				MacFireMouseEvent( ev ) ;
+			}
+			break ;
+	}
 }
-
-void wxWindow::GetPositionConstraint(int *x, int *y) const
+void wxWindowMac::MacActivate( EventRecord *ev , bool inIsActivating )
 {
-  wxLayoutConstraints *constr = GetConstraints();
-  if (constr)
-  {
-    *x = constr->left.GetValue();
-    *y = constr->top.GetValue();
-  }
-  else
-    GetPosition(x, y);
+    if ( !m_macWindowData->m_macHasReceivedFirstActivate )
+        m_macWindowData->m_macHasReceivedFirstActivate = true ;
+    
+	wxActivateEvent event(wxEVT_ACTIVATE, inIsActivating , m_windowId);
+	event.m_timeStamp = ev->when ;
+	event.SetEventObject(this);
+	
+	GetEventHandler()->ProcessEvent(event);
+	
+    Refresh(false) ;
+	UMAHighlightAndActivateWindow( m_macWindowData->m_macWindow , inIsActivating ) ;
+//	MacUpdateImmediately() ;
 }
 
-bool wxWindow::Close(bool force)
+void wxWindowMac::MacRedraw( RgnHandle updatergn , long time)
 {
-  wxCloseEvent event(wxEVT_CLOSE_WINDOW, m_windowId);
-  event.SetEventObject(this);
-#if WXWIN_COMPATIBILITY
-  event.SetForce(force);
-#endif
-  event.SetCanVeto(!force);
+	// updatergn is always already clipped to our boundaries
+	WindowRef window = GetMacRootWindow() ;
+	// ownUpdateRgn is the area that this window has to invalidate i.e. its own area without its children
+	RgnHandle ownUpdateRgn = NewRgn() ;
+	CopyRgn( updatergn , ownUpdateRgn ) ;
 
-  return GetEventHandler()->ProcessEvent(event);
-}
+	{
+		wxMacDrawingHelper focus( this ) ; // was client
+		if ( focus.Ok() )
+		{
+			WindowRef window = GetMacRootWindow() ;
+			bool eraseBackground = false ;
+			if ( m_macWindowData )
+				eraseBackground = true ;
+			if ( m_backgroundColour == wxSystemSettings::GetSystemColour(wxSYS_COLOUR_APPWORKSPACE) )
+			{
+					::SetThemeWindowBackground( 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
+		
+
+					wxWindowMac* 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 ) ))
+							{
+								Rect box ;
+								GetRegionBounds( updatergn , &box) ;
+								::ApplyThemeBackground(kThemeBackgroundTabPane, &box , kThemeStateActive,8,true);
+								break ;
+							}
+						}
+						else
+						{
+							parent = NULL ;
+							break ;
+						}
+						parent = parent->GetParent() ;
+					}
+					if ( !parent )
+					{
+						// if there is nothing special -> use default
+						::SetThemeWindowBackground( window , kThemeBrushDialogBackgroundActive , false ) ;
+					}
+			}
+			else
+			{
+		  		RGBBackColor( &m_backgroundColour.GetPixel()) ;
+			}
+            // subtract all non transparent children from updatergn
+            
+    	    RgnHandle childarea = NewRgn() ;
+        	for (wxNode *node = GetChildren().First(); node; node = node->Next())
+        	{
+        		wxWindowMac *child = (wxWindowMac*)node->Data();
+        		// eventually test for transparent windows
+		        if ( child->GetMacRootWindow() == window && child->IsShown() )
+		        {
+		            if ( child->GetBackgroundColour() != m_backgroundColour && !child->IsKindOf( CLASSINFO( wxControl ) ) && ((wxControl*)child)->GetMacControl() )
+		            {
+        		        SetRectRgn( childarea , child->m_x , child->m_y , child->m_x + child->m_width ,  child->m_y + child->m_height ) ;
+        		        DiffRgn( ownUpdateRgn , childarea , ownUpdateRgn ) ;
+        		    }
+        		}
+         	}		
+         	DisposeRgn( childarea ) ;
+
+	  		if ( GetParent() && m_backgroundColour != GetParent()->GetBackgroundColour() )
+	  			eraseBackground = true ;
+			SetClip( ownUpdateRgn ) ;
+			if ( m_macEraseOnRedraw ) {
+    			if ( eraseBackground  )
+    			{
+    				EraseRgn( ownUpdateRgn ) ;	
+    			}
+    		}
+    		else {
+    		    m_macEraseOnRedraw = true ;
+    		}
+		}
 
-wxObject* wxWindow::GetChild(int number) const
-{
-  // 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 ;
+		{
+			RgnHandle newupdate = NewRgn() ;
+			wxSize point = GetClientSize() ;
+			wxPoint origin = GetClientAreaOrigin() ;
+
+			SetRectRgn( newupdate , origin.x , origin.y , origin.x + point.x , origin.y+point.y ) ;
+			SectRgn( newupdate , ownUpdateRgn , newupdate ) ;
+			OffsetRgn( newupdate , -origin.x , -origin.y ) ;
+			m_updateRegion = newupdate ;
+			DisposeRgn( newupdate ) ;
+		}
+
+		MacPaintBorders() ;
+		wxPaintEvent event;
+		event.m_timeStamp = time ;
+		event.SetEventObject(this);
+		GetEventHandler()->ProcessEvent(event);
+	}
+	
+	
+	RgnHandle childupdate = NewRgn() ;
+			
+	for (wxNode *node = GetChildren().First(); node; node = node->Next())
+	{
+		wxWindowMac *child = (wxWindowMac*)node->Data();
+		SetRectRgn( childupdate , child->m_x , child->m_y , child->m_x + child->m_width ,  child->m_y + child->m_height ) ;
+		SectRgn( childupdate , updatergn , childupdate ) ;
+		OffsetRgn( childupdate , -child->m_x , -child->m_y ) ;
+		if ( child->GetMacRootWindow() == window && child->IsShown() && !EmptyRgn( childupdate ) )
+		{
+			// because dialogs may also be children
+			child->MacRedraw( childupdate , time ) ;
+		}
+	}
+	DisposeRgn( childupdate ) ;
+	// eventually a draw grow box here
 }
 
-void wxWindow::OnDefaultAction(wxControl *initiatingItem)
+void wxWindowMac::MacUpdateImmediately()
 {
-    // Obsolete function
+	WindowRef window = GetMacRootWindow() ;
+	if ( window )
+	{
+		wxWindowMac* win = wxFindWinFromMacWindow( window ) ;
+		#if TARGET_CARBON
+		AGAPortHelper help( GetWindowPort(window) ) ;
+		#else
+		AGAPortHelper help( (window) ) ;
+		#endif
+		SetOrigin( 0 , 0 ) ;
+		BeginUpdate( window ) ;
+		if ( win )
+		{
+			RgnHandle		region = NewRgn();
+			
+			if ( region )
+			{
+	            GetPortVisibleRegion( GetWindowPort( window ), region );
+
+				// if windowshade gives incompatibility , take the follwing out
+	            if ( !EmptyRgn( region ) && win->m_macWindowData->m_macHasReceivedFirstActivate )
+	            {
+					win->MacRedraw( region , wxTheApp->sm_lastMessageTime ) ;
+	            }
+	            DisposeRgn( region );
+	        }
+		}
+		EndUpdate( window ) ;
+	}
 }
 
-void wxWindow::Clear()
+void wxWindowMac::MacUpdate( EventRecord *ev )
 {
-	wxClientDC dc(this);
-    wxBrush brush(GetBackgroundColour(), wxSOLID);
-    dc.SetBackground(brush);
-    dc.Clear();
+	WindowRef window = (WindowRef) ev->message ;
+	wxWindowMac * win = wxFindWinFromMacWindow( window ) ;
+	#if TARGET_CARBON
+	AGAPortHelper help( GetWindowPort(window) ) ;
+	#else
+	AGAPortHelper help( (window) ) ;
+	#endif
+	SetOrigin( 0 , 0 ) ;
+	BeginUpdate( window ) ;
+	if ( win )
+	{
+		RgnHandle		region = NewRgn();
+		
+		if ( region )
+		{
+            GetPortVisibleRegion( GetWindowPort( window ), region );
+
+			// if windowshade gives incompatibility , take the follwing out
+            if ( !EmptyRgn( region ) && win->m_macWindowData->m_macHasReceivedFirstActivate )
+            {
+				MacRedraw( region , ev->when ) ;
+            }
+            DisposeRgn( region );
+        }
+	}
+	EndUpdate( window ) ;
 }
 
-// Fits the panel around the items
-void wxWindow::Fit()
+WindowRef wxWindowMac::GetMacRootWindow() const
 {
-	int maxX = 0;
-	int maxY = 0;
-	wxNode *node = GetChildren().First();
-	while ( node )
+	wxWindowMac *iter = (wxWindowMac*)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 wxWindowMac::MacCreateScrollBars( long style ) 
+{
+	wxASSERT_MSG( m_vScrollBar == NULL && m_hScrollBar == NULL , "attempt to create window twice" ) ;
+	
+	bool hasBoth = ( style & wxVSCROLL ) && ( style & wxHSCROLL ) ;
+	int adjust = hasBoth ? MAC_SCROLLBAR_SIZE - 1: 0 ;
+	int width, height ;
+	GetClientSize( &width , &height ) ;
+	
+	wxPoint vPoint(width-MAC_SCROLLBAR_SIZE, 0) ;
+	wxSize vSize(MAC_SCROLLBAR_SIZE, height - adjust) ;
+	wxPoint hPoint(0 , height-MAC_SCROLLBAR_SIZE ) ;
+	wxSize hSize( width - adjust, MAC_SCROLLBAR_SIZE) ;
+	
+	m_vScrollBar = new wxScrollBar(this, wxWINDOW_VSCROLL, vPoint, 
+		vSize , wxVERTICAL);
+
+	if ( style & wxVSCROLL )
 	{
-		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;
+		
+	}
+	else
+	{
+		m_vScrollBar->Show(false) ;
+	}
+	m_hScrollBar = new wxScrollBar(this, wxWINDOW_HSCROLL, hPoint, 
+		hSize , wxHORIZONTAL);
+	if ( style  & wxHSCROLL )
+	{
+	}
+	else
+	{
+		m_hScrollBar->Show(false) ;
+	}
+	
+	// because the create does not take into account the client area origin
+	MacRepositionScrollBars() ; // we might have a real position shift
+}
+
+void wxWindowMac::MacRepositionScrollBars()
+{
+	bool hasBoth = ( m_hScrollBar && m_hScrollBar->IsShown()) && ( m_vScrollBar && m_vScrollBar->IsShown()) ;
+	int adjust = hasBoth ? MAC_SCROLLBAR_SIZE - 1 : 0 ;
+	
+	// get real client area
+	
+	int width = m_width ; 
+	int height = m_height ;
+
+	width -= MacGetLeftBorderSize() + MacGetRightBorderSize();
+	height -= MacGetTopBorderSize() + MacGetBottomBorderSize();
+	
+	wxPoint vPoint(width-MAC_SCROLLBAR_SIZE, 0) ;
+	wxSize vSize(MAC_SCROLLBAR_SIZE, height - adjust) ;
+	wxPoint hPoint(0 , height-MAC_SCROLLBAR_SIZE ) ;
+	wxSize hSize( width - adjust, MAC_SCROLLBAR_SIZE) ;
+	
+	int x = 0 ; 
+	int y = 0 ;
+	int w = m_width ;
+	int h = m_height ;
+	
+	MacClientToRootWindow( &x , &y ) ;
+	MacClientToRootWindow( &w , &h ) ;
+	
+	wxWindowMac *iter = (wxWindowMac*)this ;
+	
+	int totW = 10000 , totH = 10000;
+	while( iter )
+	{
+		if ( iter->m_macWindowData )
+		{
+			totW = iter->m_width ;
+			totH = iter->m_height ;
+			break ;
+		}
 
-		node = node->Next();
+		iter = iter->GetParent() ;
+	} 
+	
+	if ( x == 0 )
+	{
+		hPoint.x = -1 ;
+		hSize.x += 1 ;
+	}
+	if ( y == 0 )
+	{
+		vPoint.y = -1 ;
+		vSize.y += 1 ;
+	}
+	
+	if ( w-x >= totW )
+	{
+		hSize.x += 1 ;
+		vPoint.x += 1 ;
+	}
+	
+	if ( h-y >= totH )
+	{
+		vSize.y += 1 ;
+		hPoint.y += 1 ;
+	}
+
+	if ( m_vScrollBar )
+	{
+		m_vScrollBar->SetSize( vPoint.x , vPoint.y, vSize.x, vSize.y , wxSIZE_ALLOW_MINUS_ONE);
+	}
+	if ( m_hScrollBar )
+	{
+		m_hScrollBar->SetSize( hPoint.x , hPoint.y, hSize.x, hSize.y, wxSIZE_ALLOW_MINUS_ONE);
 	}
-	SetClientSize(maxX + 5, maxY + 5);
 }
 
-void wxWindow::SetValidator(const wxValidator& validator)
+void wxWindowMac::MacKeyDown( EventRecord *ev ) 
 {
-	if ( m_windowValidator )
-		delete m_windowValidator;
-	m_windowValidator = validator.Clone();
 
-	if ( m_windowValidator )
-		m_windowValidator->SetWindow(this) ;
 }
 
-void wxWindow::SetAcceleratorTable(const wxAcceleratorTable& accel)
+
+bool wxWindowMac::AcceptsFocus() const
 {
-    m_acceleratorTable = accel;
+    return MacCanFocus() && wxWindowBase::AcceptsFocus();
+}
+
+ControlHandle wxWindowMac::MacGetContainerForEmbedding() 
+{
+	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 wxWindowMac::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();
-		wxWindow *found = child->FindWindow(id);
-		if ( found )
-			return found;
+		wxWindowMac *child = (wxWindowMac *)node->Data();
+		child->MacSuperChangedPosition() ;
 		node = node->Next();
 	}
-	return NULL;
 }
 
-wxWindow *wxWindow::FindWindow(const wxString& name)
+void wxWindowMac::MacTopLevelWindowChangedPosition() 
 {
-	if ( GetName() == name)
-		return this;
+	// only screen-absolute structures have to be moved i.e. glcanvas
 
 	wxNode *node = GetChildren().First();
 	while ( node )
 	{
-		wxWindow *child = (wxWindow *)node->Data();
-		wxWindow *found = child->FindWindow(name);
-		if ( found )
-			return found;
+		wxWindowMac *child = (wxWindowMac *)node->Data();
+		child->MacTopLevelWindowChangedPosition() ;
 		node = node->Next();
 	}
-	return NULL;
 }
 
-void wxWindow::OnIdle(wxIdleEvent& event)
+bool wxWindowMac::MacSetPortFocusParams( const Point & localOrigin, const Rect & clipRect, WindowRef window , wxWindowMac* win ) 
+{
+	if ( window == NULL )
+		return false ;
+		
+	GrafPtr currPort;
+	GrafPtr port ;
+
+	::GetPort(&currPort);
+	port = UMAGetWindowPort( window) ;
+	if (currPort != port )
+			::SetPort(port);
+				
+//	wxASSERT( port->portRect.left == 0 && port->portRect.top == 0 ) ; 
+	::SetOrigin(-localOrigin.h, -localOrigin.v);
+	return true;			
+}
+
+bool wxWindowMac::MacSetPortDrawingParams( const Point & localOrigin, const Rect & clipRect, WindowRef window , wxWindowMac* win ) 
+{
+	if ( window == NULL )
+		return false ;
+		
+	GrafPtr currPort;
+	GrafPtr port ;
+	::GetPort(&currPort);
+	port = UMAGetWindowPort( window) ;
+	if (currPort != port )
+			::SetPort(port);
+//	wxASSERT( port->portRect.left == 0 && port->portRect.top == 0 ) ; 
+	::SetOrigin(-localOrigin.h, -localOrigin.v);
+	::ClipRect(&clipRect);
+
+	::PenNormal() ;
+	::RGBBackColor(& win->GetBackgroundColour().GetPixel() ) ;
+	::RGBForeColor(& win->GetForegroundColour().GetPixel() ) ;
+	Pattern whiteColor ;
+	
+	::BackPat( GetQDGlobalsWhite( &whiteColor) ) ;
+	::SetThemeWindowBackground(  win->m_macWindowData->m_macWindow , win->m_macWindowData->m_macWindowBackgroundTheme ,  false ) ;
+	return true;			
+}
+
+void wxWindowMac::MacGetPortParams(Point* localOrigin, Rect* clipRect, WindowRef *window  , wxWindowMac** rootwin) 
+{
+	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);
+	}
+}
+
+void wxWindowMac::MacDoGetPortClientParams(Point* localOrigin, Rect* clipRect, WindowRef *window , wxWindowMac** rootwin ) 
 {
-/* TODO: you may need to do something like this
- * if your GUI doesn't generate enter/leave events
+//	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()->MacDoGetPortClientParams( 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 ;//width;
+		myClip.bottom = m_height ;// height;
+		SectRect(clipRect, &myClip, clipRect);
+	}
+}
 
-    // 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);
-        }
-    }
-*/
+void wxWindowMac::MacGetPortClientParams(Point* localOrigin, Rect* clipRect, WindowRef *window , wxWindowMac** rootwin ) 
+{
+	MacDoGetPortClientParams( localOrigin , clipRect , window , rootwin ) ;
 
-    // This calls the UI-update mechanism (querying windows for
-    // menu/toolbar/control state information)
-	UpdateWindowUI();
+  	int width , height ;
+  	GetClientSize( &width , &height ) ;
+  	wxPoint client ;
+	client = GetClientAreaOrigin( ) ;
+	
+	localOrigin->h += client.x;
+	localOrigin->v += client.y;
+	OffsetRect(clipRect, -client.x, -client.y);
+
+	Rect myClip;
+	myClip.left = 0;
+	myClip.top = 0;
+	myClip.right = width;
+	myClip.bottom = height;
+	SectRect(clipRect, &myClip, clipRect);
 }
 
-// Raise the window to the top of the Z order
-void wxWindow::Raise()
+long wxWindowMac::MacGetLeftBorderSize( ) const
 {
-    // TODO
+	if( m_macWindowData )
+		return 0 ;
+
+    if (m_windowStyle & wxRAISED_BORDER || m_windowStyle & wxSUNKEN_BORDER )
+    {
+		return 3 ;
+    }
+    else if (  m_windowStyle &wxDOUBLE_BORDER)
+    {
+		return 3 ;
+    }
+    else if (m_windowStyle &wxSIMPLE_BORDER)
+    {
+    	return 1 ;
+    }
+	return 0 ;
 }
 
-// Lower the window to the bottom of the Z order
-void wxWindow::Lower()
+long wxWindowMac::MacGetRightBorderSize( ) const
 {
-    // TODO
+	if( m_macWindowData )
+		return 0 ;
+
+    if (m_windowStyle & wxRAISED_BORDER || m_windowStyle & wxSUNKEN_BORDER )
+    {
+		return 3 ;
+    }
+    else if (  m_windowStyle &wxDOUBLE_BORDER)
+    {
+		return 3 ;
+    }
+    else if (m_windowStyle &wxSIMPLE_BORDER)
+    {
+    	return 1 ;
+    }
+	return 0 ;
 }
 
-bool wxWindow::AcceptsFocus() const
+long wxWindowMac::MacGetTopBorderSize( ) const
 {
-  return IsShown() && IsEnabled();
+	if( m_macWindowData )
+		return 0 ;
+
+    if (m_windowStyle & wxRAISED_BORDER || m_windowStyle & wxSUNKEN_BORDER )
+    {
+		return 3 ;
+    }
+    else if (  m_windowStyle &wxDOUBLE_BORDER)
+    {
+		return 3 ;
+    }
+    else if (m_windowStyle &wxSIMPLE_BORDER)
+    {
+    	return 1 ;
+    }
+	return 0 ;
 }
 
-// Update region access
-wxRegion wxWindow::GetUpdateRegion() const
+long wxWindowMac::MacGetBottomBorderSize( ) const
 {
-    return m_updateRegion;
+	if( m_macWindowData )
+		return 0 ;
+
+    if (m_windowStyle & wxRAISED_BORDER || m_windowStyle & wxSUNKEN_BORDER )
+    {
+		return 3 ;
+    }
+    else if (  m_windowStyle &wxDOUBLE_BORDER)
+    {
+		return 3 ;
+    }
+    else if (m_windowStyle &wxSIMPLE_BORDER)
+    {
+    	return 1 ;
+    }
+	return 0 ;
 }
 
-bool wxWindow::IsExposed(int x, int y, int w, int h) const
+long wxWindowMac::MacRemoveBordersFromStyle( long style ) 
 {
-    return (m_updateRegion.Contains(x, y, w, h) != wxOutRegion);
+	return style & ~( wxDOUBLE_BORDER | wxSUNKEN_BORDER | wxRAISED_BORDER | wxBORDER | wxSTATIC_BORDER ) ;
 }
 
-bool wxWindow::IsExposed(const wxPoint& pt) const
+
+wxMacDrawingHelper::wxMacDrawingHelper( wxWindowMac * theWindow ) 
 {
-    return (m_updateRegion.Contains(pt) != wxOutRegion);
+	m_ok = false ;
+	Point localOrigin ;
+	Rect clipRect ;
+	WindowRef window ;
+	wxWindowMac *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 )
+	{
+		SetPort( m_currentPort ) ;
+		SetPenState( &m_savedPenState ) ;
+		SetOrigin( 0 , 0 ) ;
+		Rect portRect ;
+		GetPortBounds( m_currentPort , &portRect ) ;
+		ClipRect( &portRect ) ;
+	}
+		
+	if ( m_formerPort != m_currentPort )
+		SetPort( m_formerPort ) ;
 }
 
-/*
- * Allocates control IDs
- */
+wxMacDrawingClientHelper::wxMacDrawingClientHelper( wxWindowMac * theWindow ) 
+{
+	m_ok = false ;
+	Point localOrigin ;
+	Rect clipRect ;
+	WindowRef window ;
+	wxWindowMac *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 )
+	{
+		SetPort( m_currentPort ) ;
+		SetPenState( &m_savedPenState ) ;
+		SetOrigin( 0 , 0 ) ;
+		Rect portRect ;
+		GetPortBounds( m_currentPort , &portRect ) ;
+		ClipRect( &portRect ) ;
+	}
+		
+	if ( m_formerPort != m_currentPort )
+		SetPort( m_formerPort ) ;
+}
 
-int wxWindow::NewControlId()
+// Find the wxWindowMac at the current mouse position, returning the mouse
+// position.
+wxWindowMac* wxFindWindowAtPointer(wxPoint& pt)
 {
-    static int s_controlId = 0;
-    s_controlId ++;
-    return s_controlId;
+    pt = wxGetMousePosition();
+    wxWindowMac* found = wxFindWindowAtPoint(pt);
+    return found;
 }
 
+// Get the current mouse position.
+wxPoint wxGetMousePosition()
+{
+    int x, y;
+    wxGetMousePosition(& x, & y);
+    return wxPoint(x, y);
+}