fix wxGTK1 compilation after wxTextEntry DoGetValue() change

[wxWidgets.git] / src / osx / window_osx.cpp

diff --git a/src/osx/window_osx.cpp b/src/osx/window_osx.cpp
index cadecef90b8085781a7766a2d7d8587b0acd615c..237a0ad691f87a393d1bbf8a4a5c298f03705d24 100644 (file)
--- a/src/osx/window_osx.cpp
+++ b/src/osx/window_osx.cpp
@@ -61,6 +61,8 @@
 #include "wx/dnd.h"
 #endif
 
 #include "wx/dnd.h"
 #endif
 

+#include "wx/graphics.h"
+

 #if wxOSX_USE_CARBON
 #include "wx/osx/uma.h"
 #else
 #if wxOSX_USE_CARBON
 #include "wx/osx/uma.h"
 #else


@@ -83,7 +85,6 @@
 BEGIN_EVENT_TABLE(wxWindowMac, wxWindowBase)
     EVT_NC_PAINT(wxWindowMac::OnNcPaint)
     EVT_ERASE_BACKGROUND(wxWindowMac::OnEraseBackground)
 BEGIN_EVENT_TABLE(wxWindowMac, wxWindowBase)
     EVT_NC_PAINT(wxWindowMac::OnNcPaint)
     EVT_ERASE_BACKGROUND(wxWindowMac::OnEraseBackground)

-    EVT_PAINT(wxWindowMac::OnPaint)

     EVT_MOUSE_EVENTS(wxWindowMac::OnMouseEvent)
 END_EVENT_TABLE()
 
     EVT_MOUSE_EVENTS(wxWindowMac::OnMouseEvent)
 END_EVENT_TABLE()
 


@@ -139,8 +140,6 @@ wxWindowMac::~wxWindowMac()
 {
     SendDestroyEvent();
 
 {
     SendDestroyEvent();
 

-    m_isBeingDeleted = true;
-

     MacInvalidateBorders() ;
 
 #ifndef __WXUNIVERSAL__
     MacInvalidateBorders() ;
 
 #ifndef __WXUNIVERSAL__


@@ -151,7 +150,7 @@ wxWindowMac::~wxWindowMac()
         if ( frame )
         {
             if ( frame->GetLastFocus() == this )
         if ( frame )
         {
             if ( frame->GetLastFocus() == this )

-                frame->SetLastFocus((wxWindow*)NULL);
+                frame->SetLastFocus(NULL);

             break;
         }
     }
             break;
         }
     }


@@ -272,19 +271,11 @@ void wxWindowMac::MacPostControlCreate(const wxPoint& WXUNUSED(pos), const wxSiz
 {
     wxASSERT_MSG( m_peer != NULL && m_peer->IsOk() , wxT("No valid mac control") ) ;
 
 {
     wxASSERT_MSG( m_peer != NULL && m_peer->IsOk() , wxT("No valid mac control") ) ;
 

-#if wxOSX_USE_CARBON
-    m_peer->SetReference( (URefCon) this ) ;
-#endif
-

     GetParent()->AddChild( this );
 
     GetParent()->AddChild( this );
 

-#if wxOSX_USE_CARBON

     m_peer->InstallEventHandler();
     m_peer->InstallEventHandler();

+    m_peer->Embed(GetParent()->GetPeer());

 
 

-    ControlRef container = (ControlRef) GetParent()->GetHandle() ;
-    wxASSERT_MSG( container != NULL , wxT("No valid mac container control") ) ;
-    ::EmbedControl( m_peer->GetControlRef() , container ) ;
-#endif

     GetParent()->MacChildAdded() ;
 
     // adjust font, controlsize etc
     GetParent()->MacChildAdded() ;
 
     // adjust font, controlsize etc


@@ -292,7 +283,8 @@ void wxWindowMac::MacPostControlCreate(const wxPoint& WXUNUSED(pos), const wxSiz
 
     m_peer->SetLabel( wxStripMenuCodes(m_label, wxStrip_Mnemonics), GetFont().GetEncoding() ) ;
 
 
     m_peer->SetLabel( wxStripMenuCodes(m_label, wxStrip_Mnemonics), GetFont().GetEncoding() ) ;
 

-    if (!m_macIsUserPane)
+    // for controls we want to use best size for wxDefaultSize params )
+    if ( !m_macIsUserPane )

         SetInitialSize(size);
 
     SetCursor( *wxSTANDARD_CURSOR ) ;
         SetInitialSize(size);
 
     SetCursor( *wxSTANDARD_CURSOR ) ;


@@ -310,11 +302,43 @@ void wxWindowMac::DoSetWindowVariant( wxWindowVariant variant )
         return;
 
     m_peer->SetControlSize( variant );
         return;
 
     m_peer->SetControlSize( variant );

+#if wxOSX_USE_CARBON
+    ControlSize size ;
+
+    // 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;
+            break ;
+
+        case wxWINDOW_VARIANT_SMALL :
+            size = kControlSizeSmall;
+            break ;
+
+        case wxWINDOW_VARIANT_MINI :
+            // not always defined in the headers
+            size = 3 ;
+            break ;
+
+        case wxWINDOW_VARIANT_LARGE :
+            size = kControlSizeLarge;
+            break ;
+
+        default:
+            wxFAIL_MSG(_T("unexpected window variant"));
+            break ;
+    }
+    m_peer->SetData<ControlSize>(kControlEntireControl, kControlSizeTag, &size ) ;
+#endif
+

 #if wxOSX_USE_COCOA_OR_CARBON
     wxFont font ;
 
 #if wxOSX_USE_COCOA_OR_CARBON
     wxFont font ;
 

-#if wxOSX_USE_CARBON
-    ControlSize size ;
+#if wxOSX_USE_ATSU_TEXT

     ThemeFontID themeFont = kThemeSystemFont ;
 
     // we will get that from the settings later
     ThemeFontID themeFont = kThemeSystemFont ;
 
     // we will get that from the settings later


@@ -324,23 +348,19 @@ void wxWindowMac::DoSetWindowVariant( wxWindowVariant variant )
     switch ( variant )
     {
         case wxWINDOW_VARIANT_NORMAL :
     switch ( variant )
     {
         case wxWINDOW_VARIANT_NORMAL :

-            size = kControlSizeNormal;

             themeFont = kThemeSystemFont ;
             break ;
 
         case wxWINDOW_VARIANT_SMALL :
             themeFont = kThemeSystemFont ;
             break ;
 
         case wxWINDOW_VARIANT_SMALL :

-            size = kControlSizeSmall;

             themeFont = kThemeSmallSystemFont ;
             break ;
 
         case wxWINDOW_VARIANT_MINI :
             // not always defined in the headers
             themeFont = kThemeSmallSystemFont ;
             break ;
 
         case wxWINDOW_VARIANT_MINI :
             // not always defined in the headers

-            size = 3 ;

             themeFont = 109 ;
             break ;
 
         case wxWINDOW_VARIANT_LARGE :
             themeFont = 109 ;
             break ;
 
         case wxWINDOW_VARIANT_LARGE :

-            size = kControlSizeLarge;

             themeFont = kThemeSystemFont ;
             break ;
 
             themeFont = kThemeSystemFont ;
             break ;
 


@@ -349,7 +369,6 @@ void wxWindowMac::DoSetWindowVariant( wxWindowVariant variant )
             break ;
     }
 
             break ;
     }
 

-    m_peer->SetData<ControlSize>(kControlEntireControl, kControlSizeTag, &size ) ;

     font.MacCreateFromThemeFont( themeFont ) ;
 #else
     CTFontUIFontType themeFont = kCTFontSystemFontType ;
     font.MacCreateFromThemeFont( themeFont ) ;
 #else
     CTFontUIFontType themeFont = kCTFontSystemFontType ;


@@ -384,8 +403,8 @@ void wxWindowMac::DoSetWindowVariant( wxWindowVariant variant )
 
 void wxWindowMac::MacUpdateControlFont()
 {
 
 void wxWindowMac::MacUpdateControlFont()
 {

-
-    m_peer->SetFont( GetFont() , GetForegroundColour() , GetWindowStyle() ) ;
+    if ( m_peer )
+        m_peer->SetFont( GetFont() , GetForegroundColour() , GetWindowStyle() ) ;

 
     // do not trigger refreshes upon invisible and possible partly created objects
     if ( IsShownOnScreen() )
 
     // do not trigger refreshes upon invisible and possible partly created objects
     if ( IsShownOnScreen() )


@@ -437,6 +456,7 @@ void wxWindowMac::SetFocus()
 void wxWindowMac::DoCaptureMouse()
 {
     wxApp::s_captureWindow = (wxWindow*) this ;
 void wxWindowMac::DoCaptureMouse()
 {
     wxApp::s_captureWindow = (wxWindow*) this ;

+    m_peer->CaptureMouse() ;

 }
 
 wxWindow * wxWindowBase::GetCapture()
 }
 
 wxWindow * wxWindowBase::GetCapture()


@@ -447,14 +467,15 @@ wxWindow * wxWindowBase::GetCapture()
 void wxWindowMac::DoReleaseMouse()
 {
     wxApp::s_captureWindow = NULL ;
 void wxWindowMac::DoReleaseMouse()
 {
     wxApp::s_captureWindow = NULL ;

+
+    m_peer->ReleaseMouse() ;

 }
 
 #if wxUSE_DRAG_AND_DROP
 
 void wxWindowMac::SetDropTarget(wxDropTarget *pDropTarget)
 {
 }
 
 #if wxUSE_DRAG_AND_DROP
 
 void wxWindowMac::SetDropTarget(wxDropTarget *pDropTarget)
 {

-    if ( m_dropTarget != NULL )
-        delete m_dropTarget;
+    delete m_dropTarget;

 
     m_dropTarget = pDropTarget;
     if ( m_dropTarget != NULL )
 
     m_dropTarget = pDropTarget;
     if ( m_dropTarget != NULL )


@@ -483,9 +504,8 @@ bool wxWindowMac::MacGetBoundsForControl(
     x = (int)pos.x;
     y = (int)pos.y;
 
     x = (int)pos.x;
     y = (int)pos.y;
 

-    // TODO: the default calls may be used as soon as PostCreateControl Is moved here
-    w = wxMax(size.x, 0) ; // WidthDefault( size.x );
-    h = wxMax(size.y, 0) ; // HeightDefault( size.y ) ;
+    w = WidthDefault( size.x ); 
+    h = HeightDefault( size.y ); 

 
     x += MacGetLeftBorderSize() ;
     y += MacGetTopBorderSize() ;
 
     x += MacGetLeftBorderSize() ;
     y += MacGetTopBorderSize() ;


@@ -496,7 +516,7 @@ bool wxWindowMac::MacGetBoundsForControl(
         AdjustForParentClientOrigin( x , y ) ;
 
     // this is in window relative coordinate, as this parent may have a border, its physical position is offset by this border
         AdjustForParentClientOrigin( x , y ) ;
 
     // this is in window relative coordinate, as this parent may have a border, its physical position is offset by this border

-    if ( !GetParent()->IsTopLevel() )
+    if ( GetParent() && !GetParent()->IsTopLevel() )

     {
         x -= GetParent()->MacGetLeftBorderSize() ;
         y -= GetParent()->MacGetTopBorderSize() ;
     {
         x -= GetParent()->MacGetLeftBorderSize() ;
         y -= GetParent()->MacGetTopBorderSize() ;


@@ -654,8 +674,8 @@ wxSize wxWindowMac::DoGetSizeFromClientSize( const wxSize & size )  const
     m_peer->GetContentArea( left, top, innerwidth, innerheight );
     m_peer->GetSize( outerwidth, outerheight );
     
     m_peer->GetContentArea( left, top, innerwidth, innerheight );
     m_peer->GetSize( outerwidth, outerheight );
     

-    sizeTotal.x += left + (outerwidth-innerwidth);
-    sizeTotal.y += top + (outerheight-innerheight);
+    sizeTotal.x += outerwidth-innerwidth;
+    sizeTotal.y += outerheight-innerheight;

     
     sizeTotal.x += MacGetLeftBorderSize() + MacGetRightBorderSize() ;
     sizeTotal.y += MacGetTopBorderSize() + MacGetBottomBorderSize() ;
     
     sizeTotal.x += MacGetLeftBorderSize() + MacGetRightBorderSize() ;
     sizeTotal.y += MacGetTopBorderSize() + MacGetBottomBorderSize() ;


@@ -703,37 +723,8 @@ bool wxWindowMac::SetCursor(const wxCursor& cursor)
     wxASSERT_MSG( m_cursor.Ok(),
         wxT("cursor must be valid after call to the base version"));
 
     wxASSERT_MSG( m_cursor.Ok(),
         wxT("cursor must be valid after call to the base version"));
 

-    wxWindowMac *mouseWin = 0 ;
-#if wxOSX_USE_CARBON
-    {
-        wxNonOwnedWindow *tlw = MacGetTopLevelWindow() ;
-        WindowRef window = (WindowRef) ( tlw ? tlw->GetWXWindow() : 0 ) ;
-
-        ControlPartCode part ;
-        ControlRef control ;
-        Point pt ;
- #if MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_5
-        HIPoint hiPoint ;
-        HIGetMousePosition(kHICoordSpaceWindow, window, &hiPoint);
-        pt.h = hiPoint.x;
-        pt.v = hiPoint.y;
- #else
-        GetGlobalMouse( &pt );
-        int x = pt.h;
-        int y = pt.v;
-        ScreenToClient(&x, &y);
-        pt.h = x;
-        pt.v = y;
-#endif
-        control = FindControlUnderMouse( pt , window , &part ) ;
-        if ( control )
-            mouseWin = wxFindWindowFromWXWidget( (WXWidget) control ) ;
-
-    }
-#endif
-
-    if ( mouseWin == this && !wxIsBusy() )
-        m_cursor.MacInstall() ;
+    if ( GetPeer() != NULL )
+        GetPeer()->SetCursor( m_cursor );

 
     return true ;
 }
 
     return true ;
 }


@@ -755,32 +746,8 @@ bool wxWindowMac::DoPopupMenu(wxMenu *menu, int x, int y)
     {
         ClientToScreen( &x , &y ) ;
     }
     {
         ClientToScreen( &x , &y ) ;
     }

-#ifdef __WXOSX_CARBON__
-    long menuResult = ::PopUpMenuSelect((MenuHandle) menu->GetHMenu() , y, x, 0) ;
-    if ( HiWord(menuResult) != 0 )
-    {
-        MenuCommand macid;
-        GetMenuItemCommandID( GetMenuHandle(HiWord(menuResult)) , LoWord(menuResult) , &macid );
-        int id = wxMacCommandToId( macid );
-        wxMenuItem* item = NULL ;
-        wxMenu* realmenu ;
-        item = menu->FindItem( id, &realmenu ) ;
-        if ( item )
-        {
-            if (item->IsCheckable())
-                item->Check( !item->IsChecked() ) ;
-
-            menu->SendEvent( id , item->IsCheckable() ? item->IsChecked() : -1 ) ;
-        }
-    }
-
-    menu->MacAfterDisplay( true ) ;
+    menu->GetPeer()->PopUp(this, x, y);

     menu->SetInvokingWindow( NULL );
     menu->SetInvokingWindow( NULL );

-#else
-    menu->SetInvokingWindow( NULL );
-    return false;
-#endif
-

     return true;
 #else
     // actually this shouldn't be called, because universal is having its own implementation
     return true;
 #else
     // actually this shouldn't be called, because universal is having its own implementation


@@ -836,10 +803,12 @@ void wxWindowMac::MacInvalidateBorders()
     wxRect topupdate( tx-outerBorder, ty-outerBorder, tw + 2 * outerBorder, outerBorder );
     wxRect bottomupdate( tx-outerBorder, ty + th, tw + 2 * outerBorder, outerBorder );
     
     wxRect topupdate( tx-outerBorder, ty-outerBorder, tw + 2 * outerBorder, outerBorder );
     wxRect bottomupdate( tx-outerBorder, ty + th, tw + 2 * outerBorder, outerBorder );
     

-    GetParent()->m_peer->SetNeedsDisplay(&leftupdate);
-    GetParent()->m_peer->SetNeedsDisplay(&rightupdate);
-    GetParent()->m_peer->SetNeedsDisplay(&topupdate);
-    GetParent()->m_peer->SetNeedsDisplay(&bottomupdate);
+    if (GetParent()) {
+        GetParent()->m_peer->SetNeedsDisplay(&leftupdate);
+        GetParent()->m_peer->SetNeedsDisplay(&rightupdate);
+        GetParent()->m_peer->SetNeedsDisplay(&topupdate);
+        GetParent()->m_peer->SetNeedsDisplay(&bottomupdate);
+    }

 }
 
 void wxWindowMac::DoMoveWindow(int x, int y, int width, int height)
 }
 
 void wxWindowMac::DoMoveWindow(int x, int y, int width, int height)


@@ -889,9 +858,9 @@ void wxWindowMac::DoMoveWindow(int x, int y, int width, int height)
             wxSize( actualWidth - (MacGetLeftBorderSize() + MacGetRightBorderSize()) ,
                 actualHeight - (MacGetTopBorderSize() + MacGetBottomBorderSize()) ) ) ;
 
             wxSize( actualWidth - (MacGetLeftBorderSize() + MacGetRightBorderSize()) ,
                 actualHeight - (MacGetTopBorderSize() + MacGetBottomBorderSize()) ) ) ;
 

-        if ( !GetParent()->IsTopLevel() )
+        if ( parent && !parent->IsTopLevel() )

         {
         {

-            bounds.Offset( -GetParent()->MacGetLeftBorderSize(), -GetParent()->MacGetTopBorderSize() );
+            bounds.Offset( -parent->MacGetLeftBorderSize(), -parent->MacGetTopBorderSize() );

         }
 
         MacInvalidateBorders() ;
         }
 
         MacInvalidateBorders() ;


@@ -994,6 +963,13 @@ void wxWindowMac::DoSetSize(int x, int y, int width, int height, int sizeFlags)
         // TODO: REMOVE
         MacRepositionScrollBars() ; // we might have a real position shift
 
         // TODO: REMOVE
         MacRepositionScrollBars() ; // we might have a real position shift
 

+        if (sizeFlags & wxSIZE_FORCE_EVENT)
+        {
+            wxSizeEvent event( wxSize(width,height), GetId() );
+            event.SetEventObject( this );
+            HandleWindowEvent( event );
+        }
+

         return;
     }
 
         return;
     }
 


@@ -1134,19 +1110,21 @@ bool wxWindowMac::MacIsReallyHilited()
 
 int wxWindowMac::GetCharHeight() const
 {
 
 int wxWindowMac::GetCharHeight() const
 {

-    wxClientDC dc( (wxWindow*)this ) ;
+    wxCoord height;
+    GetTextExtent( wxT("g") , NULL , &height , NULL , NULL , NULL );

 
 

-    return dc.GetCharHeight() ;
+    return height;

 }
 
 int wxWindowMac::GetCharWidth() const
 {
 }
 
 int wxWindowMac::GetCharWidth() const
 {

-    wxClientDC dc( (wxWindow*)this ) ;
+    wxCoord width;
+    GetTextExtent( wxT("g") , &width , NULL , NULL , NULL , NULL );

 
 

-    return dc.GetCharWidth() ;
+    return width;

 }
 
 }
 

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

                            int *descent, int *externalLeading, const wxFont *theFont ) const
 {
     const wxFont *fontToUse = theFont;
                            int *descent, int *externalLeading, const wxFont *theFont ) const
 {
     const wxFont *fontToUse = theFont;


@@ -1157,17 +1135,22 @@ void wxWindowMac::GetTextExtent(const wxString& string, int *x, int *y,
         fontToUse = &tempFont;
     }
 
         fontToUse = &tempFont;
     }
 

-    wxClientDC dc( (wxWindow*) this ) ;
-    wxCoord lx,ly,ld,le ;
-    dc.GetTextExtent( string , &lx , &ly , &ld, &le, (wxFont *)fontToUse ) ;
+    wxGraphicsContext* ctx = wxGraphicsContext::Create();
+    ctx->SetFont( *fontToUse, *wxBLACK );
+
+    wxDouble h , d , e , w;
+    ctx->GetTextExtent( str, &w, &h, &d, &e );
+    
+    delete ctx;
+    

     if ( externalLeading )
     if ( externalLeading )

-        *externalLeading = le ;
+        *externalLeading = (wxCoord)(e+0.5);

     if ( descent )
     if ( descent )

-        *descent = ld ;
+        *descent = (wxCoord)(d+0.5);

     if ( x )
     if ( x )

-        *x = lx ;
+        *x = (wxCoord)(w+0.5);

     if ( y )
     if ( y )

-        *y = ly ;
+        *y = (wxCoord)(h+0.5);

 }
 
 /*
 }
 
 /*


@@ -1360,7 +1343,6 @@ void  wxWindowMac::MacPaintGrowBox()
 
         int size = m_hScrollBar ? m_hScrollBar->GetSize().y : ( m_vScrollBar ? m_vScrollBar->GetSize().x : MAC_SCROLLBAR_SIZE ) ;
         CGRect cgrect = CGRectMake( rect.right - size , rect.bottom - size , size , size ) ;
 
         int size = m_hScrollBar ? m_hScrollBar->GetSize().y : ( m_vScrollBar ? m_vScrollBar->GetSize().x : MAC_SCROLLBAR_SIZE ) ;
         CGRect cgrect = CGRectMake( rect.right - size , rect.bottom - size , size , size ) ;

-        CGPoint cgpoint = CGPointMake( rect.right - size , rect.bottom - size ) ;

         CGContextSaveGState( cgContext );
 
         if ( m_backgroundColour.Ok() )
         CGContextSaveGState( cgContext );
 
         if ( m_backgroundColour.Ok() )


@@ -1835,104 +1817,96 @@ void wxWindowMac::MacUpdateClippedRects() const
 /*
     This function must not change the updatergn !
  */
 /*
     This function must not change the updatergn !
  */

-bool wxWindowMac::MacDoRedraw( void* updatergnr , long time )
+bool wxWindowMac::MacDoRedraw( long time )

 {
     bool handled = false ;
 {
     bool handled = false ;

-#if wxOSX_USE_CARBON
-    Rect updatebounds ;
-    RgnHandle updatergn = (RgnHandle) updatergnr ;
-    GetRegionBounds( updatergn , &updatebounds ) ;
+    
+    wxRegion formerUpdateRgn = m_updateRegion;
+    wxRegion clientUpdateRgn = formerUpdateRgn;

 
 

-    // wxLogDebug(wxT("update for %s bounds %d, %d, %d, %d"), wxString(GetClassInfo()->GetClassName()).c_str(), updatebounds.left, updatebounds.top , updatebounds.right , updatebounds.bottom ) ;
+    wxSize sz = GetClientSize() ;
+    wxPoint origin = GetClientAreaOrigin() ;
+    
+    clientUpdateRgn.Intersect(origin.x , origin.y , origin.x + sz.x , origin.y + sz.y);
+    
+    // first send an erase event to the entire update area
+    {
+        // for the toplevel window this really is the entire area
+        // for all the others only their client area, otherwise they
+        // might be drawing with full alpha and eg put blue into
+        // the grow-box area of a scrolled window (scroll sample)
+        wxDC* dc = new wxWindowDC(this);
+        if ( IsTopLevel() )
+            dc->SetDeviceClippingRegion(formerUpdateRgn);
+        else
+            dc->SetDeviceClippingRegion(clientUpdateRgn);

 
 

-    if ( !EmptyRgn(updatergn) )
-    {
-        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 ) ;
+        wxEraseEvent eevent( GetId(), dc );
+        eevent.SetEventObject( this );
+        HandleWindowEvent( eevent );
+        delete dc ;
+    }

 
 

-        // first send an erase event to the entire update area
-        {
-            // for the toplevel window this really is the entire area
-            // for all the others only their client area, otherwise they
-            // might be drawing with full alpha and eg put blue into
-            // the grow-box area of a scrolled window (scroll sample)
-            wxDC* dc = new wxWindowDC(this);
-            if ( IsTopLevel() )
-                dc->SetClippingRegion(wxRegion(HIShapeCreateWithQDRgn(updatergn)));
-            else
-                dc->SetClippingRegion(wxRegion(HIShapeCreateWithQDRgn(newupdate)));
+    MacPaintGrowBox();

 
 

-            wxEraseEvent eevent( GetId(), dc );
-            eevent.SetEventObject( this );
-            HandleWindowEvent( eevent );
-            delete dc ;
-        }
+    // calculate a client-origin version of the update rgn and set m_updateRegion to that
+    clientUpdateRgn.Offset( -origin.x , -origin.y );
+    m_updateRegion = clientUpdateRgn ;

 
 

-        MacPaintGrowBox();
+    if ( !m_updateRegion.Empty() )
+    {
+        // paint the window itself

 
 

-        // calculate a client-origin version of the update rgn and set m_updateRegion to that
-        OffsetRgn( newupdate , -origin.x , -origin.y ) ;
-        m_updateRegion = wxRegion(HIShapeCreateWithQDRgn(newupdate)) ;
-        DisposeRgn( newupdate ) ;
+        wxPaintEvent event(GetId());
+        event.SetTimestamp(time);
+        event.SetEventObject(this);
+        handled = HandleWindowEvent(event);
+    }

 
 

-        if ( !m_updateRegion.Empty() )
-        {
-            // paint the window itself
+    m_updateRegion = formerUpdateRgn;
+    return handled;
+}

 
 

-            wxPaintEvent event;
-            event.SetTimestamp(time);
-            event.SetEventObject(this);
-            HandleWindowEvent(event);
-            handled = true ;
-        }
+void wxWindowMac::MacPaintChildrenBorders()
+{
+    // now we cannot rely on having its borders drawn by a window itself, as it does not
+    // get the updateRgn wide enough to always do so, so we do it from the parent
+    // this would also be the place to draw any custom backgrounds for native controls
+    // in Composited windowing
+    wxPoint clientOrigin = GetClientAreaOrigin() ;
+
+    wxWindowMac *child;
+    int x, y, w, h;
+    for (wxWindowList::compatibility_iterator node = GetChildren().GetFirst(); node; node = node->GetNext())
+    {
+        child = node->GetData();
+        if (child == NULL)
+            continue;
+        if (child == m_vScrollBar)
+            continue;
+        if (child == m_hScrollBar)
+            continue;
+        if (child->IsTopLevel())
+            continue;
+        if (!child->IsShown())
+            continue;

 
 

-        // now we cannot rely on having its borders drawn by a window itself, as it does not
-        // get the updateRgn wide enough to always do so, so we do it from the parent
-        // this would also be the place to draw any custom backgrounds for native controls
-        // in Composited windowing
-        wxPoint clientOrigin = GetClientAreaOrigin() ;
+        // only draw those in the update region (add a safety margin of 10 pixels for shadow effects

 
 

-        wxWindowMac *child;
-        int x, y, w, h;
-        for (wxWindowList::compatibility_iterator node = GetChildren().GetFirst(); node; node = node->GetNext())
+        child->GetPosition( &x, &y );
+        child->GetSize( &w, &h );
+        
+        if ( m_updateRegion.Contains(clientOrigin.x+x-10, clientOrigin.y+y-10, w+20, h+20) )

         {
         {

-            child = node->GetData();
-            if (child == NULL)
-                continue;
-            if (child == m_vScrollBar)
-                continue;
-            if (child == m_hScrollBar)
-                continue;
-            if (child->IsTopLevel())
-                continue;
-            if (!child->IsShown())
-                continue;
-
-            // only draw those in the update region (add a safety margin of 10 pixels for shadow effects
-
-            child->GetPosition( &x, &y );
-            child->GetSize( &w, &h );
-            Rect childRect = { y , x , y + h , x + w } ;
-            OffsetRect( &childRect , clientOrigin.x , clientOrigin.y ) ;
-            InsetRect( &childRect , -10 , -10) ;
-
-            if ( RectInRgn( &childRect , updatergn ) )
+            // paint custom borders
+            wxNcPaintEvent eventNc( child->GetId() );
+            eventNc.SetEventObject( child );
+            if ( !child->HandleWindowEvent( eventNc ) )

             {
             {

-                // paint custom borders
-                wxNcPaintEvent eventNc( child->GetId() );
-                eventNc.SetEventObject( child );
-                if ( !child->HandleWindowEvent( eventNc ) )
-                {
-                    child->MacPaintBorders(0, 0) ;
-                }
+                child->MacPaintBorders(0, 0) ;

             }
         }
     }
             }
         }
     }

-#endif
-    return handled ;

 }
 
 
 }
 
 


@@ -2216,24 +2190,7 @@ void wxWindowMac::OnMouseEvent( wxMouseEvent &event )
     }
 }
 
     }
 }
 

-void wxWindowMac::OnPaint( wxPaintEvent & WXUNUSED(event) )
-{
-#if wxOSX_USE_COCOA_OR_CARBON
-    // for native controls: call their native paint method
-    if ( !MacIsUserPane() || ( IsTopLevel() && GetBackgroundStyle() == wxBG_STYLE_SYSTEM ) )
-    {
-        if ( wxTheApp->MacGetCurrentEvent() != NULL && wxTheApp->MacGetCurrentEventHandlerCallRef() != NULL
-             && GetBackgroundStyle() != wxBG_STYLE_TRANSPARENT )
-            CallNextEventHandler(
-                (EventHandlerCallRef)wxTheApp->MacGetCurrentEventHandlerCallRef() ,
-                (EventRef) wxTheApp->MacGetCurrentEvent() ) ;
-    }
-#endif
-}
-
-void wxWindowMac::MacHandleControlClick(WXWidget WXUNUSED(control),
-                                        wxInt16 WXUNUSED(controlpart),
-                                        bool WXUNUSED(mouseStillDown))
+void wxWindowMac::TriggerScrollEvent( wxEventType WXUNUSED(scrollEvent) )

 {
 }
 
 {
 }
 


@@ -2247,7 +2204,7 @@ Rect wxMacGetBoundsForControl( wxWindowMac* window , const wxPoint& pos , const
     return bounds ;
 }
 
     return bounds ;
 }
 

-bool wxWindowMac::HandleClicked( double timestampsec )
+bool wxWindowMac::OSXHandleClicked( double timestampsec )

 {
     return false;
 }
 {
     return false;
 }


@@ -2255,7 +2212,7 @@ bool wxWindowMac::HandleClicked( double timestampsec )
 wxInt32 wxWindowMac::MacControlHit(WXEVENTHANDLERREF WXUNUSED(handler) , WXEVENTREF event )
 {
 #if wxOSX_USE_COCOA_OR_CARBON
 wxInt32 wxWindowMac::MacControlHit(WXEVENTHANDLERREF WXUNUSED(handler) , WXEVENTREF event )
 {
 #if wxOSX_USE_COCOA_OR_CARBON

-    if ( HandleClicked( GetEventTime((EventRef)event) ) )
+    if ( OSXHandleClicked( GetEventTime((EventRef)event) ) )

         return noErr;
         
     return eventNotHandledErr ;
         return noErr;
         
     return eventNotHandledErr ;


@@ -2321,10 +2278,103 @@ bool wxWindowMac::IsShownOnScreen() const
     return wxWindowBase::IsShownOnScreen();
 }
 
     return wxWindowBase::IsShownOnScreen();
 }
 

+bool wxWindowMac::OSXHandleKeyEvent( wxKeyEvent& event )
+{
+    bool handled = HandleWindowEvent( event ) ;
+    if ( handled && event.GetSkipped() )
+        handled = false ;
+
+#if wxUSE_ACCEL
+    if ( !handled && event.GetEventType() == wxEVT_KEY_DOWN)
+    {
+        wxWindow *ancestor = this;
+        while (ancestor)
+        {
+            int command = ancestor->GetAcceleratorTable()->GetCommand( event );
+            if (command != -1)
+            {
+                wxEvtHandler * const handler = ancestor->GetEventHandler();
+
+                wxCommandEvent command_event( wxEVT_COMMAND_MENU_SELECTED, command );
+                handled = handler->ProcessEvent( command_event );
+
+                if ( !handled )
+                {
+                    // accelerators can also be used with buttons, try them too
+                    command_event.SetEventType(wxEVT_COMMAND_BUTTON_CLICKED);
+                    handled = handler->ProcessEvent( command_event );
+                }
+
+                break;
+            }
+
+            if (ancestor->IsTopLevel())
+                break;
+
+            ancestor = ancestor->GetParent();
+        }
+    }
+#endif // wxUSE_ACCEL
+
+    return handled ;
+}
+

 //
 // wxWidgetImpl 
 //
 
 //
 // wxWidgetImpl 
 //
 

+WX_DECLARE_HASH_MAP(WXWidget, wxWidgetImpl*, wxPointerHash, wxPointerEqual, MacControlMap);
+
+static MacControlMap wxWinMacControlList;
+
+wxWindowMac *wxFindWindowFromWXWidget(WXWidget inControl )
+{
+    wxWidgetImpl* impl = wxWidgetImpl::FindFromWXWidget( inControl );
+    if ( impl )
+        return impl->GetWXPeer();
+    
+    return NULL;
+}
+
+wxWidgetImpl *wxWidgetImpl::FindFromWXWidget(WXWidget inControl )
+{
+    MacControlMap::iterator node = wxWinMacControlList.find(inControl);
+
+    return (node == wxWinMacControlList.end()) ? NULL : node->second;
+}
+
+void wxWidgetImpl::Associate(WXWidget inControl, wxWidgetImpl *impl)
+{
+    // adding NULL ControlRef is (first) surely a result of an error and
+    // (secondly) breaks native event processing
+    wxCHECK_RET( inControl != (WXWidget) NULL, wxT("attempt to add a NULL WXWidget to control map") );
+
+    wxWinMacControlList[inControl] = impl;
+}
+
+void wxWidgetImpl::RemoveAssociations(wxWidgetImpl* impl)
+{
+   // iterate over all the elements in the class
+    // is the iterator stable ? as we might have two associations pointing to the same wxWindow
+    // we should go on...
+
+    bool found = true ;
+    while ( found )
+    {
+        found = false ;
+        MacControlMap::iterator it;
+        for ( it = wxWinMacControlList.begin(); it != wxWinMacControlList.end(); ++it )
+        {
+            if ( it->second == impl )
+            {
+                wxWinMacControlList.erase(it);
+                found = true ;
+                break;
+            }
+        }
+    }
+}
+

 IMPLEMENT_ABSTRACT_CLASS( wxWidgetImpl , wxObject )
 
 wxWidgetImpl::wxWidgetImpl( wxWindowMac* peer , bool isRootControl )
 IMPLEMENT_ABSTRACT_CLASS( wxWidgetImpl , wxObject )
 
 wxWidgetImpl::wxWidgetImpl( wxWindowMac* peer , bool isRootControl )