applied patch 923858 (fixes crash in zlib streams)

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

diff --git a/src/mac/carbon/window.cpp b/src/mac/carbon/window.cpp
index dbfb493a09f09f1dd0110640515febab404d4836..01521d2df9707912f839a7c924d09d35056d6ee0 100644 (file)
--- a/src/mac/carbon/window.cpp
+++ b/src/mac/carbon/window.cpp
@@ -1,12 +1,12 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        windows.cpp
 /////////////////////////////////////////////////////////////////////////////
 // Name:        windows.cpp

-// Purpose:     wxWindow
-// Author:      AUTHOR
+// Purpose:     wxWindowMac
+// Author:      Stefan Csomor

 // Modified by:
 // Modified by:

-// Created:     ??/??/98
+// Created:     1998-01-01

 // RCS-ID:      $Id$
 // RCS-ID:      $Id$

-// Copyright:   (c) AUTHOR
-// Licence:    wxWindows licence
+// Copyright:   (c) Stefan Csomor
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__


@@ -15,31 +15,49 @@
 
 #include "wx/setup.h"
 #include "wx/menu.h"
 
 #include "wx/setup.h"
 #include "wx/menu.h"

+#include "wx/window.h"

 #include "wx/dc.h"
 #include "wx/dcclient.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/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/button.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/tooltip.h"
+#include "wx/statusbr.h"

 #include "wx/menuitem.h"
 #include "wx/menuitem.h"

+#include "wx/spinctrl.h"

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

+#include "wx/geometry.h"
+
+#include "wx/toolbar.h"
+#include "wx/dc.h"
+
+#if wxUSE_CARET
+    #include "wx/caret.h"
+#endif // wxUSE_CARET

 
 #define wxWINDOW_HSCROLL 5998
 #define wxWINDOW_VSCROLL 5997
 #define MAC_SCROLLBAR_SIZE 16
 
 
 #define wxWINDOW_HSCROLL 5998
 #define wxWINDOW_VSCROLL 5997
 #define MAC_SCROLLBAR_SIZE 16
 

-#include <wx/mac/uma.h>
+#include "wx/mac/uma.h"
+#ifndef __DARWIN__
+#include <Windows.h>
+#include <ToolUtils.h>
+#endif
+
+#if TARGET_API_MAC_OSX
+#ifndef __HIVIEW__
+       #include <HIToolbox/HIView.h>
+#endif
+#endif

 
 #if  wxUSE_DRAG_AND_DROP
 #include "wx/dnd.h"
 
 #if  wxUSE_DRAG_AND_DROP
 #include "wx/dnd.h"


@@ -48,1769 +66,2656 @@
 #include <string.h>
 
 extern wxList wxPendingDelete;
 #include <string.h>
 
 extern wxList wxPendingDelete;

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

 
 #if !USE_SHARED_LIBRARY
 
 #if !USE_SHARED_LIBRARY

-IMPLEMENT_DYNAMIC_CLASS(wxWindow, wxEvtHandler)

 
 

-BEGIN_EVENT_TABLE(wxWindow, wxEvtHandler)
-  EVT_ERASE_BACKGROUND(wxWindow::OnEraseBackground)
-  EVT_SYS_COLOUR_CHANGED(wxWindow::OnSysColourChanged)
-  EVT_INIT_DIALOG(wxWindow::OnInitDialog)
-  EVT_IDLE(wxWindow::OnIdle)
+BEGIN_EVENT_TABLE(wxWindowMac, wxWindowBase)
+    EVT_NC_PAINT(wxWindowMac::OnNcPaint)
+    EVT_ERASE_BACKGROUND(wxWindowMac::OnEraseBackground)
+// TODO    EVT_PAINT(wxWindowMac::OnPaint)
+    EVT_SYS_COLOUR_CHANGED(wxWindowMac::OnSysColourChanged)
+    EVT_INIT_DIALOG(wxWindowMac::OnInitDialog)
+    EVT_SET_FOCUS(wxWindowMac::OnSetFocus)
+    EVT_MOUSE_EVENTS(wxWindowMac::OnMouseEvent)

 END_EVENT_TABLE()
 
 #endif
 
 END_EVENT_TABLE()
 
 #endif
 

+#define wxMAC_DEBUG_REDRAW 0
+#ifndef wxMAC_DEBUG_REDRAW
+#define wxMAC_DEBUG_REDRAW 0
+#endif

 
 

+#define wxMAC_USE_THEME_BORDER 0

 
 

-// ===========================================================================
-// implementation
-// ===========================================================================
+// ---------------------------------------------------------------------------
+// Carbon Events
+// ---------------------------------------------------------------------------
+ 
+extern long wxMacTranslateKey(unsigned char key, unsigned char code) ;
+pascal OSStatus wxMacSetupControlBackground( ControlRef iControl , SInt16 iMessage , SInt16 iDepth , Boolean iIsColor ) ;
+
+static const EventTypeSpec eventList[] =
+{
+#if TARGET_API_MAC_OSX
+    { kEventClassControl , kEventControlDraw } ,
+    { kEventClassControl , kEventControlVisibilityChanged } ,
+    { kEventClassControl , kEventControlEnabledStateChanged } ,
+    { kEventClassControl , kEventControlHiliteChanged } ,
+//     { kEventClassControl , kEventControlInvalidateForSizeChange } , // 10.3 only
+//  { kEventClassControl , kEventControlBoundsChanged } ,
+
+    {}
+#else
+    {}
+#endif
+} ;
+
+static pascal OSStatus wxMacWindowControlEventHandler( EventHandlerCallRef handler , EventRef event , void *data )
+{
+    OSStatus result = eventNotHandledErr ;
+
+    wxMacCarbonEvent cEvent( event ) ;
+    
+    ControlRef controlRef ;
+    wxWindowMac* thisWindow = (wxWindowMac*) data ;
+
+    cEvent.GetParameter( kEventParamDirectObject , &controlRef ) ;
+
+    switch( GetEventKind( event ) )
+    {
+        case kEventControlDraw :
+            {
+                RgnHandle updateRgn = NULL ;
+
+                wxRegion visRegion = thisWindow->MacGetVisibleRegion() ;
+                if ( cEvent.GetParameter<RgnHandle>(kEventParamRgnHandle, &updateRgn) != noErr ) 
+                {
+                    updateRgn = (RgnHandle) visRegion.GetWXHRGN() ;
+                }
+                else
+                {
+                    // unfortunately this update region may be incorrect (tree ctrl sample )
+                    // so we have to reset it
+                    updateRgn = (RgnHandle) visRegion.GetWXHRGN() ;
+                }
+                // GrafPtr myport = cEvent.GetParameter<GrafPtr>(kEventParamGrafPort,typeGrafPtr) ;
+
+#if 0 // in case we would need a coregraphics compliant background erase first
+                CGContextRef cgContext = cEvent.GetParameter<CGContextRef>(kEventParamCGContextRef) ;
+                if ( thisWindow->MacIsUserPane() )
+                {
+                       HIRect bounds;
+                       err = HIViewGetBounds( controlRef, &bounds );
+                                   CGContextSetRGBFillColor( cgContext, 1 , 1 , 1 , 1 );
+//                                 CGContextSetRGBFillColor( cgContext, .95, .95, .95, 1 );
+                                   CGContextFillRect( cgContext, bounds );
+                }
+#endif
+                if ( thisWindow->MacDoRedraw( updateRgn , cEvent.GetTicks() ) )
+                    result = noErr ;
+                else
+                    result = eventNotHandledErr; 
+            }
+            break ;
+        case kEventControlVisibilityChanged :
+                thisWindow->MacVisibilityChanged() ;
+            break ;
+        case kEventControlEnabledStateChanged :
+                thisWindow->MacEnabledStateChanged() ;
+            break ;
+        case kEventControlHiliteChanged :
+                thisWindow->MacHiliteChanged() ;
+            break ;
+        default :
+            break ;
+    }
+    return result ;
+}
+
+pascal OSStatus wxMacWindowEventHandler( EventHandlerCallRef handler , EventRef event , void *data )
+{
+    OSStatus result = eventNotHandledErr ;
+
+    switch ( GetEventClass( event ) )
+    {
+        case kEventClassControl :
+            result = wxMacWindowControlEventHandler( handler, event, data ) ;
+            break ;
+        default :
+            break ;
+    }
+    return result ;
+}
+
+DEFINE_ONE_SHOT_HANDLER_GETTER( wxMacWindowEventHandler )

 
 // ---------------------------------------------------------------------------
 
 // ---------------------------------------------------------------------------

-// wxWindow utility functions
+// UserPane events for non OSX builds

 // ---------------------------------------------------------------------------
 // ---------------------------------------------------------------------------

+ 
+static pascal void wxMacControlUserPaneDrawProc(ControlRef control, SInt16 part)
+{
+    wxWindow * win = wxFindControlFromMacControl(control) ;
+    wxCHECK_RET( win , wxT("Callback from unkown control") ) ;
+    win->MacControlUserPaneDrawProc(part) ;
+}
+
+static pascal ControlPartCode wxMacControlUserPaneHitTestProc(ControlRef control, Point where)
+{
+    wxWindow * win = wxFindControlFromMacControl(control) ;
+    wxCHECK_MSG( win , kControlNoPart , wxT("Callback from unkown control") ) ;
+    return win->MacControlUserPaneHitTestProc(where.h , where.v) ;
+}
+
+static pascal ControlPartCode wxMacControlUserPaneTrackingProc(ControlRef control, Point startPt, ControlActionUPP actionProc)
+{
+    wxWindow * win = wxFindControlFromMacControl(control) ;
+    wxCHECK_MSG( win , kControlNoPart , wxT("Callback from unkown control") ) ;
+    return win->MacControlUserPaneTrackingProc( startPt.h , startPt.v , (void*) actionProc) ;
+}
+
+static pascal void wxMacControlUserPaneIdleProc(ControlRef control)
+{
+    wxWindow * win = wxFindControlFromMacControl(control) ;
+    wxCHECK_RET( win , wxT("Callback from unkown control") ) ;
+    win->MacControlUserPaneIdleProc() ;
+}
+
+static pascal ControlPartCode wxMacControlUserPaneKeyDownProc(ControlRef control, SInt16 keyCode, SInt16 charCode, SInt16 modifiers)
+{
+    wxWindow * win = wxFindControlFromMacControl(control) ;
+    wxCHECK_MSG( win , kControlNoPart , wxT("Callback from unkown control") ) ;
+    return win->MacControlUserPaneKeyDownProc(keyCode,charCode,modifiers) ;
+}
+
+static pascal void wxMacControlUserPaneActivateProc(ControlRef control, Boolean activating)
+{
+    wxWindow * win = wxFindControlFromMacControl(control) ;
+    wxCHECK_RET( win , wxT("Callback from unkown control") ) ;
+    win->MacControlUserPaneActivateProc(activating) ;
+}
+
+static pascal ControlPartCode wxMacControlUserPaneFocusProc(ControlRef control, ControlFocusPart action)
+{
+    wxWindow * win = wxFindControlFromMacControl(control) ;
+    wxCHECK_MSG( win , kControlNoPart , wxT("Callback from unkown control") ) ;
+    return win->MacControlUserPaneFocusProc(action) ;
+}
+
+static pascal void wxMacControlUserPaneBackgroundProc(ControlRef control, ControlBackgroundPtr info)
+{
+    wxWindow * win = wxFindControlFromMacControl(control) ;
+    wxCHECK_RET( win , wxT("Callback from unkown control") ) ;
+    win->MacControlUserPaneBackgroundProc(info) ;
+}
+
+void wxWindowMac::MacControlUserPaneDrawProc(wxInt16 part) 
+{
+    MacDoRedraw( MacGetVisibleRegion().GetWXHRGN() , 0 ) ;
+}
+
+wxInt16 wxWindowMac::MacControlUserPaneHitTestProc(wxInt16 x, wxInt16 y) 
+{
+    return kControlNoPart ;
+}
+
+wxInt16 wxWindowMac::MacControlUserPaneTrackingProc(wxInt16 x, wxInt16 y, void* actionProc) 
+{
+    return kControlNoPart ;
+}
+
+void wxWindowMac::MacControlUserPaneIdleProc() 
+{
+}
+
+wxInt16 wxWindowMac::MacControlUserPaneKeyDownProc(wxInt16 keyCode, wxInt16 charCode, wxInt16 modifiers) 
+{
+    return kControlNoPart ;
+}
+
+void wxWindowMac::MacControlUserPaneActivateProc(bool activating) 
+{
+}
+
+wxInt16 wxWindowMac::MacControlUserPaneFocusProc(wxInt16 action) 
+{
+    return kControlNoPart ;
+}
+
+void wxWindowMac::MacControlUserPaneBackgroundProc(void* info) 
+{
+}

 
 

-// Find an item given the Macintosh Window Reference
+ControlUserPaneDrawUPP gControlUserPaneDrawUPP = NULL ;
+ControlUserPaneHitTestUPP gControlUserPaneHitTestUPP = NULL ;
+ControlUserPaneTrackingUPP gControlUserPaneTrackingUPP = NULL ;
+ControlUserPaneIdleUPP gControlUserPaneIdleUPP = NULL ;
+ControlUserPaneKeyDownUPP gControlUserPaneKeyDownUPP = NULL ;
+ControlUserPaneActivateUPP gControlUserPaneActivateUPP = NULL ;
+ControlUserPaneFocusUPP gControlUserPaneFocusUPP = NULL ;
+ControlUserPaneBackgroundUPP gControlUserPaneBackgroundUPP = NULL ;

 
 

-wxList *wxWinMacWindowList = NULL;
-wxWindow *wxFindWinFromMacWindow(WindowRef inWindowRef)
+// ===========================================================================
+// implementation
+// ===========================================================================
+
+wxList wxWinMacControlList(wxKEY_INTEGER);
+
+wxWindow *wxFindControlFromMacControl(ControlRef inControl )

 {
 {

-    wxNode *node = wxWinMacWindowList->Find((long)inWindowRef);
+    wxNode *node = wxWinMacControlList.Find((long)inControl);

     if (!node)
         return NULL;
     if (!node)
         return NULL;

-    return (wxWindow *)node->Data();
+    return (wxControl *)node->GetData();

 }
 
 }
 

-void wxAssociateWinWithMacWindow(WindowRef inWindowRef, wxWindow *win)
+void wxAssociateControlWithMacControl(ControlRef inControl, wxWindow *control)

 {
 {

-    // 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" );
+    // adding NULL ControlRef is (first) surely a result of an error and
+    // (secondly) breaks native event processing
+    wxCHECK_RET( inControl != (ControlRef) NULL, wxT("attempt to add a NULL WindowRef to window list") );

 
 

-    if ( !wxWinMacWindowList->Find((long)inWindowRef) )
-        wxWinMacWindowList->Append((long)inWindowRef, win);
+    if ( !wxWinMacControlList.Find((long)inControl) )
+        wxWinMacControlList.Append((long)inControl, control);

 }
 
 }
 

-void wxRemoveMacWindowAssociation(wxWindow *win)
+void wxRemoveMacControlAssociation(wxWindow *control)

 {
 {

-    wxWinMacWindowList->DeleteObject(win);
+    wxWinMacControlList.DeleteObject(control);

 }
 
 }
 

-// ----------------------------------------------------------------------------
-// constructors and such
-// ----------------------------------------------------------------------------
+// UPP functions
+ControlActionUPP wxMacLiveScrollbarActionUPP = NULL ;
+
+ControlColorUPP wxMacSetupControlBackgroundUPP = NULL ;

 
 

-void wxWindow::Init()
+// we have to setup the brush in the current port and return noErr
+// or return an error code so that the control manager walks further up the 
+// hierarchy to find a correct background
+
+pascal OSStatus wxMacSetupControlBackground( ControlRef iControl , SInt16 iMessage , SInt16 iDepth , Boolean iIsColor )

 {
 {

-    // generic
-    InitBase();
+    OSStatus status = paramErr ;
+    switch( iMessage )
+    {
+        case kControlMsgApplyTextColor :
+            break ;
+        case kControlMsgSetUpBackground :
+            {
+                wxWindow*  wx = (wxWindow*) wxFindControlFromMacControl( iControl ) ;
+                if ( wx != NULL )
+                {
+                    /*
+                    const wxBrush &brush = wx->MacGetBackgroundBrush() ;
+                    if  ( brush.Ok() )
+                    {
+                        
+                        wxDC::MacSetupBackgroundForCurrentPort( brush ) ;
+                        */
+                        // this clipping is only needed for non HIView
+                        
+                        RgnHandle clip = NewRgn() ;
+                        int x = 0 , y = 0;
+
+                        wx->MacWindowToRootWindow( &x,&y ) ;
+                        CopyRgn( (RgnHandle) wx->MacGetVisibleRegion().GetWXHRGN() , clip ) ;
+                        OffsetRgn( clip , x , y ) ;
+                        SetClip( clip ) ;
+                        DisposeRgn( clip ) ;
+
+                        status = noErr ;
+                        /*
+                    }
+                    else if ( wx->MacIsUserPane() )
+                    {
+                        // if we don't have a valid brush for such a control, we have to call the
+                        // setup of our parent ourselves
+                        status = SetUpControlBackground( (ControlRef) wx->GetParent()->GetHandle() , iDepth , iIsColor ) ;
+                    }
+                    */
+                }
+            }
+            break ;
+        default :
+            break ;
+    }
+    return status ;
+}

 
 

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

 
 

-    m_isBeingDeleted = FALSE;
+pascal void wxMacLiveScrollbarActionProc( ControlRef control , ControlPartCode partCode ) ;
+pascal void wxMacLiveScrollbarActionProc( ControlRef control , ControlPartCode partCode )
+{
+    if ( partCode != 0)
+    {
+        wxWindow*  wx = wxFindControlFromMacControl( control ) ;
+        if ( wx )
+        {
+            wx->MacHandleControlClick( (WXWidget) control , partCode , true /* stillDown */ ) ;
+        }
+    }
+}

 
 

-    m_useCtl3D = FALSE;
-    m_mouseInWindow = FALSE;
+// ----------------------------------------------------------------------------
+ // constructors and such
+// ----------------------------------------------------------------------------

 
 

-    m_xThumbSize = 0;
-    m_yThumbSize = 0;
+void wxWindowMac::Init()
+{

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

-       m_macWindowData = NULL ;
+    m_hScrollBar = NULL ;
+    m_vScrollBar = NULL ;
+    m_macBackgroundBrush = wxNullBrush ;
+
+       m_macControl = NULL ;

 
 

-       m_x = 0;
-       m_y = 0 ;       
-       m_width = 0 ;
-       m_height = 0 ;
+    m_macIsUserPane = TRUE;
+    
+    // make sure all proc ptrs are available
+    
+    if ( gControlUserPaneDrawUPP == NULL )
+    {
+        gControlUserPaneDrawUPP = NewControlUserPaneDrawUPP( wxMacControlUserPaneDrawProc ) ;
+        gControlUserPaneHitTestUPP = NewControlUserPaneHitTestUPP( wxMacControlUserPaneHitTestProc ) ;
+        gControlUserPaneTrackingUPP = NewControlUserPaneTrackingUPP( wxMacControlUserPaneTrackingProc ) ;
+        gControlUserPaneIdleUPP = NewControlUserPaneIdleUPP( wxMacControlUserPaneIdleProc ) ;
+        gControlUserPaneKeyDownUPP = NewControlUserPaneKeyDownUPP( wxMacControlUserPaneKeyDownProc ) ;
+        gControlUserPaneActivateUPP = NewControlUserPaneActivateUPP( wxMacControlUserPaneActivateProc ) ;
+        gControlUserPaneFocusUPP = NewControlUserPaneFocusUPP( wxMacControlUserPaneFocusProc ) ;
+        gControlUserPaneBackgroundUPP = NewControlUserPaneBackgroundUPP( wxMacControlUserPaneBackgroundProc ) ;
+    }
+    if ( wxMacLiveScrollbarActionUPP == NULL )
+    {
+        wxMacLiveScrollbarActionUPP = NewControlActionUPP( wxMacLiveScrollbarActionProc );
+    }

 
 

-       m_hScrollBar = NULL ;
-       m_vScrollBar = NULL ;
+    if ( wxMacSetupControlBackgroundUPP == NULL )
+    {
+        wxMacSetupControlBackgroundUPP = NewControlColorUPP( wxMacSetupControlBackground ) ;
+    }

 
 

-#if  wxUSE_DRAG_AND_DROP
-  m_pDropTarget = NULL;
-#endif

 }
 
 // Destructor
 }
 
 // Destructor

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

 {
 {

+    SendDestroyEvent();
+

     m_isBeingDeleted = TRUE;
 
     m_isBeingDeleted = TRUE;
 

-       if ( s_lastMouseWindow == this )
-       {
-               s_lastMouseWindow = NULL ;
-       }
+#ifndef __WXUNIVERSAL__
+    // VS: make sure there's no wxFrame with last focus set to us:
+    for ( wxWindow *win = GetParent(); win; win = win->GetParent() )
+    {
+        wxFrame *frame = wxDynamicCast(win, wxFrame);
+        if ( frame )
+        {
+            if ( frame->GetLastFocus() == this )
+            {
+                frame->SetLastFocus((wxWindow*)NULL);
+            }
+            break;
+        }
+    }
+#endif // __WXUNIVERSAL__
+    
+    // wxRemoveMacControlAssociation( this ) ;
+    // If we delete an item, we should initialize the parent panel,
+    // because it could now be invalid.
+    wxWindow *parent = GetParent() ;
+    if ( parent )
+    {
+        if (parent->GetDefaultItem() == (wxButton*) this)
+            parent->SetDefaultItem(NULL);
+    }
+    if ( (ControlRef) m_macControl )
+    {
+        // in case the callback might be called during destruction
+        wxRemoveMacControlAssociation( this) ;
+        ::SetControlColorProc( (ControlRef) m_macControl , NULL ) ;
+        ::DisposeControl( (ControlRef) m_macControl ) ;
+        m_macControl = NULL ;
+    }

 
 

-    if ( gFocusWindow == this )
+    if ( g_MacLastWindow == this )
+    {
+        g_MacLastWindow = NULL ;
+    }
+
+    wxFrame* frame = wxDynamicCast( wxGetTopLevelParent( this ) , wxFrame ) ;
+    if ( frame )

     {
     {

-       gFocusWindow = NULL ;
+        if ( frame->GetLastFocus() == this )
+            frame->SetLastFocus( NULL ) ;

     }
 
     }
 

-    if ( m_parent )
-        m_parent->RemoveChild(this);
+    if ( gFocusWindow == this )
+    {
+        gFocusWindow = NULL ;
+    }

 
     DestroyChildren();
 
 
     DestroyChildren();
 

-       if ( m_macWindowData )
-       {
-       UMADisposeWindow( m_macWindowData->m_macWindow ) ;
-       delete m_macWindowData ;
-       wxRemoveMacWindowAssociation( this ) ;
+    // delete our drop target if we've got one
+#if wxUSE_DRAG_AND_DROP
+    if ( m_dropTarget != NULL )
+    {
+        delete m_dropTarget;
+        m_dropTarget = NULL;

     }
     }

+#endif // wxUSE_DRAG_AND_DROP
+}
+
+//
+
+void wxWindowMac::MacInstallEventHandler()
+{
+    InstallControlEventHandler( (ControlRef) m_macControl, GetwxMacWindowEventHandlerUPP(),
+        GetEventTypeCount(eventList), eventList, this, 
+        (EventHandlerRef *)&m_macControlEventHandler);
+

 }
 
 // Constructor
 }
 
 // Constructor

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

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

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

 
     if ( !CreateBase(parent, id, pos, size, style, wxDefaultValidator, name) )
         return FALSE;
 
     parent->AddChild(this);
 
 
     if ( !CreateBase(parent, id, pos, size, style, wxDefaultValidator, name) )
         return FALSE;
 
     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 ) ;
+    m_windowVariant = parent->GetWindowVariant() ;
+        
+    if ( m_macIsUserPane )
+    {
+        Rect bounds = wxMacGetBoundsForControl( this , pos , size ) ;
+        
+        UInt32 features = kControlSupportsEmbedding | kControlSupportsLiveFeedback /*| kControlHasSpecialBackground */ | kControlSupportsCalcBestRect | kControlHandlesTracking | kControlSupportsFocus | kControlWantsActivate | kControlWantsIdle; 
+
+        ::CreateUserPaneControl( MAC_WXHWND(GetParent()->MacGetTopLevelWindowRef()) , &bounds, features, (ControlRef*) &m_macControl); 
+
+        MacPostControlCreate(pos,size) ;
+#if !TARGET_API_MAC_OSX
+        SetControlData((ControlRef) m_macControl,kControlEntireControl,kControlUserPaneDrawProcTag, 
+               sizeof(gControlUserPaneDrawUPP),(Ptr) &gControlUserPaneDrawUPP);
+        SetControlData((ControlRef) m_macControl,kControlEntireControl,kControlUserPaneHitTestProcTag, 
+               sizeof(gControlUserPaneHitTestUPP),(Ptr) &gControlUserPaneHitTestUPP);
+        SetControlData((ControlRef) m_macControl,kControlEntireControl,kControlUserPaneTrackingProcTag, 
+               sizeof(gControlUserPaneTrackingUPP),(Ptr) &gControlUserPaneTrackingUPP);
+        SetControlData((ControlRef) m_macControl,kControlEntireControl,kControlUserPaneIdleProcTag, 
+               sizeof(gControlUserPaneIdleUPP),(Ptr) &gControlUserPaneIdleUPP);
+        SetControlData((ControlRef) m_macControl,kControlEntireControl,kControlUserPaneKeyDownProcTag, 
+               sizeof(gControlUserPaneKeyDownUPP),(Ptr) &gControlUserPaneKeyDownUPP);
+        SetControlData((ControlRef) m_macControl,kControlEntireControl,kControlUserPaneActivateProcTag, 
+               sizeof(gControlUserPaneActivateUPP),(Ptr) &gControlUserPaneActivateUPP);
+        SetControlData((ControlRef) m_macControl,kControlEntireControl,kControlUserPaneFocusProcTag, 
+               sizeof(gControlUserPaneFocusUPP),(Ptr) &gControlUserPaneFocusUPP);
+        SetControlData((ControlRef) m_macControl,kControlEntireControl,kControlUserPaneBackgroundProcTag, 
+               sizeof(gControlUserPaneBackgroundUPP),(Ptr) &gControlUserPaneBackgroundUPP);
+#endif        
+    }
+#ifndef __WXUNIVERSAL__
+    // Don't give scrollbars to wxControls unless they ask for them
+    if ( (! IsKindOf(CLASSINFO(wxControl)) && ! IsKindOf(CLASSINFO(wxStatusBar))) ||
+         (IsKindOf(CLASSINFO(wxControl)) && ( style & wxHSCROLL || style & wxVSCROLL)))
+    {
+        MacCreateScrollBars( style ) ;
+    }
+#endif

 
 

-    MacCreateScrollBars( style ) ;
+    wxWindowCreateEvent event(this);
+    GetEventHandler()->AddPendingEvent(event);

 
     return TRUE;
 }
 
 
     return TRUE;
 }
 

-void wxWindow::SetFocus()
+void wxWindowMac::MacPostControlCreate(const wxPoint& pos, const wxSize& size)

 {
 {

-       if ( AcceptsFocus() )
-       {
-               if (gFocusWindow )
-               {
-                       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 ;
-               {
-                       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) ;
-               }
-       }
+    wxASSERT_MSG( (ControlRef) m_macControl != NULL , wxT("No valid mac control") ) ;
+
+    wxAssociateControlWithMacControl( (ControlRef) m_macControl , this ) ;
+    ::SetControlReference( (ControlRef) m_macControl , (long) this ) ;
+
+    MacInstallEventHandler();
+
+    ControlRef container = (ControlRef) GetParent()->GetHandle() ;
+    wxASSERT_MSG( container != NULL , wxT("No valid mac container control") ) ;
+    ::EmbedControl( (ControlRef) m_macControl , container ) ;
+
+    // adjust font, controlsize etc
+    DoSetWindowVariant( m_windowVariant ) ;
+
+#if !TARGET_API_MAC_OSX
+    // eventually we can fix some clipping issues be reactivating this hook 
+    //if ( m_macIsUserPane )
+    // SetControlColorProc( (ControlRef) m_macControl , wxMacSetupControlBackgroundUPP ) ;
+#endif
+    
+    UMASetControlTitle( (ControlRef) m_macControl , wxStripMenuCodes(m_label) , m_font.GetEncoding() ) ;
+
+    wxSize new_size = size ;
+    if (!m_macIsUserPane)
+    {    
+        wxSize best_size( DoGetBestSize() );
+        
+        if (size.x == -1) {
+            new_size.x = best_size.x;
+        }
+        if (size.y == -1) {
+            new_size.y = best_size.y;
+        }
+        SetSize( pos.x, pos.y , new_size.x, new_size.y,wxSIZE_USE_EXISTING );
+    }
+
+    SetCursor( *wxSTANDARD_CURSOR ) ;
+

 }
 
 }
 

-bool wxWindow::Enable(bool enable)
+void wxWindowMac::DoSetWindowVariant( wxWindowVariant variant )

 {
 {

-    if ( !wxWindowBase::Enable(enable) )
-        return FALSE;
-/*
-    HWND hWnd = GetHwnd();
-    if ( hWnd )
-        ::EnableWindow(hWnd, (BOOL)enable);
-*/
+    wxASSERT( m_macControl != NULL ) ;

 
 

-    wxWindowList::Node *node = GetChildren().GetFirst();
-    while ( node )
-    {
-        wxWindow *child = node->GetData();
-        child->Enable(enable);
+    m_windowVariant = variant ; 

 
 

-        node = node->GetNext();
+       ControlSize size ;
+    ThemeFontID themeFont = kThemeSystemFont ;
+
+    // we will get that from the settings later
+    // and make this NORMAL later, but first 
+    // we have a few calculations that we must fix
+    
+    switch ( variant )
+    {
+        case wxWINDOW_VARIANT_NORMAL :
+            size = kControlSizeNormal; 
+               themeFont = kThemeSystemFont ;
+            break ;
+        case wxWINDOW_VARIANT_SMALL :
+            size = kControlSizeSmall; 
+               themeFont = kThemeSmallSystemFont ;
+            break ;
+        case wxWINDOW_VARIANT_MINI :
+           if (UMAGetSystemVersion() >= 0x1030 )
+            {
+                // not always defined in the headers 
+                size = 3 ; 
+                   themeFont = 109 ;
+            }
+            else
+            {
+                size = kControlSizeSmall; 
+                   themeFont = kThemeSmallSystemFont ;
+            }
+            break ;
+        case wxWINDOW_VARIANT_LARGE :
+            size = kControlSizeLarge; 
+               themeFont = kThemeSystemFont ;
+            break ;
+        default:
+            wxFAIL_MSG(_T("unexpected window variant"));
+            break ;

     }
     }

+       ::SetControlData( (ControlRef) m_macControl , kControlEntireControl, kControlSizeTag, sizeof( ControlSize ), &size );

 
 

-    return TRUE;
+    wxFont font ;
+    font.MacCreateThemeFont( themeFont ) ;
+    SetFont( font ) ;

 }
 
 }
 

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

 {
 {

-    wxTheApp->s_captureWindow = this ;
+       ControlFontStyleRec     fontStyle;
+       if ( m_font.MacGetThemeFontID() != kThemeCurrentPortFont )
+       {
+           switch( m_font.MacGetThemeFontID() )
+           {
+               case kThemeSmallSystemFont :    fontStyle.font = kControlFontSmallSystemFont ;  break ;
+               case 109 /*mini font */ :       fontStyle.font = -5 ;                           break ;
+               case kThemeSystemFont :         fontStyle.font = kControlFontBigSystemFont ;    break ;
+               default :                       fontStyle.font = kControlFontBigSystemFont ;    break ;
+           }
+           fontStyle.flags = kControlUseFontMask ; 
+       }
+       else
+       {
+           fontStyle.font = m_font.MacGetFontNum() ;
+           fontStyle.style = m_font.MacGetFontStyle() ;
+           fontStyle.size = m_font.MacGetFontSize() ;
+           fontStyle.flags = kControlUseFontMask | kControlUseFaceMask | kControlUseSizeMask ;
+       }
+
+    fontStyle.just = teJustLeft ;
+    fontStyle.flags |= kControlUseJustMask ;
+    if ( ( GetWindowStyle() & wxALIGN_MASK ) & wxALIGN_CENTER_HORIZONTAL )
+        fontStyle.just = teJustCenter ;
+    else if ( ( GetWindowStyle() & wxALIGN_MASK ) & wxALIGN_RIGHT )
+        fontStyle.just = teJustRight ;
+
+    
+    fontStyle.foreColor = MAC_WXCOLORREF(GetForegroundColour().GetPixel() ) ;
+    fontStyle.flags |= kControlUseForeColorMask ;
+       
+       ::SetControlFontStyle( (ControlRef) m_macControl , &fontStyle );
+       Refresh() ;

 }
 
 }
 

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

 {
 {

-    wxTheApp->s_captureWindow = NULL ;
+    bool retval = !wxWindowBase::SetFont( font ) ;
+    
+    MacUpdateControlFont() ;
+    
+    return retval;

 }
 
 }
 

-#if    wxUSE_DRAG_AND_DROP
+bool wxWindowMac::SetForegroundColour(const wxColour& col )
+{
+    if ( !wxWindowBase::SetForegroundColour(col) )
+        return false ;
+        
+    MacUpdateControlFont() ;
+    
+    return true ;
+}

 
 

-void wxWindow::SetDropTarget(wxDropTarget *pDropTarget)
+bool wxWindowMac::SetBackgroundColour(const wxColour& col )

 {
 {

-  if ( m_pDropTarget != 0 ) {
-    delete m_pDropTarget;
-  }
+    if ( !wxWindowBase::SetBackgroundColour(col) && m_hasBgCol )
+        return false ;

 
 

-  m_pDropTarget = pDropTarget;
-  if ( m_pDropTarget != 0 )
-  {
-    // TODO
-  }
+    wxBrush brush ;
+    if ( col == wxSystemSettings::GetColour(wxSYS_COLOUR_APPWORKSPACE) )
+    {
+        brush.MacSetTheme( kThemeBrushDocumentWindowBackground ) ;
+    }
+    else if (  col == wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE ) )
+    {
+        brush.MacSetTheme( kThemeBrushDialogBackgroundActive ) ; 
+    } 
+    else
+    {
+        brush.SetColour( col ) ;
+    }
+    MacSetBackgroundBrush( brush ) ;
+        
+    MacUpdateControlFont() ;
+    
+    return true ;

 }
 
 }
 

-#endif

 
 

-// Old style file-manager drag&drop
-void wxWindow::DragAcceptFiles(bool accept)
+bool wxWindowMac::MacCanFocus() const

 {
 {

-    // TODO
-}
+    wxASSERT( m_macControl != NULL ) ;

 
 

-// Get total size
-void wxWindow::DoGetSize(int *x, int *y) const
-{
-    *x = m_width ;
-    *y = m_height ;
+    return true ; 

 }
 
 }
 

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

 {
 {

-    *x = m_x ;
-    *y = m_y ;
-    if (GetParent())
+    if ( gFocusWindow == this )
+        return ;
+
+    if ( AcceptsFocus() )

     {
     {

-        wxPoint pt(GetParent()->GetClientAreaOrigin());
-        *x -= pt.x;
-        *y -= pt.y;
+        if (gFocusWindow )
+        {
+#if wxUSE_CARET
+                // Deal with caret
+                if ( gFocusWindow->m_caret )
+                {
+                      gFocusWindow->m_caret->OnKillFocus();
+                }
+#endif // wxUSE_CARET
+#ifndef __WXUNIVERSAL__
+            wxWindow* control = wxDynamicCast( gFocusWindow , wxWindow ) ;
+            // TODO we must use the built-in focusing
+            if ( control && control->GetHandle() /* && control->MacIsReallyShown() */ )
+            {
+                UMASetKeyboardFocus( (WindowRef) gFocusWindow->MacGetTopLevelWindowRef() , (ControlRef) control->GetHandle()  , kControlFocusNoPart ) ;
+                control->MacRedrawControl() ;
+            }
+#endif
+            // Without testing the window id, for some reason
+            // a kill focus event can still be sent to
+            // the control just being focussed.
+            int thisId = this->m_windowId;
+            int gFocusWindowId = gFocusWindow->m_windowId;
+            if (gFocusWindowId != thisId)
+            {
+                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);
+            GetEventHandler()->ProcessEvent(eventFocus);
+
+      #ifndef __WXUNIVERSAL__
+            wxControl* control = wxDynamicCast( gFocusWindow , wxControl ) ;
+            if ( control && control->GetHandle() )
+            {
+                UMASetKeyboardFocus( (WindowRef) gFocusWindow->MacGetTopLevelWindowRef() , (ControlRef) control->GetHandle()  , kControlFocusNextPart ) ;
+            }
+      #endif
+            wxFocusEvent event(wxEVT_SET_FOCUS, m_windowId);
+            event.SetEventObject(this);
+            GetEventHandler()->ProcessEvent(event) ;
+        }

     }
 }
 
     }
 }
 

-wxSize wxWindow::DoGetBestSize()
+
+void wxWindowMac::DoCaptureMouse()

 {
 {

-       return wxSize( 0 , 0 ) ;
+    wxTheApp->s_captureWindow = this ;

 }
 
 }
 

-bool wxWindow::Reparent(wxWindow *parent)
+wxWindow* wxWindowBase::GetCapture()

 {
 {

-    if ( !wxWindowBase::Reparent(parent) )
-        return FALSE;
+    return wxTheApp->s_captureWindow ;
+}

 
 

-    return TRUE;
+void wxWindowMac::DoReleaseMouse()
+{
+    wxTheApp->s_captureWindow = NULL ;

 }
 
 }
 

-bool wxWindow::DoPopupMenu(wxMenu *menu, int x, int y)
+#if    wxUSE_DRAG_AND_DROP
+
+void wxWindowMac::SetDropTarget(wxDropTarget *pDropTarget)

 {
 {

-       menu->SetInvokingWindow(this);
-    menu->UpdateUI();
-       ClientToScreen( &x , &y ) ;
+    if ( m_dropTarget != 0 ) {
+        delete m_dropTarget;
+    }
+
+    m_dropTarget = pDropTarget;
+    if ( m_dropTarget != 0 )
+    {
+        // 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);
+#endif

 
 

-  return TRUE;
+// Old style file-manager drag&drop
+void wxWindowMac::DragAcceptFiles(bool accept)
+{
+    // TODO

 }
 
 }
 

-void wxWindow::DoScreenToClient(int *x, int *y) const
+void wxWindowMac::MacGetPositionAndSizeFromControl(int& x, int& y,
+                                           int& w, int& h) const 

 {
 {

-       WindowRef window = GetMacRootWindow() ;
+    Rect bounds ;
+    GetControlBounds( (ControlRef) m_macControl , &bounds ) ;   

 
 

-       Point           localwhere ;
-       localwhere.h = * x ;
-       localwhere.v = * y ;

 
 

-       GrafPtr         port ;  
-       ::GetPort( &port ) ;
-       ::SetPort( UMAGetWindowPort( window ) ) ;
-       ::GlobalToLocal( &localwhere ) ;
-       ::SetPort( port ) ;
+    x = bounds.left ;
+    y = bounds.top ;
+    w = bounds.right - bounds.left ;
+    h = bounds.bottom - bounds.top ;

 
 

-       *x = localwhere.h ;
-       *y = localwhere.v ;
-       
-       MacRootWindowToClient( x , y ) ;
+    wxTopLevelWindow* tlw = wxDynamicCast( this , wxTopLevelWindow ) ;
+    if ( tlw )
+    {
+        Point tlworigin =  { 0 , 0  } ;
+        GrafPtr port ;
+        ::GetPort( &port ) ;
+        ::SetPort( UMAGetWindowPort( (WindowRef) tlw->MacGetWindowRef() ) ) ;
+        ::LocalToGlobal( &tlworigin ) ;
+        ::SetPort( port ) ;
+        x = tlworigin.h ;
+        y = tlworigin.v ;    
+    }

 }
 
 }
 

-void wxWindow::DoClientToScreen(int *x, int *y) const
+bool wxWindowMac::MacGetBoundsForControl(const wxPoint& pos,
+                                       const wxSize& size,
+                                       int& x, int& y,
+                                       int& w, int& h) 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 ;
-}
+    x = (int)pos.x;
+    y = (int)pos.y;
+    // todo the default calls may be used as soon as PostCreateControl Is moved here
+    w = size.x ; // WidthDefault( size.x );
+    h = size.y ; // HeightDefault( size.y ) ;
+#if !TARGET_API_MAC_OSX
+    GetParent()->MacWindowToRootWindow( &x , &y ) ;
+#endif

 
 

-void wxWindow::MacClientToRootWindow( int *x , int *y ) const
-{
-       if ( m_macWindowData )
-       {
-       }
-       else
-       {
-               *x += m_x ;
-               *y += m_y ;
-               GetParent()->MacClientToRootWindow( x , y ) ;
-       }
+    return true ;

 }
 
 }
 

-void wxWindow::MacRootWindowToClient( int *x , int *y ) const
-{
-       if ( m_macWindowData )
-       {
-       }
-       else
-       {
-               *x -= m_x ;
-               *y -= m_y ;
-               GetParent()->MacRootWindowToClient( x , y ) ;
-       }
+// Get total size
+void wxWindowMac::DoGetSize(int *x, int *y) const
+{
+#if TARGET_API_MAC_OSX
+    int x1 , y1 , w1 ,h1 ;
+    MacGetPositionAndSizeFromControl( x1 , y1, w1 ,h1 ) ;
+    if(x)   *x = w1 ;
+    if(y)   *y = h1 ;
+    
+#else
+    Rect bounds ;
+    GetControlBounds( (ControlRef) m_macControl , &bounds ) ;   
+    if(x)   *x = bounds.right - bounds.left ;
+    if(y)   *y = bounds.bottom - bounds.top ;
+#endif

 }
 
 }
 

-bool wxWindow::SetCursor(const wxCursor& cursor)
+void wxWindowMac::DoGetPosition(int *x, int *y) const

 {
 {

-   if ( !wxWindowBase::SetCursor(cursor) )
-   {
-       // no change
-       return FALSE;
-   }
+ #if TARGET_API_MAC_OSX
+    int x1 , y1 , w1 ,h1 ;
+    MacGetPositionAndSizeFromControl( x1 , y1, w1 ,h1 ) ;
+    if ( !IsTopLevel() )
+    {
+        wxWindow *parent = GetParent();
+        if ( parent )
+        {
+            wxPoint pt(parent->GetClientAreaOrigin());
+            x1 -= pt.x ;
+            y1 -= pt.y ;
+        }
+    }
+    if(x)   *x = x1 ;
+    if(y)   *y = y1 ;
+ #else
+    Rect bounds ;
+    GetControlBounds( (ControlRef) m_macControl , &bounds ) ;   
+    wxCHECK_RET( GetParent() , wxT("Missing Parent") ) ;
+    
+    int xx = bounds.left ;
+    int yy = bounds.top ;
+    
+    if ( !GetParent()->IsTopLevel() )
+    {
+        GetControlBounds( (ControlRef) GetParent()->GetHandle() , &bounds ) ;
+    
+        xx -= bounds.left ;
+        yy -= bounds.top ;
+    }
+    
+    wxPoint pt(GetParent()->GetClientAreaOrigin());
+    xx -= pt.x;
+    yy -= pt.y;

 
 

-  wxASSERT_MSG( m_cursor.Ok(),
-                  wxT("cursor must be valid after call to the base version"));
+    if(x)   *x = xx;
+    if(y)   *y = yy;
+#endif
+}

 
 

-  Point pt ;
-  wxWindow *mouseWin ;
-  GetMouse( &pt ) ;
-  
-  // Change the cursor NOW if we're within the correct window
+void wxWindowMac::DoScreenToClient(int *x, int *y) const
+{
+    WindowRef window = (WindowRef) MacGetTopLevelWindowRef() ;
+    
+    wxCHECK_RET( window , wxT("TopLevel Window Missing") ) ;
+    
+    {
+        Point localwhere = {0,0} ;

 
 

-  if ( MacGetWindowFromPoint( wxPoint( pt.h , pt.v ) , &mouseWin ) )
-  {
-       if ( mouseWin == this && !wxIsBusy() )
-       {
-               cursor.MacInstall() ;
-       }
-  }
+        if(x) localwhere.h = * x ;
+        if(y) localwhere.v = * y ;
+        
+        wxMacPortSaver s((GrafPtr)GetWindowPort( window )) ;
+        ::GlobalToLocal( &localwhere ) ;
+        if(x)   *x = localwhere.h ;
+        if(y)   *y = localwhere.v ;

 
 

-  return TRUE ;
+    }
+    MacRootWindowToWindow( x , y ) ;
+    
+    wxPoint origin = GetClientAreaOrigin() ;
+    if(x)   *x -= origin.x ;
+    if(y)   *y -= origin.y ;

 }
 
 }
 

-
-// Get size *available for subwindows* i.e. excluding menu bar etc.
-void wxWindow::DoGetClientSize(int *x, int *y) const
+void wxWindowMac::DoClientToScreen(int *x, int *y) const

 {
 {

-    *x = m_width ;
-    *y = m_height ;
+    WindowRef window = (WindowRef) MacGetTopLevelWindowRef() ;
+    wxCHECK_RET( window , wxT("TopLevel Window Missing") ) ;

 
 

-  if (m_vScrollBar && m_vScrollBar->IsShown() )
-       (*x) -= MAC_SCROLLBAR_SIZE;
-  if (m_hScrollBar  && m_hScrollBar->IsShown() )
-       (*y) -= MAC_SCROLLBAR_SIZE;
-}
+    wxPoint origin = GetClientAreaOrigin() ;
+    if(x)   *x += origin.x ;
+    if(y)   *y += origin.y ;

 
 

+    MacWindowToRootWindow( x , y ) ;

 
 

-// ----------------------------------------------------------------------------
-// tooltips
-// ----------------------------------------------------------------------------
-
-#if wxUSE_TOOLTIPS
+    {
+        Point localwhere = { 0,0 };
+        if(x)   localwhere.h = * x ;
+        if(y)   localwhere.v = * y ;
+
+        wxMacPortSaver s((GrafPtr)GetWindowPort( window )) ;
+        ::LocalToGlobal( &localwhere ) ;
+        if(x)   *x = localwhere.h ;
+        if(y)   *y = localwhere.v ;
+    }
+}

 
 

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

 {
 {

-    wxWindowBase::DoSetToolTip(tooltip);
+    wxPoint origin = GetClientAreaOrigin() ;
+    if(x)   *x += origin.x ;
+    if(y)   *y += origin.y ;

 
 

-//    if ( m_tooltip )
-//        m_tooltip->SetWindow(this);
+    MacWindowToRootWindow( x , y ) ;

 }
 
 }
 

-#endif // wxUSE_TOOLTIPS
-
-void wxWindow::DoMoveWindow(int x, int y, int width, int height)
+void wxWindowMac::MacRootWindowToClient( int *x , int *y ) const

 {
 {

-       DoSetSize( x,y, width, height ) ;
+    MacRootWindowToWindow( x , y ) ;
+
+    wxPoint origin = GetClientAreaOrigin() ;
+    if(x)   *x -= origin.x ;
+    if(y)   *y -= origin.y ;

 }
 
 }
 

-void wxWindow::DoSetSize(int x, int y, int width, int height, int sizeFlags)
+void wxWindowMac::MacWindowToRootWindow( int *x , int *y ) const

 {
 {

-       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 TARGET_API_MAC_OSX
+    HIPoint pt ;
+    if ( x ) pt.x = *x ;
+    if ( y ) pt.y = *y ;

 
 

-       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);
+    HIViewConvertPoint( &pt , (ControlRef) m_macControl , (ControlRef) MacGetTopLevelWindow()->GetHandle()  ) ;
+    
+    if ( x ) *x = (int) pt.x ;
+    if ( y ) *y = (int) pt.y ;
+ #else
+    if ( !IsTopLevel() )
+    {
+        Rect bounds ;
+        GetControlBounds( (ControlRef) m_macControl , &bounds ) ;   
+        if(x)   *x += bounds.left ;
+        if(y)   *y += bounds.top ;

     }
     }

-       }
+#endif

 }
 }

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

 
 

-wxPoint wxWindow::GetClientAreaOrigin() const
+void wxWindowMac::MacWindowToRootWindow( short *x , short *y ) const

 {
 {

-    return wxPoint(0, 0);
+    int x1 , y1 ;
+    if ( x ) x1 = *x ;
+    if ( y ) y1 = *y ;
+    MacWindowToRootWindow( &x1 , &y1 ) ;
+    if ( x ) *x = x1 ;
+    if ( y ) *y = y1 ;

 }
 
 }
 

-// Makes an adjustment to the window position (for example, a frame that has
-// a toolbar that it manages itself).
-void wxWindow::AdjustForParentClientOrigin(int& x, int& y, int sizeFlags)
+void wxWindowMac::MacRootWindowToWindow( int *x , int *y ) const

 {
 {

-       if( !m_macWindowData )
-       {
-    if (((sizeFlags & wxSIZE_NO_ADJUSTMENTS) == 0) && GetParent())
+ #if TARGET_API_MAC_OSX
+    HIPoint pt ;
+    if ( x ) pt.x = *x ;
+    if ( y ) pt.y = *y ;
+
+    HIViewConvertPoint( &pt , (ControlRef) MacGetTopLevelWindow()->GetHandle()  , (ControlRef) m_macControl ) ;
+    
+    if ( x ) *x = (int) pt.x ;
+    if ( y ) *y = (int) pt.y ;
+ #else
+    if ( !IsTopLevel() )

     {
     {

-        wxPoint pt(GetParent()->GetClientAreaOrigin());
-        x += pt.x; y += pt.y;
+        Rect bounds ;
+        GetControlBounds( (ControlRef) m_macControl , &bounds ) ;   
+        if(x)   *x -= bounds.left ;
+        if(y)   *y -= bounds.top ;

     }
     }

-   }
+#endif

 }
 
 }
 

-void wxWindow::SetTitle(const wxString& title)
+void wxWindowMac::MacRootWindowToWindow( short *x , short *y ) const

 {
 {

-       m_label = title ;
-       
-       wxString label ;
-       
-       if( wxApp::s_macDefaultEncodingIsPC )
-               label = wxMacMakeMacStringFromPC( title ) ;
-       else
-               label = title ;
-
-       if ( m_macWindowData )
-       UMASetWTitleC( m_macWindowData->m_macWindow , label ) ;
+    int x1 , y1 ;
+    if ( x ) x1 = *x ;
+    if ( y ) y1 = *y ;
+    MacRootWindowToWindow( &x1 , &y1 ) ;
+    if ( x ) *x = x1 ;
+    if ( y ) *y = y1 ;

 }
 
 }
 

-wxString wxWindow::GetTitle() const
+wxSize wxWindowMac::DoGetSizeFromClientSize( const wxSize & size )  const

 {
 {

-       return m_label ;
-}
+    wxSize sizeTotal = size;

 
 

-bool wxWindow::Show(bool show)
-{
-    if ( !wxWindowBase::Show(show) )
-        return FALSE;
+    RgnHandle rgn = NewRgn() ;

 
 

-       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 ) ;
-         }
-       }
-       Refresh() ;
+    Rect content ;
+    
+    if ( GetControlRegion( (ControlRef) m_macControl , kControlContentMetaPart , rgn ) == noErr )
+    {
+        GetRegionBounds( rgn , &content ) ;
+        DisposeRgn( rgn ) ;
+    }
+    else
+    {
+        GetControlBounds( (ControlRef) m_macControl , &content ) ;
+    }
+    Rect structure ;
+    GetControlBounds( (ControlRef) m_macControl , &structure ) ;
+#if !TARGET_API_MAC_OSX    
+    OffsetRect( &content , -structure.left , -structure.top ) ;
+#endif

 
 

-    return TRUE;
-}
+    sizeTotal.x += (structure.right - structure.left) - (content.right - content.left) ;
+    sizeTotal.y += (structure.bottom - structure.top) - (content.bottom - content.top ) ; 

 
 

-int wxWindow::GetCharHeight() const
-{
-       wxClientDC dc ( (wxWindow*)this ) ;
-       return dc.GetCharHeight() ;
-}
+    sizeTotal.x += MacGetLeftBorderSize(  ) + MacGetRightBorderSize( ) ;
+    sizeTotal.y += MacGetTopBorderSize(  ) + MacGetBottomBorderSize( ) ;

 
 

-int wxWindow::GetCharWidth() const
-{
-       wxClientDC dc ( (wxWindow*)this ) ;
-       return dc.GetCharWidth() ;
+    return sizeTotal;

 }
 
 }
 

-void wxWindow::GetTextExtent(const wxString& string, int *x, int *y,
-                           int *descent, int *externalLeading, const wxFont *theFont ) const
+
+// Get size *available for subwindows* i.e. excluding menu bar etc.
+void wxWindowMac::DoGetClientSize(int *x, int *y) const

 {
 {

-    const wxFont *fontToUse = theFont;
-    if ( !fontToUse )
-        fontToUse = &m_font;
-/*
-    if ( x )
-        *x = sizeRect.cx;
-    if ( y )
-        *y = sizeRect.cy;
-    if ( descent )
-        *descent = tm.tmDescent;
-    if ( externalLeading )
-        *externalLeading = tm.tmExternalLeading;
-*/
+    int ww, hh;

 
 

-}
+    RgnHandle rgn = NewRgn() ;
+    Rect content ;
+    if ( GetControlRegion( (ControlRef) m_macControl , kControlContentMetaPart , rgn ) == noErr )
+    {
+        GetRegionBounds( rgn , &content ) ;
+        DisposeRgn( rgn ) ;
+    }
+    else
+    {
+        GetControlBounds( (ControlRef) m_macControl , &content ) ;
+    }
+#if !TARGET_API_MAC_OSX
+    Rect structure ;
+    GetControlBounds( (ControlRef) m_macControl , &structure ) ;
+    OffsetRect( &content , -structure.left , -structure.top ) ;
+#endif 
+    ww = content.right - content.left ;
+    hh = content.bottom - content.top ;
+    
+    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  ;
+        int h  ;
+        GetSize( &w , &h ) ;
+        
+        MacClientToRootWindow( &x1 , &y1 ) ;
+        MacClientToRootWindow( &w , &h ) ;
+
+        wxWindowMac *iter = (wxWindowMac*)this ;
+
+        int totW = 10000 , totH = 10000;
+        while( iter )
+        {
+            if ( iter->IsTopLevel() )
+            {
+                iter->GetSize( &totW , &totH ) ;
+                break ;
+            }

 
 

-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()) ;
-       }
+            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;

 
 

-       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)
+bool wxWindowMac::SetCursor(const wxCursor& cursor)

 {
 {

-       wxMacDrawingClientHelper focus( this ) ;
-       if ( focus.Ok() )
-       {
-       int width , height ;
-       GetClientSize( &width , &height ) ;
-       Rect clientrect = { 0 , 0 , height , width } ;
-       ClipRect( &clientrect ) ;
+    if (m_cursor == cursor)
+        return FALSE;

 
 

-    if ( rect )
+    if (wxNullCursor == cursor)

     {
     {

-       Rect r = { rect->y , rect->x , rect->y + rect->height , rect->x + rect->width } ;
-                       SectRect( &clientrect , &r , &clientrect ) ;            
+        if ( ! wxWindowBase::SetCursor( *wxSTANDARD_CURSOR ) )
+            return FALSE ;

     }
     }

-    InvalRect( &clientrect ) ;
+    else
+    {
+        if ( ! wxWindowBase::SetCursor( cursor ) )
+            return FALSE ;
+    }
+
+    wxASSERT_MSG( m_cursor.Ok(),
+        wxT("cursor must be valid after call to the base version"));
+

     /*
     /*

-    if ( eraseBack )
+    
+    TODO why do we have to use current coordinates ?
+    
+    Point pt ;
+    wxWindowMac *mouseWin ;
+    GetMouse( &pt ) ;
+
+    // Change the cursor NOW if we're within the correct window
+
+    
+    if ( MacGetWindowFromPoint( wxPoint( pt.h , pt.v ) , &mouseWin ) )

     {
     {

-       MacEraseBackground( &clientrect ) ;
-       }
-       */
-       }
+        if ( mouseWin == this && !wxIsBusy() )
+        {
+            m_cursor.MacInstall() ;
+        }
+    }
+    */
+    if ( !wxIsBusy() )
+    {
+        m_cursor.MacInstall() ;
+    }
+
+    return TRUE ;

 }
 
 }
 

-// Responds to colour changes: passes event on to children.
-void wxWindow::OnSysColourChanged(wxSysColourChangedEvent& event)
+#if wxUSE_MENUS
+bool wxWindowMac::DoPopupMenu(wxMenu *menu, int x, int y)

 {
 {

-    wxNode *node = GetChildren().First();
-    while ( node )
+    menu->SetInvokingWindow(this);
+    menu->UpdateUI();
+    ClientToScreen( &x , &y ) ;
+
+    menu->MacBeforeDisplay( true ) ;
+    long menuResult = ::PopUpMenuSelect((MenuHandle) menu->GetHMenu() ,y,x, 0) ;
+    if ( HiWord(menuResult) != 0 )

     {
     {

-        // Only propagate to non-top-level windows
-        wxWindow *win = (wxWindow *)node->Data();
-        if ( win->GetParent() )
+        MenuCommand id ;
+        GetMenuItemCommandID( GetMenuHandle(HiWord(menuResult)) , LoWord(menuResult) , &id ) ;
+        wxMenuItem* item = NULL ;
+        wxMenu* realmenu ;
+        item = menu->FindItem(id, &realmenu) ;
+        if (item->IsCheckable())

         {
         {

-            wxSysColourChangedEvent event2;
-            event.m_eventObject = win;
-            win->GetEventHandler()->ProcessEvent(event2);
+            item->Check( !item->IsChecked() ) ;

         }
         }

-
-        node = node->Next();
+        menu->SendEvent( id , item->IsCheckable() ? item->IsChecked() : -1 ) ;

     }
     }

+    menu->MacAfterDisplay( true ) ;
+
+    menu->SetInvokingWindow(NULL);
+
+  return TRUE;

 }
 }

+#endif

 
 

-#if wxUSE_CARET && WXWIN_COMPATIBILITY
-// ---------------------------------------------------------------------------
-// Caret manipulation
-// ---------------------------------------------------------------------------
+// ----------------------------------------------------------------------------
+// tooltips
+// ----------------------------------------------------------------------------
+
+#if wxUSE_TOOLTIPS

 
 

-void wxWindow::CreateCaret(int w, int h)
+void wxWindowMac::DoSetToolTip(wxToolTip *tooltip)

 {
 {

-    SetCaret(new wxCaret(this, w, h));
+    wxWindowBase::DoSetToolTip(tooltip);
+
+    if ( m_tooltip )
+        m_tooltip->SetWindow(this);

 }
 
 }
 

-void wxWindow::CreateCaret(const wxBitmap *WXUNUSED(bitmap))
+#endif // wxUSE_TOOLTIPS
+
+void wxWindowMac::DoMoveWindow(int x, int y, int width, int height)

 {
 {

-    wxFAIL_MSG("not implemented");
+    int former_x , former_y , former_w, former_h ;
+#if !TARGET_API_MAC_OSX
+    DoGetPosition( &former_x , &former_y ) ;
+    DoGetSize( &former_w , &former_h ) ;
+#else
+    MacGetPositionAndSizeFromControl( former_x , former_y , former_w , former_h ) ;
+#endif
+
+    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 )
+    {
+        Rect r = wxMacGetBoundsForControl(this , wxPoint( actualX,actualY), wxSize( actualWidth, actualHeight ) ) ;
+#if TARGET_API_MAC_OSX
+        SetControlBounds( (ControlRef) m_macControl , &r ) ;
+#else
+        if ( doMove )
+            MoveControl( (ControlRef) m_macControl , r.left , r.top ) ;
+        if ( doSize )
+            SizeControl( (ControlRef) m_macControl , r.right-r.left , r.bottom-r.top ) ;
+#endif
+        MacRepositionScrollBars() ;
+        if ( doMove )
+        {
+            wxPoint point(actualX,actualY);
+            wxMoveEvent event(point, m_windowId);
+            event.SetEventObject(this);
+            GetEventHandler()->ProcessEvent(event) ;
+        }
+        if ( doResize )
+        {
+            MacRepositionScrollBars() ;
+            wxSize size(actualWidth, actualHeight);
+            wxSizeEvent event(size, m_windowId);
+            event.SetEventObject(this);
+            GetEventHandler()->ProcessEvent(event);
+        }
+    }
+

 }
 
 }
 

-void wxWindow::ShowCaret(bool show)
+wxSize wxWindowMac::DoGetBestSize() const

 {
 {

-    wxCHECK_RET( m_caret, "no caret to show" );
+    if ( m_macIsUserPane || IsTopLevel() )
+        return wxWindowBase::DoGetBestSize() ;
+        
+    Rect    bestsize = { 0 , 0 , 0 , 0 } ;
+    short   baselineoffset ;
+    int bestWidth, bestHeight ;
+    ::GetBestControlRect( (ControlRef) m_macControl , &bestsize , &baselineoffset ) ;
+
+    if ( EmptyRect( &bestsize ) )
+    {
+        baselineoffset = 0;
+        bestsize.left = bestsize.top = 0 ;
+        bestsize.right = 16 ;
+        bestsize.bottom = 16 ;
+        if ( IsKindOf( CLASSINFO( wxScrollBar ) ) )
+        {
+            bestsize.bottom = 16 ;
+        }
+        else if ( IsKindOf( CLASSINFO( wxSpinButton ) ) )
+        {
+            bestsize.bottom = 24 ; 
+        }
+        else
+        {
+            // return wxWindowBase::DoGetBestSize() ;  
+        }
+    }

 
 

-    m_caret->Show(show);
+    bestWidth = bestsize.right - bestsize.left ;
+    bestHeight = bestsize.bottom - bestsize.top ;
+    if ( bestHeight < 10 )
+        bestHeight = 13 ;
+        
+    return wxSize(bestWidth, bestHeight);
+//    return wxWindowBase::DoGetBestSize() ;

 }
 
 }
 

-void wxWindow::DestroyCaret()
+
+// 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)

 {
 {

-    SetCaret(NULL);
+    // 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 && ( height != -1 && width != -1 ) )
+    {
+        // TODO REMOVE
+        MacRepositionScrollBars() ; // we might have a real position shift
+        return;
+    }
+
+    if ( x == -1 && !(sizeFlags & wxSIZE_ALLOW_MINUS_ONE) )
+        x = currentX;
+    if ( y == -1 && !(sizeFlags & wxSIZE_ALLOW_MINUS_ONE) )
+        y = currentY;
+
+    AdjustForParentClientOrigin(x, y, sizeFlags);
+
+    wxSize size(-1, -1);
+    if ( width == -1 )
+    {
+        if ( sizeFlags & wxSIZE_AUTO_WIDTH )
+        {
+            size = DoGetBestSize();
+            width = size.x;
+        }
+        else
+        {
+            // just take the current one
+            width = currentW;
+        }
+    }
+
+    if ( height == -1 )
+    {
+        if ( sizeFlags & wxSIZE_AUTO_HEIGHT )
+        {
+            if ( size.x == -1 )
+            {
+                size = DoGetBestSize();
+            }
+            //else: already called DoGetBestSize() above
+
+            height = size.y;
+        }
+        else
+        {
+            // just take the current one
+            height = currentH;
+        }
+    }
+
+    DoMoveWindow(x, y, width, height);
+

 }
 
 }
 

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

 {
 {

-    wxCHECK_RET( m_caret, "no caret to move" );
+    RgnHandle rgn = NewRgn() ;
+    Rect content ;
+    GetControlRegion( (ControlRef) m_macControl , kControlContentMetaPart , rgn ) ;
+    GetRegionBounds( rgn , &content ) ;
+    DisposeRgn( rgn ) ;
+#if !TARGET_API_MAC_OSX
+    Rect structure ;
+    GetControlBounds( (ControlRef) m_macControl , &structure ) ;
+    OffsetRect( &content , -structure.left , -structure.top ) ;
+#endif 

 
 

-    m_caret->Move(x, y);
+    return wxPoint( content.left + MacGetLeftBorderSize(  ) , content.top + MacGetTopBorderSize(  ) );

 }
 
 }
 

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

 {
 {

-    wxCHECK_RET( m_caret, "no caret to get position of" );
+    if ( clientheight != -1 || clientheight != -1 )
+    {
+        int currentclientwidth , currentclientheight ;
+        int currentwidth , currentheight ;

 
 

-    m_caret->GetPosition(x, y);
+        GetClientSize( &currentclientwidth , &currentclientheight ) ;
+        GetSize( &currentwidth , &currentheight ) ;
+
+        DoSetSize( -1 , -1 , currentwidth + clientwidth - currentclientwidth ,
+            currentheight + clientheight - currentclientheight , wxSIZE_USE_EXISTING ) ;
+    }

 }
 }

-#endif // wxUSE_CARET

 
 

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

 {
 {

-    // actually this is a windows-only concept
-    return NULL;
+    m_label = wxStripMenuCodes(title) ;
+
+    if ( m_macControl )
+    {
+               UMASetControlTitle( (ControlRef) m_macControl , m_label , m_font.GetEncoding() ) ;
+    }
+    Refresh() ;

 }
 
 }
 

-// Coordinates relative to the window
-void wxWindow::WarpPointer (int x_pos, int y_pos)
+wxString wxWindowMac::GetTitle() const

 {
 {

-    // We really dont move the mouse programmatically under mac
+    return m_label ;

 }
 
 }
 

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

 {
 {

-    // TODO : probably we would adopt the EraseEvent structure
-    Default();
+    if ( !wxWindowBase::Show(show) )
+        return FALSE;
+    
+    // TODO use visibilityChanged Carbon Event for OSX
+    bool former = MacIsReallyShown() ;
+    
+    SetControlVisibility( (ControlRef) m_macControl , show , true ) ;
+    if ( former != MacIsReallyShown() )
+        MacPropagateVisibilityChanged() ;
+    return TRUE;

 }
 
 }
 

-int wxWindow::GetScrollPos(int orient) const
+bool wxWindowMac::Enable(bool enable)

 {
 {

-               if ( orient == wxHORIZONTAL )
-               {
-                       if ( m_hScrollBar )
-                               return m_hScrollBar->GetThumbPosition() ;
-               }
-               else
-               {
-                       if ( m_vScrollBar )
-                               return m_vScrollBar->GetThumbPosition() ;
-               }
-    return 0;
-}
+    wxASSERT( m_macControl != NULL ) ;
+    if ( !wxWindowBase::Enable(enable) )
+        return FALSE;

 
 

-// This now returns the whole range, not just the number
-// of positions that we can scroll.
-int wxWindow::GetScrollRange(int orient) const
-{
-               if ( orient == wxHORIZONTAL )
-               {
-                       if ( m_hScrollBar )
-                               return m_hScrollBar->GetRange() ;
-               }
-               else
-               {
-                       if ( m_vScrollBar )
-                               return m_vScrollBar->GetRange() ;
-               }
-    return 0;
-}
+    bool former = MacIsReallyEnabled() ;
+    if ( enable )
+        EnableControl( (ControlRef) m_macControl ) ;
+    else
+        DisableControl( (ControlRef) m_macControl ) ;

 
 

-int wxWindow::GetScrollThumb(int orient) const
-{
-               if ( orient == wxHORIZONTAL )
-               {
-                       if ( m_hScrollBar )
-                               return m_hScrollBar->GetThumbSize() ;
-               }
-               else
-               {
-                       if ( m_vScrollBar )
-                               return m_vScrollBar->GetThumbSize() ;
-               }
-    return 0;
+    if ( former != MacIsReallyEnabled() )
+        MacPropagateEnabledStateChanged() ;
+    return TRUE;

 }
 
 }
 

-void wxWindow::SetScrollPos(int orient, int pos, bool refresh)
-{
-               if ( orient == wxHORIZONTAL )
-               {
-                       if ( m_hScrollBar )
-                               m_hScrollBar->SetThumbPosition( pos ) ;
-               }
-               else
-               {
-                       if ( m_vScrollBar )
-                               m_vScrollBar->SetThumbPosition( pos ) ;
-               }
-}
+//  
+// status change propagations (will be not necessary for OSX later )
+//

 
 

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

 {
 {

-               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() ;
+#if !TARGET_API_MAC_OSX
+    MacVisibilityChanged() ;
+    
+    wxWindowListNode *node = GetChildren().GetFirst();
+    while ( node )
+    {
+        wxWindowMac *child = node->GetData();
+        if ( child->IsShown() )
+            child->MacPropagateVisibilityChanged(  ) ;
+        node = node->GetNext();
+    }
+#endif

 }
 
 }
 

-// Does a physical scroll
-void wxWindow::ScrollWindow(int dx, int dy, const wxRect *rect)
+void wxWindowMac::MacPropagateEnabledStateChanged( )

 {
 {

-       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 )
+#if !TARGET_API_MAC_OSX
+    MacEnabledStateChanged() ;
+    
+    wxWindowListNode *node = GetChildren().GetFirst();
+    while ( node )

     {
     {

-       Rect r = { rect->y , rect->x , rect->y + rect->height , rect->x + rect->width } ;
-                       SectRect( &scrollrect , &r , &scrollrect ) ;            
+        wxWindowMac *child = node->GetData();
+        if ( child->IsEnabled() )
+            child->MacPropagateEnabledStateChanged() ;
+        node = node->GetNext();

     }
     }

-       ScrollRect( &scrollrect , dx , dy , updateRgn ) ;
-    InvalRgn( updateRgn ) ;
-    DisposeRgn( updateRgn ) ;
-       }
+#endif

 }
 
 }
 

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

 {
 {

-    if ( !wxWindowBase::SetFont(font) )
+#if !TARGET_API_MAC_OSX
+    MacHiliteChanged() ;
+    
+    wxWindowListNode *node = GetChildren().GetFirst();
+    while ( node )

     {
     {

-        // nothing to do
-        return FALSE;
+        wxWindowMac *child = node->GetData();
+        // if ( child->IsEnabled() )
+            child->MacPropagateHiliteChanged() ;
+        node = node->GetNext();

     }
     }

-
-    return TRUE;
+#endif

 }
 
 }
 

-// Get the window with the focus
-wxWindow *wxWindowBase::FindFocus()
+//
+// status change notifications
+// 
+
+void wxWindowMac::MacVisibilityChanged() 

 {
 {

-       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::MacHiliteChanged() 

 {
 {

-    if ( GetEventHandler()->ProcessEvent(event)  )
-        return;
-    if ( m_parent )
-        m_parent->GetEventHandler()->OnCommand(win, event);

 }
 }

-#endif // WXWIN_COMPATIBILITY_2

 
 

-#if WXWIN_COMPATIBILITY
-wxObject* wxWindow::GetChild(int number) const
+void wxWindowMac::MacEnabledStateChanged() 

 {
 {

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

 
 

-void wxWindow::Clear()
+//
+// status queries on the inherited window's state
+//
+
+bool wxWindowMac::MacIsReallyShown() 

 {
 {

-       if ( m_macWindowData )
-       {
-               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 ) ;
-       }
-       else
-       {
-               wxClientDC dc(this);
-    wxBrush brush(GetBackgroundColour(), wxSOLID);
-    dc.SetBackground(brush);
-    dc.Clear();
-       }
+    // only under OSX the visibility of the TLW is taken into account
+#if TARGET_API_MAC_OSX
+    return IsControlVisible( (ControlRef) m_macControl ) ;
+#else
+    wxWindow* win = this ;
+    while( win->IsShown()  )
+    {
+        if ( win->IsTopLevel() )
+            return true ;
+        
+        win = win->GetParent() ;
+        if ( win == NULL )
+            return true ;
+            
+    } ;
+    return false ;
+#endif

 }
 
 }
 

-// Setup background and foreground colours correctly
-void wxWindow::SetupColours()
+bool wxWindowMac::MacIsReallyEnabled() 

 {
 {

-    if ( GetParent() )
-        SetBackgroundColour(GetParent()->GetBackgroundColour());
+    return IsControlEnabled( (ControlRef) m_macControl ) ;

 }
 
 }
 

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

 {
 {

-/*
-   // 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();
+    return IsControlActive( (ControlRef) m_macControl ) ;

 }
 
 }
 

-// Raise the window to the top of the Z order
-void wxWindow::Raise()
+//
+//
+//
+
+int wxWindowMac::GetCharHeight() const

 {
 {

-    // TODO
+    wxClientDC dc ( (wxWindowMac*)this ) ;
+    return dc.GetCharHeight() ;

 }
 
 }
 

-// Lower the window to the bottom of the Z order
-void wxWindow::Lower()
+int wxWindowMac::GetCharWidth() const

 {
 {

-    // TODO
+    wxClientDC dc ( (wxWindowMac*)this ) ;
+    return dc.GetCharWidth() ;

 }
 
 }
 

-void wxWindow::DoSetClientSize(int width, int height)
+void wxWindowMac::GetTextExtent(const wxString& string, int *x, int *y,
+                           int *descent, int *externalLeading, const wxFont *theFont ) const

 {
 {

-       if ( width != -1 || height != -1 )
-       {
-               
-               if ( width != -1 && m_vScrollBar )
-                       width += MAC_SCROLLBAR_SIZE ;
-               if ( height != -1 && m_vScrollBar )
-                       height += MAC_SCROLLBAR_SIZE ;
+    const wxFont *fontToUse = theFont;
+    if ( !fontToUse )
+        fontToUse = &m_font;

 
 

-               DoSetSize( -1 , -1 , width , height ) ;
-       }
+    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 ;

 }
 
 }
 

+/*
+ * Rect is given in client coordinates, for further reading, read wxTopLevelWindowMac::InvalidateRect
+ * we always intersect with the entire window, not only with the client area
+ */

 
 

-wxWindow* wxWindow::s_lastMouseWindow = NULL ;
-
-bool wxWindow::MacGetWindowFromPointSub( const wxPoint &point , wxWindow** outWin ) 
+void wxWindowMac::Refresh(bool eraseBack, const wxRect *rect)

 {
 {

-       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() ;
+#if TARGET_API_MAC_OSX
+    if ( rect == NULL )
+        HIViewSetNeedsDisplay( (ControlRef) m_macControl , true ) ; 
+    else
+    {
+        RgnHandle update = NewRgn() ;
+        SetRectRgn( update , rect->x , rect->y , rect->x + rect->width , rect->y + rect->height ) ;
+        SectRgn( (RgnHandle) MacGetVisibleRegion().GetWXHRGN() , update , update ) ;        
+        HIViewSetNeedsDisplayInRegion( (ControlRef) m_macControl , update , true ) ;
+    }
+#else
+    if ( IsControlVisible( (ControlRef) m_macControl ) )
+    {
+        SetControlVisibility( (ControlRef) m_macControl , false , false ) ;
+        SetControlVisibility( (ControlRef) m_macControl , true , true ) ;
+    }
+    /*
+    if ( MacGetTopLevelWindow() == NULL )
+        return ;
+
+    if ( !IsControlVisible( (ControlRef) m_macControl ) )
+       return ;
+ 
+     wxPoint client = GetClientAreaOrigin();
+    int x1 = -client.x;
+    int y1 = -client.y;
+    int x2 = m_width - client.x;
+    int y2 = m_height - client.y;
+
+    if (IsKindOf( CLASSINFO(wxButton)))
+    {
+        // buttons have an "aura"
+        y1 -= 5;
+        x1 -= 5;
+        y2 += 5;
+        x2 += 5;
+    }

 
 

-       wxPoint newPoint( point ) ;
+    Rect clientrect = { y1, x1, y2, x2 };

 
 

-       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;
-               }
-       }
+    if ( rect )
+    {
+        Rect r = { rect->y , rect->x , rect->y + rect->height , rect->x + rect->width } ;
+        SectRect( &clientrect , &r , &clientrect ) ;
+    }
+
+    if ( !EmptyRect( &clientrect ) )
+    {
+      int top = 0 , left = 0 ;
+
+      MacClientToRootWindow( &left , &top ) ;
+      OffsetRect( &clientrect , left , top ) ;

 
 

-       *outWin = this ;
-       return TRUE;
+      MacGetTopLevelWindow()->MacInvalidate( &clientrect , eraseBack ) ;
+    }
+    */
+#endif

 }
 
 }
 

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

 {
 {

-       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 ;
+/*
+    if ( (ControlRef) m_macControl && MacGetTopLevelWindowRef() && IsControlVisible( (ControlRef) m_macControl ) )
+    {
+#if TARGET_API_MAC_CARBON
+        Update() ;
+#else
+        wxClientDC dc(this) ;
+        wxMacPortSetter helper(&dc) ;
+        wxMacWindowClipper clipper(this) ;
+        wxDC::MacSetupBackgroundForCurrentPort( MacGetBackgroundBrush() ) ;
+        UMADrawControl( (ControlRef) m_macControl ) ;
+#endif
+    }
+*/

 }
 }

-
-extern int wxBusyCursorCount ;
-
-bool wxWindow::MacDispatchMouseEvent(wxMouseEvent& event)
+ 
+/* TODO
+void wxWindowMac::OnPaint(wxPaintEvent& event)

 {
 {

-       if ((event.m_x < m_x) || (event.m_y < m_y) ||
-               (event.m_x > (m_x + m_width)) || (event.m_y > (m_y + m_height)))
-               return FALSE;
-       
-       if ( IsKindOf( CLASSINFO ( wxStaticBox ) ) )
-               return FALSE ; 
-       
-       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())
-       {
-               wxWindow *child = (wxWindow*)node->Data();
-               if ( child->GetMacRootWindow() == window && child->IsShown() && child->IsEnabled() )
-               {
-                       if (child->MacDispatchMouseEvent(event))
-                               return TRUE;
-               }
-       }
+    // why don't we skip that here ?
+}
+*/

 
 

-       event.m_x = x ;
-       event.m_y = y ;
-       
-       if ( wxBusyCursorCount == 0 )
-       {
-               m_cursor.MacInstall() ;
-       }
-       GetEventHandler()->ProcessEvent( event ) ;
-       return TRUE;
+wxWindowMac *wxGetActiveWindow()
+{
+    // actually this is a windows-only concept
+    return NULL;

 }
 
 }
 

-void wxWindow::MacFireMouseEvent( EventRecord *ev )
+// Coordinates relative to the window
+void wxWindowMac::WarpPointer (int x_pos, int y_pos)

 {
 {

-       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;
+    // We really don't move the mouse programmatically under Mac.
+}

 
 

-       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 ) ;
-       }
+void wxWindowMac::OnEraseBackground(wxEraseEvent& event)
+{
+    if ( m_macBackgroundBrush.Ok() == false || m_macBackgroundBrush.GetStyle() == wxTRANSPARENT )
+    {
+        event.Skip() ;
+    }
+    else
+        event.GetDC()->Clear() ;
+}

 
 

-       event.m_shiftDown = ev->modifiers & shiftKey;
-       event.m_controlDown = ev->modifiers & controlKey;
-       event.m_altDown = ev->modifiers & optionKey;
-       event.m_metaDown = ev->modifiers & cmdKey;
+void wxWindowMac::OnNcPaint( wxNcPaintEvent& event )
+{
+    wxWindowDC dc(this) ;
+    wxMacPortSetter helper(&dc) ;

 
 

-       Point           localwhere = ev->where ;
-               
-       GrafPtr         port ;  
-       ::GetPort( &port ) ;
-       ::SetPort( UMAGetWindowPort( m_macWindowData->m_macWindow ) ) ;
-       ::GlobalToLocal( &localwhere ) ;
-       ::SetPort( port ) ;
+    MacPaintBorders( dc.m_macLocalOrigin.x , dc.m_macLocalOrigin.y) ;
+}

 
 

-       event.m_x = localwhere.h;
-       event.m_y = localwhere.v;
-       event.m_x += m_x;
-       event.m_y += m_y;
+int wxWindowMac::GetScrollPos(int orient) const
+{
+    if ( orient == wxHORIZONTAL )
+    {
+       if ( m_hScrollBar )
+           return m_hScrollBar->GetThumbPosition() ;
+    }
+    else
+    {
+       if ( m_vScrollBar )
+           return m_vScrollBar->GetThumbPosition() ;
+    }
+    return 0;
+}

 
 

-/*
-       wxPoint origin = GetClientAreaOrigin() ;
+// This now returns the whole range, not just the number
+// of positions that we can scroll.
+int wxWindowMac::GetScrollRange(int orient) const
+{
+    if ( orient == wxHORIZONTAL )
+    {
+       if ( m_hScrollBar )
+           return m_hScrollBar->GetRange() ;
+    }
+    else
+    {
+       if ( m_vScrollBar )
+           return m_vScrollBar->GetRange() ;
+    }
+    return 0;
+}

 
 

-       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 ) ;
-       }
+int wxWindowMac::GetScrollThumb(int orient) const
+{
+    if ( orient == wxHORIZONTAL )
+    {
+       if ( m_hScrollBar )
+           return m_hScrollBar->GetThumbSize() ;
+    }
+    else
+    {
+       if ( m_vScrollBar )
+           return m_vScrollBar->GetThumbSize() ;
+    }
+    return 0;

 }
 
 }
 

-void wxWindow::MacMouseDown( EventRecord *ev , short part)
+void wxWindowMac::SetScrollPos(int orient, int pos, bool refresh)

 {
 {

-       MacFireMouseEvent( ev ) ;
+    if ( orient == wxHORIZONTAL )
+    {
+       if ( m_hScrollBar )
+           m_hScrollBar->SetThumbPosition( pos ) ;
+    }
+    else
+    {
+       if ( m_vScrollBar )
+           m_vScrollBar->SetThumbPosition( pos ) ;
+    }

 }
 
 }
 

-void wxWindow::MacMouseUp( EventRecord *ev , short part)
+void wxWindowMac::MacPaintBorders( int left , int top )

 {
 {

-       WindowPtr frontWindow ;
-       switch (part)
-       {
-               case inContent:         
-                       {
-                               MacFireMouseEvent( ev ) ;
-                       }
-                       break ;
+    if( IsTopLevel() )
+        return ;
+        
+    int major,minor;
+    wxGetOsVersion( &major, &minor );
+
+    RGBColor white = { 0xFFFF, 0xFFFF , 0xFFFF } ;
+    RGBColor face = { 0xDDDD, 0xDDDD , 0xDDDD } ;
+    
+    RGBColor darkShadow = { 0x0000, 0x0000 , 0x0000 } ;
+    RGBColor lightShadow = { 0x4444, 0x4444 , 0x4444 } ;
+    // OS X has lighter border edges than classic:
+    if (major >= 10) 
+    {
+        darkShadow.red                 = 0x8E8E;
+        darkShadow.green       = 0x8E8E;
+        darkShadow.blue        = 0x8E8E;
+        lightShadow.red        = 0xBDBD;
+        lightShadow.green      = 0xBDBD;
+        lightShadow.blue       = 0xBDBD;

        }
        }

+    
+    PenNormal() ;
+
+    int w , h ;
+    GetSize( &w , &h ) ;
+    if (HasFlag(wxRAISED_BORDER) || HasFlag( wxSUNKEN_BORDER) || HasFlag(wxDOUBLE_BORDER) )
+    {
+#if wxMAC_USE_THEME_BORDER
+        Rect rect = { top , left , m_height + top , m_width + left } ;
+        SInt32 border = 0 ;
+        /*
+        GetThemeMetric( kThemeMetricListBoxFrameOutset , &border ) ;
+        InsetRect( &rect , border , border );
+        DrawThemeListBoxFrame(&rect,IsEnabled() ? kThemeStateActive : kThemeStateInactive) ;
+        */
+
+        DrawThemePrimaryGroup(&rect  ,IsEnabled() ? kThemeStateActive : kThemeStateInactive) ;
+#else
+        bool sunken = HasFlag( wxSUNKEN_BORDER ) ;
+        RGBForeColor( &face );
+        MoveTo( left + 0 , top + h - 2 );
+        LineTo( left + 0 , top + 0 );
+        LineTo( left + w - 2 , top + 0 );
+
+        MoveTo( left + 2 , top + h - 3 );
+        LineTo( left + w - 3 , top + h - 3 );
+        LineTo( left + w - 3 , top + 2 );
+
+        RGBForeColor( sunken ? &face : &darkShadow );
+        MoveTo( left + 0 , top + h - 1 );
+        LineTo( left + w - 1 , top + h - 1 );
+        LineTo( left + w - 1 , top + 0 );
+
+        RGBForeColor( sunken ? &lightShadow : &white );
+        MoveTo( left + 1 , top + h - 3 );
+        LineTo( left + 1, top + 1 );
+        LineTo( left + w - 3 , top + 1 );
+
+        RGBForeColor( sunken ? &white : &lightShadow );
+        MoveTo( left + 1 , top + h - 2 );
+        LineTo( left + w - 2 , top + h - 2 );
+        LineTo( left + w - 2 , top + 1 );
+
+        RGBForeColor( sunken ? &darkShadow : &face );
+        MoveTo( left + 2 , top + h - 4 );
+        LineTo( left + 2 , top + 2 );
+        LineTo( left + w - 4 , top + 2 );
+#endif
+    }
+    else if (HasFlag(wxSIMPLE_BORDER))
+    {
+        Rect rect = { top , left , h + top , w + left } ;
+        RGBForeColor( &darkShadow ) ;
+        FrameRect( &rect ) ;
+    }

 }
 
 }
 

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

 {
 {

-       WindowPtr frontWindow ;
-       switch (part)
-       {
-               case inContent:         
-                       {
-                               MacFireMouseEvent( ev ) ;
-                       }
-                       break ;
-       }
+    if ( child == m_hScrollBar )
+        m_hScrollBar = NULL ;
+    if ( child == m_vScrollBar )
+        m_vScrollBar = NULL ;
+
+    wxWindowBase::RemoveChild( child ) ;

 }
 }

-void wxWindow::MacActivate( EventRecord *ev , bool inIsActivating )
+
+// New function that will replace some of the above.
+void wxWindowMac::SetScrollbar(int orient, int pos, int thumbVisible,
+    int range, bool refresh)

 {
 {

-       wxActivateEvent event(wxEVT_ACTIVATE, inIsActivating);
-       event.m_timeStamp = ev->when ;
-       event.SetEventObject(this);
-       
-       GetEventHandler()->ProcessEvent(event);
-       
-       UMAHighlightAndActivateWindow( m_macWindowData->m_macWindow , inIsActivating ) ;
+    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::MacRedraw( RgnHandle updatergn , long time)
+// Does a physical scroll
+void wxWindowMac::ScrollWindow(int dx, int dy, const wxRect *rect)

 {
 {

-       // updatergn is always already clipped to our boundaries
-       WindowRef window = GetMacRootWindow() ;
-       wxWindow* win = wxFindWinFromMacWindow( window ) ;
-       {
-               wxMacDrawingClientHelper focus( this ) ;
-               if ( focus.Ok() )
-               {
-                       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->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()) ;
-                       }
-                       SetClip( updatergn ) ;
-                       EraseRgn( updatergn ) ; 
-               }
-       }
+    if( dx == 0 && dy ==0 )
+        return ;
+        

 
 

-       
-       m_updateRegion = updatergn ;
-       wxPaintEvent event;
-       event.m_timeStamp = time ;
-       event.SetEventObject(this);
-       
-       GetEventHandler()->ProcessEvent(event);
-       
-       RgnHandle childupdate = NewRgn() ;
+    {
+        wxClientDC dc(this) ;
+        wxMacPortSetter helper(&dc) ;
+
+        int width , height ;
+        GetClientSize( &width , &height ) ;
+
+
+        wxPoint pos;
+        pos.x = pos.y = 0; 
+ 
+        Rect scrollrect;
+        // TODO take out the boundaries
+        GetControlBounds( (ControlRef) m_macControl, &scrollrect);
+        
+        RgnHandle updateRgn = NewRgn() ;
+        if ( rect )
+        {
+            Rect r = { dc.YLOG2DEVMAC(rect->y) , dc.XLOG2DEVMAC(rect->x) , dc.YLOG2DEVMAC(rect->y + rect->height) ,
+                dc.XLOG2DEVMAC(rect->x + rect->width) } ;
+            SectRect( &scrollrect , &r , &scrollrect ) ;
+        }
+        ScrollRect( &scrollrect , dx , dy , updateRgn ) ;
+#if TARGET_CARBON
+        //KO: The docs say ScrollRect creates an update region, which thus calls an update event
+        // but it seems the update only refreshes the background of the control, rather than calling 
+        // kEventControlDraw, so we need to force a proper update here. There has to be a better 
+        // way of doing this... (Note that code below under !TARGET_CARBON does not work either...)
+        Update();
+#endif        
+        // we also have to scroll the update rgn in this rectangle 
+        // in order not to loose updates
+#if !TARGET_CARBON
+        WindowRef rootWindow = (WindowRef) MacGetTopLevelWindowRef() ;
+        RgnHandle formerUpdateRgn = NewRgn() ;
+        RgnHandle scrollRgn = NewRgn() ;
+        RectRgn( scrollRgn , &scrollrect ) ;
+        GetWindowUpdateRgn( rootWindow , formerUpdateRgn ) ;
+        Point pt = {0,0} ;
+        LocalToGlobal( &pt ) ;
+        OffsetRgn( formerUpdateRgn , -pt.h , -pt.v ) ;
+        SectRgn( formerUpdateRgn , scrollRgn , formerUpdateRgn ) ;
+        if ( !EmptyRgn( formerUpdateRgn ) )
+        {
+            MacOffsetRgn( formerUpdateRgn , dx , dy ) ;
+            SectRgn( formerUpdateRgn , scrollRgn , formerUpdateRgn ) ;
+            InvalWindowRgn(rootWindow  ,  formerUpdateRgn ) ;
+        }
+        InvalWindowRgn(rootWindow  ,  updateRgn ) ;
+        DisposeRgn( updateRgn ) ;
+        DisposeRgn( formerUpdateRgn ) ;
+        DisposeRgn( scrollRgn ) ;
+#endif
+    }
+
+    for (wxWindowListNode *node = GetChildren().GetFirst(); node; node = node->GetNext())
+    {
+        wxWindowMac *child = node->GetData();
+        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 );
+        if (rect)
+        {
+            wxRect rc(x,y,w,h);
+            if (rect->Intersects(rc))
+                child->SetSize( x+dx, y+dy, w, h );
+        }
+        else
+        {
+            child->SetSize( x+dx, y+dy, w, h );                
+        }        
+    }
+    
+// TODO remove, was moved higher up    Update() ;

 
 

-       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

 }
 
 }
 

-void wxWindow::MacUpdateImmediately()
+void wxWindowMac::MacOnScroll(wxScrollEvent &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 ) ;
-       }
+    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;
+        else if (event.m_eventType == wxEVT_SCROLL_THUMBRELEASE)
+            wevent.m_eventType = wxEVT_SCROLLWIN_THUMBRELEASE;
+
+        GetEventHandler()->ProcessEvent(wevent);
+    }

 }
 
 }
 

-void wxWindow::MacUpdate( EventRecord *ev )
+// Get the window with the focus
+wxWindowMac *wxWindowBase::FindFocus()

 {
 {

-       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 ) ;
+    return gFocusWindow ;

 }
 
 }
 

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

 {
 {

-       WindowRef window = NULL ;
-       wxWindow *iter = (wxWindow*)this ;
-       
-       while( iter )
-       {
-               if ( iter->m_macWindowData )
-                       return iter->m_macWindowData->m_macWindow ;
+    // 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);

 
 

-               iter = iter->GetParent() ;
-       } 
-       wxASSERT_MSG( 1 , "No valid mac root window" ) ;
-       return NULL ;
+    event.Skip();

 }
 
 }
 

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

 {
 {

-       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);
-       }
-       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);
-       }
-       // because the create does not take into account the client area origin
-       MacRepositionScrollBars() ; // we might have a real position shift
+    // This calls the UI-update mechanism (querying windows for
+    // menu/toolbar/control state information)
+    if (wxUpdateUIEvent::CanUpdate(this))
+        UpdateWindowUI(wxUPDATE_UI_FROMIDLE);

 }
 
 }
 

-void wxWindow::MacRepositionScrollBars()
+// Raise the window to the top of the Z order
+void wxWindowMac::Raise()

 {
 {

-       bool hasBoth = ( m_hScrollBar && m_hScrollBar->IsShown()) && ( m_vScrollBar && m_vScrollBar->IsShown()) ;
-       int adjust = hasBoth ? MAC_SCROLLBAR_SIZE - 1 : 0 ;
-       
-       if ( m_vScrollBar )
-       {
-               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);
-       }

 }
 
 }
 

-void wxWindow::MacKeyDown( EventRecord *ev ) 
+// Lower the window to the bottom of the Z order
+void wxWindowMac::Lower()

 {
 }
 
 
 {
 }
 
 

+// static wxWindow *gs_lastWhich = NULL;
+
+bool wxWindowMac::MacSetupCursor( const wxPoint& pt)
+{
+    // first trigger a set cursor event
+
+    wxPoint clientorigin = GetClientAreaOrigin() ;
+    wxSize clientsize = GetClientSize() ;
+    wxCursor cursor ;
+    if ( wxRect2DInt( clientorigin.x , clientorigin.y , clientsize.x , clientsize.y ).Contains( wxPoint2DInt( pt ) ) )
+    {
+        wxSetCursorEvent event( pt.x , pt.y );
+
+        bool processedEvtSetCursor = GetEventHandler()->ProcessEvent(event);
+        if ( processedEvtSetCursor && event.HasCursor() )
+        {
+            cursor = event.GetCursor() ;
+        }
+        else
+        {

 
 

+            // the test for processedEvtSetCursor is here to prevent using m_cursor
+            // if the user code caught EVT_SET_CURSOR() and returned nothing from
+            // it - this is a way to say that our cursor shouldn't be used for this
+            // point
+            if ( !processedEvtSetCursor && m_cursor.Ok() )
+            {
+                cursor = m_cursor ;
+            }
+            if ( wxIsBusy() )
+            {
+            }
+            else
+            {
+                if ( !GetParent() )
+                    cursor = *wxSTANDARD_CURSOR  ;
+            }
+        }
+        if ( cursor.Ok() )
+            cursor.MacInstall() ;
+    }
+    return cursor.Ok() ;
+}

 
 

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

 {
 {

-       if ( m_macWindowData )
-               return m_macWindowData->m_macRootControl ;
-       else
-               return GetParent()->MacGetContainerForEmbedding() ;
+    if ( m_tooltip )
+    {
+        return m_tooltip->GetTip() ;
+    }
+    return wxEmptyString ;

 }
 
 }
 

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

 {
 {

-       // only window-absolute structures have to be moved i.e. controls
+#if TARGET_API_MAC_OSX
+    HIViewSetNeedsDisplay( (ControlRef) m_macControl , true ) ;
+#else
+    ::Draw1Control( (ControlRef) m_macControl ) ;
+#endif
+}

 
 

-       wxNode *node = GetChildren().First();
-       while ( node )
-       {
-               wxWindow *child = (wxWindow *)node->Data();
-               child->MacSuperChangedPosition() ;
-               node = node->Next();
-       }
+wxTopLevelWindowMac* wxWindowMac::MacGetTopLevelWindow() const
+{
+    wxTopLevelWindowMac* win = NULL ;
+    WindowRef window = (WindowRef) MacGetTopLevelWindowRef() ;
+    if ( window )
+    {
+        win = wxFindWinFromMacWindow( window ) ;
+    }
+    return win ;

 }
 }

-       
-bool wxWindow::MacSetupFocusPort(  ) 
+wxRegion wxWindowMac::MacGetVisibleRegion( bool includeOuterStructures )

 {
 {

-       Point localOrigin ;
-       Rect clipRect ;
-       WindowRef window ;
-       wxWindow *rootwin ;
-       GrafPtr port ;
-       
-       MacGetPortParams( &localOrigin , &clipRect , &window , &rootwin) ;
-       return  MacSetPortFocusParams( localOrigin, clipRect, window , rootwin ) ; 
+
+    Rect r ;
+    RgnHandle visRgn = NewRgn() ;
+    RgnHandle tempRgn = NewRgn() ;
+    if ( IsControlVisible( (ControlRef) m_macControl ) )
+    {
+        GetControlBounds( (ControlRef) m_macControl , &r ) ;
+        if (! MacGetTopLevelWindow()->MacUsesCompositing() )
+        {
+            MacRootWindowToWindow( &r.left , & r.top ) ;
+            MacRootWindowToWindow( &r.right , & r.bottom ) ;
+        }
+        else
+        {
+            r.right -= r.left ;
+            r.bottom -= r.top ;
+            r.left = 0 ;
+            r.top = 0 ;
+        }
+        if ( includeOuterStructures )
+            InsetRect( &r , -3 , -3 ) ;
+        RectRgn( visRgn , &r ) ;
+        if ( !IsTopLevel() )
+        {
+            wxWindow* child = this ;
+            wxWindow* parent = child->GetParent() ;
+            while( parent )
+            {
+                int x , y ;
+                wxSize size ;
+                // we have to find a better clipping algorithm here, in order not to clip things
+                // positioned like status and toolbar
+                if ( 1 /* parent->IsTopLevel() && child->IsKindOf( CLASSINFO( wxToolBar ) ) */ )
+                {
+                    size = parent->GetSize() ;
+                    x = y = 0 ;
+                }
+                else
+                {
+                    size = parent->GetClientSize() ;
+                    wxPoint origin = parent->GetClientAreaOrigin() ;
+                    x = origin.x ;
+                    y = origin.y ;
+                }
+                parent->MacWindowToRootWindow( &x, &y ) ;
+                MacRootWindowToWindow( &x , &y ) ;
+
+                SetRectRgn( tempRgn ,
+                    x + parent->MacGetLeftBorderSize() , y + parent->MacGetTopBorderSize() ,
+                    x + size.x - parent->MacGetRightBorderSize(),
+                    y + size.y - parent->MacGetBottomBorderSize()) ;
+
+                SectRgn( visRgn , tempRgn , visRgn ) ;
+                if ( parent->IsTopLevel() )
+                    break ;
+                child = parent ;
+                parent = child->GetParent() ;
+            }
+        }
+    }
+
+    wxRegion vis = visRgn ;
+    DisposeRgn( visRgn ) ;
+    DisposeRgn( tempRgn ) ;
+    return vis ;

 }
 
 }
 

-bool wxWindow::MacSetupFocusClientPort(  ) 
-{
-       Point localOrigin ;
-       Rect clipRect ;
-       WindowRef window ;
-       wxWindow *rootwin ;
-       GrafPtr port ;
-       
-       MacGetPortClientParams( &localOrigin , &clipRect , &window , &rootwin) ;
-       return  MacSetPortFocusParams( localOrigin, clipRect, window , rootwin ) ; 
+/*
+    This function must not change the updatergn !
+ */
+bool wxWindowMac::MacDoRedraw( WXHRGN updatergnr , long time ) 
+{
+    // we let the OS handle root control redraws
+    if ( m_macControl == MacGetTopLevelWindow()->GetHandle() )
+        return false ;
+        
+    RgnHandle updatergn = (RgnHandle) updatergnr ;
+    bool handled = false ;
+    
+    // calculate a client-origin version of the update rgn and set m_updateRegion to that
+    {
+        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 , updatergn , newupdate ) ;
+        OffsetRgn( newupdate , -origin.x , -origin.y ) ;
+        m_updateRegion = newupdate ;
+        DisposeRgn( newupdate ) ; 
+    }
+
+    if ( !EmptyRgn(updatergn) )
+    {
+        wxWindowDC dc(this);
+        if (!EmptyRgn(updatergn))
+            dc.SetClippingRegion(wxRegion(updatergn));
+        
+        wxEraseEvent eevent( GetId(), &dc );
+        eevent.SetEventObject( this );
+        GetEventHandler()->ProcessEvent( eevent );
+ 
+        if ( !m_updateRegion.Empty() )
+        {
+            // paint the window itself
+            wxPaintEvent event;
+            event.m_timeStamp = time ;
+            event.SetEventObject(this);
+            handled = GetEventHandler()->ProcessEvent(event); 
+
+            // paint custom borders
+            wxNcPaintEvent eventNc( GetId() );
+            eventNc.SetEventObject( this );
+            GetEventHandler()->ProcessEvent( eventNc );
+        }
+    }
+    return handled ;
+}
+
+void wxWindowMac::MacRedraw( WXHRGN updatergnr , long time, bool erase)
+{
+    RgnHandle updatergn = (RgnHandle) updatergnr ;
+    // updatergn is always already clipped to our boundaries
+    // if we are in compositing mode then it is in relative to the upper left of the control
+    // if we are in non-compositing, then it is relatvie to the uppder left of the content area
+    // of the toplevel window
+    // it is in window coordinates, not in client coordinates
+
+    // ownUpdateRgn is the area that this window has to repaint, it is in window coordinates
+    RgnHandle ownUpdateRgn = NewRgn() ;
+    CopyRgn( updatergn , ownUpdateRgn ) ;
+
+    if ( MacGetTopLevelWindow()->MacUsesCompositing() == false )
+    { 
+        Rect bounds;
+        UMAGetControlBoundsInWindowCoords( (ControlRef)m_macControl, &bounds );
+        RgnHandle controlRgn = NewRgn();
+        RectRgn( controlRgn, &bounds );
+        //KO: This sets the ownUpdateRgn to the area of this control that is inside
+        // the window update region
+        SectRgn( ownUpdateRgn, controlRgn, ownUpdateRgn ); 
+        DisposeRgn( controlRgn );
+    
+        //KO: convert ownUpdateRgn to local coordinates
+        OffsetRgn( ownUpdateRgn, -bounds.left, -bounds.top ); 
+    }
+        
+    MacDoRedraw( ownUpdateRgn , time ) ;
+    DisposeRgn( ownUpdateRgn ) ;
+

 }
 
 }
 

-bool wxWindow::MacSetupDrawingPort(  ) 
+WXWindow wxWindowMac::MacGetTopLevelWindowRef() const

 {
 {

-       Point localOrigin ;
-       Rect clipRect ;
-       WindowRef window ;
-       wxWindow *rootwin ;
-       GrafPtr port ;
-       
-       MacGetPortParams( &localOrigin , &clipRect , &window , &rootwin) ;
-       return  MacSetPortDrawingParams( localOrigin, clipRect, window , rootwin ) ; 
+    wxWindowMac *iter = (wxWindowMac*)this ;
+
+    while( iter )
+    {
+        if ( iter->IsTopLevel() )
+            return ((wxTopLevelWindow*)iter)->MacGetWindowRef() ;
+
+        iter = iter->GetParent() ;
+    }
+    wxASSERT_MSG( 1 , wxT("No valid mac root window") ) ;
+    return NULL ;

 }
 
 }
 

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

 {
 {

-       Point localOrigin ;
-       Rect clipRect ;
-       WindowRef window ;
-       wxWindow *rootwin ;
-       GrafPtr port ;
-       
-       MacGetPortClientParams( &localOrigin , &clipRect , &window , &rootwin) ;
-       return  MacSetPortDrawingParams( localOrigin, clipRect, window , rootwin ) ; 
-}
+    wxASSERT_MSG( m_vScrollBar == NULL && m_hScrollBar == NULL , wxT("attempt to create window twice") ) ;

 
 

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

 
 

-bool wxWindow::MacSetPortFocusParams( const Point & localOrigin, const Rect & clipRect, WindowRef window , wxWindow* win ) 
-{
-       if ( window == NULL )
-               return false ;
-               
-       GrafPtr currPort;
-       GrafPtr port ;
+    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 )
+    {
+
+    }
+    else
+    {
+        m_vScrollBar->Show(false) ;
+    }
+    m_hScrollBar = new wxScrollBar(this, wxWINDOW_HSCROLL, hPoint,
+        hSize , wxHORIZONTAL);
+    if ( style  & wxHSCROLL )
+    {
+    }
+    else
+    {
+        m_hScrollBar->Show(false) ;
+    }

 
 

-       ::GetPort(&currPort);
-       port = UMAGetWindowPort( window) ;
-       if (currPort != port )
-                       ::SetPort(port);
-                               
-       ::SetOrigin(-localOrigin.h, -localOrigin.v);
-       return true;                    
+    // because the create does not take into account the client area origin
+    MacRepositionScrollBars() ; // we might have a real position shift

 }
 
 }
 

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

 {
 {

-       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);
+    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  ;
+    int height  ;
+    GetSize( &width , &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 ;
+    int h ;
+    GetSize( &w , &h ) ;
+
+    MacClientToRootWindow( &x , &y ) ;
+    MacClientToRootWindow( &w , &h ) ;
+
+    wxWindowMac *iter = (wxWindowMac*)this ;
+
+    int totW = 10000 , totH = 10000;
+    while( iter )
+    {
+        if ( iter->IsTopLevel() )
+        {
+            iter->GetSize( &totW , &totH ) ;
+            break ;
+        }

 
 

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

 }
 
 }
 

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

 {
 {

-       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);
-       }
+    return MacCanFocus() && wxWindowBase::AcceptsFocus();

 }
 
 }
 

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

 {
 {

-       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) ;
+    // only window-absolute structures have to be moved i.e. controls

 
 

-               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);
-       }
+    wxWindowListNode *node = GetChildren().GetFirst();
+    while ( node )
+    {
+        wxWindowMac *child = node->GetData();
+        child->MacSuperChangedPosition() ;
+        node = node->GetNext();
+    }

 }
 
 }
 

-wxMacFocusHelper::wxMacFocusHelper( wxWindow * theWindow ) 
+void wxWindowMac::MacTopLevelWindowChangedPosition()

 {
 {

-       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 ;
-       }
+    // only screen-absolute structures have to be moved i.e. glcanvas
+
+    wxWindowListNode *node = GetChildren().GetFirst();
+    while ( node )
+    {
+        wxWindowMac *child = node->GetData();
+        child->MacTopLevelWindowChangedPosition() ;
+        node = node->GetNext();
+    }

 }
 }

-       
-wxMacFocusHelper::~wxMacFocusHelper() 
+
+long wxWindowMac::MacGetLeftBorderSize( ) const

 {
 {

-       if ( m_ok )
-       {
-               SetOrigin( 0 , 0 ) ;
-       }
-       if ( m_formerPort != m_currentPort )
-               SetPort( m_formerPort ) ;
+    if( IsTopLevel() )
+        return 0 ;
+
+    if (m_windowStyle & wxRAISED_BORDER || m_windowStyle & wxSUNKEN_BORDER )
+    {
+        SInt32 border = 3 ;
+#if wxMAC_USE_THEME_BORDER
+          GetThemeMetric( kThemeMetricListBoxFrameOutset , &border ) ;
+#endif
+          return border ;
+    }
+    else if (  m_windowStyle &wxDOUBLE_BORDER)
+    {
+          SInt32 border = 3 ;
+#if wxMAC_USE_THEME_BORDER
+          GetThemeMetric( kThemeMetricListBoxFrameOutset , &border ) ;
+#endif
+          return border ;
+    }
+    else if (m_windowStyle &wxSIMPLE_BORDER)
+    {
+        return 1 ;
+    }
+    return 0 ;

 }
 
 }
 

-wxMacDrawingHelper::wxMacDrawingHelper( wxWindow * theWindow ) 
+long wxWindowMac::MacGetRightBorderSize( ) const

 {
 {

-       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 ;
-       }
+    // they are all symmetric in mac themes
+    return MacGetLeftBorderSize() ;

 }
 }

-       
-wxMacDrawingHelper::~wxMacDrawingHelper() 
+
+long wxWindowMac::MacGetTopBorderSize( ) const

 {
 {

-       if ( m_ok )
-       {
-               SetPenState( &m_savedPenState ) ;
-               SetOrigin( 0 , 0 ) ;
-               ClipRect( &m_currentPort->portRect ) ;
-       }
-               
-       if ( m_formerPort != m_currentPort )
-               SetPort( m_formerPort ) ;
+    // they are all symmetric in mac themes
+    return MacGetLeftBorderSize() ;

 }
 
 }
 

-wxMacFocusClientHelper::wxMacFocusClientHelper( wxWindow * theWindow ) 
+long wxWindowMac::MacGetBottomBorderSize( ) const

 {
 {

-       m_ok = false ;
-       Point localOrigin ;
-       Rect clipRect ;
-       WindowRef window ;
-       wxWindow *rootwin ;
-       m_currentPort = NULL ;
-       
-       GetPort( &m_formerPort ) ;
+    // they are all symmetric in mac themes
+    return MacGetLeftBorderSize() ;
+}

 
 

-       if ( theWindow )
-       {
-               theWindow->MacGetPortClientParams( &localOrigin , &clipRect , &window , &rootwin) ;
-               m_currentPort = UMAGetWindowPort( window ) ;
-               theWindow->MacSetPortFocusParams( localOrigin, clipRect, window , rootwin ) ; 
-               m_ok = true ;
-       }
+long wxWindowMac::MacRemoveBordersFromStyle( long style )
+{
+    return style & ~( wxDOUBLE_BORDER | wxSUNKEN_BORDER | wxRAISED_BORDER | wxBORDER | wxSTATIC_BORDER ) ;

 }
 }

-       
-wxMacFocusClientHelper::~wxMacFocusClientHelper() 
+
+// Find the wxWindowMac at the current mouse position, returning the mouse
+// position.
+wxWindowMac* wxFindWindowAtPointer(wxPoint& pt)

 {
 {

-       if ( m_ok )
-       {
-               SetOrigin( 0 , 0 ) ;
-       }
-       if ( m_formerPort != m_currentPort )
-               SetPort( m_formerPort ) ;
+    pt = wxGetMousePosition();
+    wxWindowMac* found = wxFindWindowAtPoint(pt);
+    return found;

 }
 
 }
 

-wxMacDrawingClientHelper::wxMacDrawingClientHelper( wxWindow * theWindow ) 
+// Get the current mouse position.
+wxPoint wxGetMousePosition()

 {
 {

-       m_ok = false ;
-       Point localOrigin ;
-       Rect clipRect ;
-       WindowRef window ;
-       wxWindow *rootwin ;
-       m_currentPort = NULL ;
-       
-       GetPort( &m_formerPort ) ;
+    int x, y;
+    wxGetMousePosition(& x, & y);
+    return wxPoint(x, y);
+}

 
 

-       if ( theWindow )
+void wxWindowMac::OnMouseEvent( wxMouseEvent &event )
+{
+       if ( event.GetEventType() == wxEVT_RIGHT_DOWN )

        {
        {

-               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 ;
+               // copied from wxGTK : CS
+        // generate a "context menu" event: this is similar to wxEVT_RIGHT_DOWN
+        // except that:
+        //
+        // (a) it's a command event and so is propagated to the parent
+        // (b) under MSW it can be generated from kbd too
+        // (c) it uses screen coords (because of (a))
+        wxContextMenuEvent evtCtx(wxEVT_CONTEXT_MENU,
+                                  this->GetId(),
+                                  this->ClientToScreen(event.GetPosition()));
+        if ( ! GetEventHandler()->ProcessEvent(evtCtx) )
+            event.Skip() ;

        }
        }

+    else if (event.GetEventType() == wxEVT_LEFT_DOWN || event.GetEventType() == wxEVT_LEFT_DCLICK )
+    {
+            
+        int x = event.m_x ;
+        int y = event.m_y ;
+
+        if ( MacGetTopLevelWindow()->MacUsesCompositing() == false )
+        {
+            // OS Needs it in tlw content area coordinates
+            MacClientToRootWindow( &x , &y ) ;
+        }
+        else
+        {
+            // OS Needs it in window not client coordinates
+            wxPoint origin = GetClientAreaOrigin() ;
+            x += origin.x ;
+            y += origin.y ;
+        }
+        Point       localwhere ;
+        SInt16      controlpart ;
+        
+        localwhere.h = x ;
+        localwhere.v = y ;
+    
+        short modifiers = 0;
+        
+        if ( !event.m_leftDown && !event.m_rightDown )
+            modifiers  |= btnState ;
+    
+        if ( event.m_shiftDown )
+            modifiers |= shiftKey ;
+            
+        if ( event.m_controlDown )
+            modifiers |= controlKey ;
+    
+        if ( event.m_altDown )
+            modifiers |= optionKey ;
+    
+        if ( event.m_metaDown )
+            modifiers |= cmdKey ;
+
+        bool handled = false ;
+
+        if ( ::IsControlActive( (ControlRef) m_macControl ) )
+        {
+            controlpart = ::HandleControlClick( (ControlRef) m_macControl , localwhere , modifiers , (ControlActionUPP) -1 ) ;
+            wxTheApp->s_lastMouseDown = 0 ;
+            if ( controlpart != kControlNoPart ) 
+            {
+                MacHandleControlClick((WXWidget)  (ControlRef) m_macControl , controlpart , false /* mouse not down anymore */ ) ;
+                handled = true ;
+            }
+        }
+        if ( !handled )
+            event.Skip() ;
+    }
+    else
+    {
+       event.Skip() ;
+    }

 }
 }

-       
-wxMacDrawingClientHelper::~wxMacDrawingClientHelper() 
+
+void wxWindowMac::MacHandleControlClick( WXWidget control , wxInt16 controlpart , bool WXUNUSED( mouseStillDown ) ) 

 {
 {

-       if ( m_ok )
-       {
-               SetPenState( &m_savedPenState ) ;
-               SetOrigin( 0 , 0 ) ;
-               ClipRect( &m_currentPort->portRect ) ;
-       }
-               
-       if ( m_formerPort != m_currentPort )
-               SetPort( m_formerPort ) ;
+    wxASSERT_MSG( (ControlRef) m_macControl != NULL , wxT("No valid mac control") ) ;

 }
 }

+
+Rect wxMacGetBoundsForControl( wxWindow* window , const wxPoint& pos , const wxSize &size ) 
+{
+    int x ,y , w ,h ;
+    
+    window->MacGetBoundsForControl( pos , size , x , y, w, h ) ;
+    Rect bounds =  { y , x , y+h , x+w  };
+    return bounds ;
+}
+
+