SetParam should be explicit

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

diff --git a/src/mac/carbon/window.cpp b/src/mac/carbon/window.cpp
index 744c85afbe878b5eba4da798b7573cd1671bd3b2..305886f8907b940a6920ed72478fde045dfd5d78 100644 (file)
--- a/src/mac/carbon/window.cpp
+++ b/src/mac/carbon/window.cpp
@@ -6,7 +6,7 @@
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor

-// Licence:     wxWidgets licence
+// Licence:     wxWindows licence

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


@@ -559,8 +559,25 @@ pascal void wxMacLiveScrollbarActionProc( ControlRef control , ControlPartCode p
  // constructors and such
 // ----------------------------------------------------------------------------
 
  // constructors and such
 // ----------------------------------------------------------------------------
 

+wxWindowMac::wxWindowMac()
+{ 
+    Init(); 
+}
+
+wxWindowMac::wxWindowMac(wxWindowMac *parent,
+            wxWindowID id,
+            const wxPoint& pos ,
+            const wxSize& size ,
+            long style ,
+            const wxString& name )
+{
+    Init();
+    Create(parent, id, pos, size, style, name);
+}
+

 void wxWindowMac::Init()
 {
 void wxWindowMac::Init()
 {

+    m_peer = NULL ;

     m_frozenness = 0 ;
 #if WXWIN_COMPATIBILITY_2_4
     m_backgroundTransparent = FALSE;
     m_frozenness = 0 ;
 #if WXWIN_COMPATIBILITY_2_4
     m_backgroundTransparent = FALSE;


@@ -573,8 +590,6 @@ void wxWindowMac::Init()
     m_vScrollBar = NULL ;
     m_macBackgroundBrush = wxNullBrush ;
 
     m_vScrollBar = NULL ;
     m_macBackgroundBrush = wxNullBrush ;
 

-       m_macControl = NULL ;
-

     m_macIsUserPane = TRUE;
     
     // make sure all proc ptrs are available
     m_macIsUserPane = TRUE;
     
     // make sure all proc ptrs are available


@@ -636,13 +651,12 @@ wxWindowMac::~wxWindowMac()
         if (parent->GetDefaultItem() == (wxButton*) this)
             parent->SetDefaultItem(NULL);
     }
         if (parent->GetDefaultItem() == (wxButton*) this)
             parent->SetDefaultItem(NULL);
     }

-    if ( (ControlRef) m_macControl )
+    if ( m_peer && m_peer->Ok() )

     {
         // in case the callback might be called during destruction
         wxRemoveMacControlAssociation( this) ;
     {
         // in case the callback might be called during destruction
         wxRemoveMacControlAssociation( this) ;

-        ::SetControlColorProc( (ControlRef) m_macControl , NULL ) ;
-        ::DisposeControl( (ControlRef) m_macControl ) ;
-        m_macControl = NULL ;
+        ::SetControlColorProc( *m_peer , NULL ) ;
+        ::DisposeControl( *m_peer ) ;

     }
 
     if ( g_MacLastWindow == this )
     }
 
     if ( g_MacLastWindow == this )


@@ -667,14 +681,19 @@ wxWindowMac::~wxWindowMac()
         m_dropTarget = NULL;
     }
 #endif // wxUSE_DRAG_AND_DROP
         m_dropTarget = NULL;
     }
 #endif // wxUSE_DRAG_AND_DROP

+    delete m_peer ;
+}
+
+WXWidget wxWindowMac::GetHandle() const 
+{ 
+    return (WXWidget) (ControlRef) *m_peer ; 

 }
 
 }
 

-//

 
 void wxWindowMac::MacInstallEventHandler()
 {
 
 void wxWindowMac::MacInstallEventHandler()
 {

-    wxAssociateControlWithMacControl( (ControlRef) m_macControl , this ) ;
-    InstallControlEventHandler( (ControlRef) m_macControl, GetwxMacWindowEventHandlerUPP(),
+    wxAssociateControlWithMacControl( *m_peer , this ) ;
+    InstallControlEventHandler( *m_peer, GetwxMacWindowEventHandlerUPP(),

         GetEventTypeCount(eventList), eventList, this, 
         (EventHandlerRef *)&m_macControlEventHandler);
 
         GetEventTypeCount(eventList), eventList, this, 
         (EventHandlerRef *)&m_macControlEventHandler);
 


@@ -711,25 +730,27 @@ bool wxWindowMac::Create(wxWindowMac *parent, wxWindowID id,
 //                     | kControlWantsIdle
                        ; 
 
 //                     | kControlWantsIdle
                        ; 
 

-        ::CreateUserPaneControl( MAC_WXHWND(GetParent()->MacGetTopLevelWindowRef()) , &bounds, features , (ControlRef*) &m_macControl); 
+        m_peer = new wxMacControl() ;
+        ::CreateUserPaneControl( MAC_WXHWND(GetParent()->MacGetTopLevelWindowRef()) , &bounds, features , *m_peer);
+         

 
         MacPostControlCreate(pos,size) ;
 #if !TARGET_API_MAC_OSX
 
         MacPostControlCreate(pos,size) ;
 #if !TARGET_API_MAC_OSX

-        SetControlData((ControlRef) m_macControl,kControlEntireControl,kControlUserPaneDrawProcTag, 
+        SetControlData(*m_peer,kControlEntireControl,kControlUserPaneDrawProcTag, 

                sizeof(gControlUserPaneDrawUPP),(Ptr) &gControlUserPaneDrawUPP);
                sizeof(gControlUserPaneDrawUPP),(Ptr) &gControlUserPaneDrawUPP);

-        SetControlData((ControlRef) m_macControl,kControlEntireControl,kControlUserPaneHitTestProcTag, 
+        SetControlData(*m_peer,kControlEntireControl,kControlUserPaneHitTestProcTag, 

                sizeof(gControlUserPaneHitTestUPP),(Ptr) &gControlUserPaneHitTestUPP);
                sizeof(gControlUserPaneHitTestUPP),(Ptr) &gControlUserPaneHitTestUPP);

-        SetControlData((ControlRef) m_macControl,kControlEntireControl,kControlUserPaneTrackingProcTag, 
+        SetControlData(*m_peer,kControlEntireControl,kControlUserPaneTrackingProcTag, 

                sizeof(gControlUserPaneTrackingUPP),(Ptr) &gControlUserPaneTrackingUPP);
                sizeof(gControlUserPaneTrackingUPP),(Ptr) &gControlUserPaneTrackingUPP);

-        SetControlData((ControlRef) m_macControl,kControlEntireControl,kControlUserPaneIdleProcTag, 
+        SetControlData(*m_peer,kControlEntireControl,kControlUserPaneIdleProcTag, 

                sizeof(gControlUserPaneIdleUPP),(Ptr) &gControlUserPaneIdleUPP);
                sizeof(gControlUserPaneIdleUPP),(Ptr) &gControlUserPaneIdleUPP);

-        SetControlData((ControlRef) m_macControl,kControlEntireControl,kControlUserPaneKeyDownProcTag, 
+        SetControlData(*m_peer,kControlEntireControl,kControlUserPaneKeyDownProcTag, 

                sizeof(gControlUserPaneKeyDownUPP),(Ptr) &gControlUserPaneKeyDownUPP);
                sizeof(gControlUserPaneKeyDownUPP),(Ptr) &gControlUserPaneKeyDownUPP);

-        SetControlData((ControlRef) m_macControl,kControlEntireControl,kControlUserPaneActivateProcTag, 
+        SetControlData(*m_peer,kControlEntireControl,kControlUserPaneActivateProcTag, 

                sizeof(gControlUserPaneActivateUPP),(Ptr) &gControlUserPaneActivateUPP);
                sizeof(gControlUserPaneActivateUPP),(Ptr) &gControlUserPaneActivateUPP);

-        SetControlData((ControlRef) m_macControl,kControlEntireControl,kControlUserPaneFocusProcTag, 
+        SetControlData(*m_peer,kControlEntireControl,kControlUserPaneFocusProcTag, 

                sizeof(gControlUserPaneFocusUPP),(Ptr) &gControlUserPaneFocusUPP);
                sizeof(gControlUserPaneFocusUPP),(Ptr) &gControlUserPaneFocusUPP);

-        SetControlData((ControlRef) m_macControl,kControlEntireControl,kControlUserPaneBackgroundProcTag, 
+        SetControlData(*m_peer,kControlEntireControl,kControlUserPaneBackgroundProcTag, 

                sizeof(gControlUserPaneBackgroundUPP),(Ptr) &gControlUserPaneBackgroundUPP);
 #endif        
     }
                sizeof(gControlUserPaneBackgroundUPP),(Ptr) &gControlUserPaneBackgroundUPP);
 #endif        
     }


@@ -750,15 +771,15 @@ bool wxWindowMac::Create(wxWindowMac *parent, wxWindowID id,
 
 void wxWindowMac::MacPostControlCreate(const wxPoint& pos, const wxSize& size)
 {
 
 void wxWindowMac::MacPostControlCreate(const wxPoint& pos, const wxSize& size)
 {

-    wxASSERT_MSG( (ControlRef) m_macControl != NULL , wxT("No valid mac control") ) ;
+    wxASSERT_MSG( m_peer != NULL && m_peer->Ok() , wxT("No valid mac control") ) ;

 
 

-    ::SetControlReference( (ControlRef) m_macControl , (long) this ) ;
+    ::SetControlReference( *m_peer , (long) this ) ;

 
     MacInstallEventHandler();
 
     ControlRef container = (ControlRef) GetParent()->GetHandle() ;
     wxASSERT_MSG( container != NULL , wxT("No valid mac container control") ) ;
 
     MacInstallEventHandler();
 
     ControlRef container = (ControlRef) GetParent()->GetHandle() ;
     wxASSERT_MSG( container != NULL , wxT("No valid mac container control") ) ;

-    ::EmbedControl( (ControlRef) m_macControl , container ) ;
+    ::EmbedControl( *m_peer , container ) ;

 
     // adjust font, controlsize etc
     DoSetWindowVariant( m_windowVariant ) ;
 
     // adjust font, controlsize etc
     DoSetWindowVariant( m_windowVariant ) ;


@@ -766,10 +787,10 @@ void wxWindowMac::MacPostControlCreate(const wxPoint& pos, const wxSize& size)
 #if !TARGET_API_MAC_OSX
     // eventually we can fix some clipping issues be reactivating this hook 
     //if ( m_macIsUserPane )
 #if !TARGET_API_MAC_OSX
     // eventually we can fix some clipping issues be reactivating this hook 
     //if ( m_macIsUserPane )

-    // SetControlColorProc( (ControlRef) m_macControl , wxMacSetupControlBackgroundUPP ) ;
+    // SetControlColorProc( *m_peer , wxMacSetupControlBackgroundUPP ) ;

 #endif
     
 #endif
     

-    UMASetControlTitle( (ControlRef) m_macControl , wxStripMenuCodes(m_label) , m_font.GetEncoding() ) ;
+    UMASetControlTitle( *m_peer , wxStripMenuCodes(m_label) , m_font.GetEncoding() ) ;

 
     if (!m_macIsUserPane)
     {
 
     if (!m_macIsUserPane)
     {


@@ -783,11 +804,11 @@ void wxWindowMac::DoSetWindowVariant( wxWindowVariant variant )
 {
     // Don't assert, in case we set the window variant before
     // the window is created
 {
     // Don't assert, in case we set the window variant before
     // the window is created

-    // wxASSERT( m_macControl != NULL ) ;
+    // wxASSERT( m_peer->Ok() ) ;

 
     m_windowVariant = variant ;
 
 
     m_windowVariant = variant ;
 

-    if (!m_macControl)
+    if (m_peer == NULL || !m_peer->Ok())

         return;
 
        ControlSize size ;
         return;
 
        ControlSize size ;


@@ -828,7 +849,7 @@ void wxWindowMac::DoSetWindowVariant( wxWindowVariant variant )
             wxFAIL_MSG(_T("unexpected window variant"));
             break ;
     }
             wxFAIL_MSG(_T("unexpected window variant"));
             break ;
     }

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

 
     wxFont font ;
     font.MacCreateThemeFont( themeFont ) ;
 
     wxFont font ;
     font.MacCreateThemeFont( themeFont ) ;


@@ -868,7 +889,7 @@ void wxWindowMac::MacUpdateControlFont()
     fontStyle.foreColor = MAC_WXCOLORREF(GetForegroundColour().GetPixel() ) ;
     fontStyle.flags |= kControlUseForeColorMask ;
        
     fontStyle.foreColor = MAC_WXCOLORREF(GetForegroundColour().GetPixel() ) ;
     fontStyle.flags |= kControlUseForeColorMask ;
        

-       ::SetControlFontStyle( (ControlRef) m_macControl , &fontStyle );
+       ::SetControlFontStyle( *m_peer , &fontStyle );

        Refresh() ;
 }
 
        Refresh() ;
 }
 


@@ -919,14 +940,13 @@ bool wxWindowMac::SetBackgroundColour(const wxColour& col )
 
 bool wxWindowMac::MacCanFocus() const
 {
 
 bool wxWindowMac::MacCanFocus() const
 {

-#if 0
-    // there is currently no way to determinate whether the window is running in full keyboard
-    // access mode, therefore we cannot rely on these features yet
+    // there is currently no way to determine whether the window is running in full keyboard
+    // access mode, therefore we cannot rely on these features, yet the only other way would be
+    // to issue a SetKeyboardFocus event and verify after whether it succeeded, this would risk problems
+    // in event handlers...

     UInt32 features = 0 ;
     UInt32 features = 0 ;

-    GetControlFeatures( (ControlRef) m_macControl , &features ) ;
+    GetControlFeatures( *m_peer , &features ) ;

     return features & ( kControlSupportsFocus | kControlGetsFocusOnClick ) ; 
     return features & ( kControlSupportsFocus | kControlGetsFocusOnClick ) ; 

-#endif
-    return true ;

 }
 
 
 }
 
 


@@ -1018,7 +1038,7 @@ void wxWindowMac::MacGetPositionAndSizeFromControl(int& x, int& y,
                                            int& w, int& h) const 
 {
     Rect bounds ;
                                            int& w, int& h) const 
 {
     Rect bounds ;

-    GetControlBounds( (ControlRef) m_macControl , &bounds ) ;   
+    GetControlBounds( *m_peer , &bounds ) ;   

 
 
     x = bounds.left ;
 
 
     x = bounds.left ;


@@ -1030,11 +1050,7 @@ void wxWindowMac::MacGetPositionAndSizeFromControl(int& x, int& y,
     if ( tlw )
     {
         Point tlworigin =  { 0 , 0  } ;
     if ( tlw )
     {
         Point tlworigin =  { 0 , 0  } ;

-        GrafPtr port ;
-        bool swapped = QDSwapPort( UMAGetWindowPort( (WindowRef) tlw->MacGetWindowRef() ) , &port ) ;
-        ::LocalToGlobal( &tlworigin ) ;
-        if ( swapped )
-            ::SetPort( port ) ;
+        QDLocalToGlobalPoint( UMAGetWindowPort( (WindowRef) tlw->MacGetWindowRef() ) , &tlworigin ) ;

         x = tlworigin.h ;
         y = tlworigin.v ;    
     }
         x = tlworigin.h ;
         y = tlworigin.v ;    
     }


@@ -1069,7 +1085,7 @@ void wxWindowMac::DoGetSize(int *x, int *y) const
     
 #else
     Rect bounds ;
     
 #else
     Rect bounds ;

-    GetControlBounds( (ControlRef) m_macControl , &bounds ) ;   
+    GetControlBounds( *m_peer , &bounds ) ;   

     if(x)   *x = bounds.right - bounds.left ;
     if(y)   *y = bounds.bottom - bounds.top ;
 #endif
     if(x)   *x = bounds.right - bounds.left ;
     if(y)   *y = bounds.bottom - bounds.top ;
 #endif


@@ -1094,7 +1110,7 @@ void wxWindowMac::DoGetPosition(int *x, int *y) const
     if(y)   *y = y1 ;
  #else
     Rect bounds ;
     if(y)   *y = y1 ;
  #else
     Rect bounds ;

-    GetControlBounds( (ControlRef) m_macControl , &bounds ) ;   
+    GetControlBounds( *m_peer , &bounds ) ;   

     wxCHECK_RET( GetParent() , wxT("Missing Parent") ) ;
     
     int xx = bounds.left ;
     wxCHECK_RET( GetParent() , wxT("Missing Parent") ) ;
     
     int xx = bounds.left ;


@@ -1129,8 +1145,7 @@ void wxWindowMac::DoScreenToClient(int *x, int *y) const
         if(x) localwhere.h = * x ;
         if(y) localwhere.v = * y ;
         
         if(x) localwhere.h = * x ;
         if(y) localwhere.v = * y ;
         

-        wxMacPortSaver s((GrafPtr)GetWindowPort( window )) ;
-        ::GlobalToLocal( &localwhere ) ;
+        QDGlobalToLocalPoint( GetWindowPort( window ) , &localwhere ) ;

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


@@ -1157,9 +1172,7 @@ void wxWindowMac::DoClientToScreen(int *x, int *y) const
         Point localwhere = { 0,0 };
         if(x)   localwhere.h = * x ;
         if(y)   localwhere.v = * y ;
         Point localwhere = { 0,0 };
         if(x)   localwhere.h = * x ;
         if(y)   localwhere.v = * y ;

-
-        wxMacPortSaver s((GrafPtr)GetWindowPort( window )) ;
-        ::LocalToGlobal( &localwhere ) ;
+        QDLocalToGlobalPoint( GetWindowPort( window ) , &localwhere ) ;

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


@@ -1191,7 +1204,7 @@ void wxWindowMac::MacWindowToRootWindow( int *x , int *y ) const
     if ( y ) pt.y = *y ;
 
     if ( !IsTopLevel() )
     if ( y ) pt.y = *y ;
 
     if ( !IsTopLevel() )

-        HIViewConvertPoint( &pt , (ControlRef) m_macControl , (ControlRef) MacGetTopLevelWindow()->GetHandle()  ) ;
+        HIViewConvertPoint( &pt , *m_peer , (ControlRef) MacGetTopLevelWindow()->GetHandle()  ) ;

     
     if ( x ) *x = (int) pt.x ;
     if ( y ) *y = (int) pt.y ;
     
     if ( x ) *x = (int) pt.x ;
     if ( y ) *y = (int) pt.y ;


@@ -1199,7 +1212,7 @@ void wxWindowMac::MacWindowToRootWindow( int *x , int *y ) const
     if ( !IsTopLevel() )
     {
         Rect bounds ;
     if ( !IsTopLevel() )
     {
         Rect bounds ;

-        GetControlBounds( (ControlRef) m_macControl , &bounds ) ;   
+        GetControlBounds( *m_peer , &bounds ) ;   

         if(x)   *x += bounds.left ;
         if(y)   *y += bounds.top ;
     }
         if(x)   *x += bounds.left ;
         if(y)   *y += bounds.top ;
     }


@@ -1224,7 +1237,7 @@ void wxWindowMac::MacRootWindowToWindow( int *x , int *y ) const
     if ( y ) pt.y = *y ;
 
     if ( !IsTopLevel() )
     if ( y ) pt.y = *y ;
 
     if ( !IsTopLevel() )

-        HIViewConvertPoint( &pt , (ControlRef) MacGetTopLevelWindow()->GetHandle()  , (ControlRef) m_macControl ) ;
+        HIViewConvertPoint( &pt , (ControlRef) MacGetTopLevelWindow()->GetHandle()  , *m_peer ) ;

     
     if ( x ) *x = (int) pt.x ;
     if ( y ) *y = (int) pt.y ;
     
     if ( x ) *x = (int) pt.x ;
     if ( y ) *y = (int) pt.y ;


@@ -1232,7 +1245,7 @@ void wxWindowMac::MacRootWindowToWindow( int *x , int *y ) const
     if ( !IsTopLevel() )
     {
         Rect bounds ;
     if ( !IsTopLevel() )
     {
         Rect bounds ;

-        GetControlBounds( (ControlRef) m_macControl , &bounds ) ;   
+        GetControlBounds( *m_peer , &bounds ) ;   

         if(x)   *x -= bounds.left ;
         if(y)   *y -= bounds.top ;
     }
         if(x)   *x -= bounds.left ;
         if(y)   *y -= bounds.top ;
     }


@@ -1253,17 +1266,17 @@ void wxWindowMac::MacGetContentAreaInset( int &left , int &top , int &right , in
 {
     RgnHandle rgn = NewRgn() ;
     Rect content ;
 {
     RgnHandle rgn = NewRgn() ;
     Rect content ;

-    if ( GetControlRegion( (ControlRef) m_macControl , kControlContentMetaPart , rgn ) == noErr )
+    if ( GetControlRegion( *m_peer , kControlContentMetaPart , rgn ) == noErr )

     {
         GetRegionBounds( rgn , &content ) ;
         DisposeRgn( rgn ) ;
     }
     else
     {
     {
         GetRegionBounds( rgn , &content ) ;
         DisposeRgn( rgn ) ;
     }
     else
     {

-        GetControlBounds( (ControlRef) m_macControl , &content ) ;
+        GetControlBounds( *m_peer , &content ) ;

     }
     Rect structure ;
     }
     Rect structure ;

-    GetControlBounds( (ControlRef) m_macControl , &structure ) ;
+    GetControlBounds( *m_peer , &structure ) ;

 #if !TARGET_API_MAC_OSX    
     OffsetRect( &content , -structure.left , -structure.top ) ;
 #endif
 #if !TARGET_API_MAC_OSX    
     OffsetRect( &content , -structure.left , -structure.top ) ;
 #endif


@@ -1281,17 +1294,17 @@ wxSize wxWindowMac::DoGetSizeFromClientSize( const wxSize & size )  const
 
     Rect content ;
     
 
     Rect content ;
     

-    if ( GetControlRegion( (ControlRef) m_macControl , kControlContentMetaPart , rgn ) == noErr )
+    if ( GetControlRegion( *m_peer , kControlContentMetaPart , rgn ) == noErr )

     {
         GetRegionBounds( rgn , &content ) ;
         DisposeRgn( rgn ) ;
     }
     else
     {
     {
         GetRegionBounds( rgn , &content ) ;
         DisposeRgn( rgn ) ;
     }
     else
     {

-        GetControlBounds( (ControlRef) m_macControl , &content ) ;
+        GetControlBounds( *m_peer , &content ) ;

     }
     Rect structure ;
     }
     Rect structure ;

-    GetControlBounds( (ControlRef) m_macControl , &structure ) ;
+    GetControlBounds( *m_peer , &structure ) ;

 #if !TARGET_API_MAC_OSX    
     OffsetRect( &content , -structure.left , -structure.top ) ;
 #endif
 #if !TARGET_API_MAC_OSX    
     OffsetRect( &content , -structure.left , -structure.top ) ;
 #endif


@@ -1313,18 +1326,18 @@ void wxWindowMac::DoGetClientSize(int *x, int *y) const
 
     RgnHandle rgn = NewRgn() ;
     Rect content ;
 
     RgnHandle rgn = NewRgn() ;
     Rect content ;

-    if ( GetControlRegion( (ControlRef) m_macControl , kControlContentMetaPart , rgn ) == noErr )
+    if ( GetControlRegion( *m_peer , kControlContentMetaPart , rgn ) == noErr )

     {
         GetRegionBounds( rgn , &content ) ;
         DisposeRgn( rgn ) ;
     }
     else
     {
     {
         GetRegionBounds( rgn , &content ) ;
         DisposeRgn( rgn ) ;
     }
     else
     {

-        GetControlBounds( (ControlRef) m_macControl , &content ) ;
+        GetControlBounds( *m_peer , &content ) ;

     }
 #if !TARGET_API_MAC_OSX
     Rect structure ;
     }
 #if !TARGET_API_MAC_OSX
     Rect structure ;

-    GetControlBounds( (ControlRef) m_macControl , &structure ) ;
+    GetControlBounds( *m_peer , &structure ) ;

     OffsetRect( &content , -structure.left , -structure.top ) ;
 #endif 
     ww = content.right - content.left ;
     OffsetRect( &content , -structure.left , -structure.top ) ;
 #endif 
     ww = content.right - content.left ;


@@ -1431,7 +1444,16 @@ bool wxWindowMac::DoPopupMenu(wxMenu *menu, int x, int y)
 {
     menu->SetInvokingWindow(this);
     menu->UpdateUI();
 {
     menu->SetInvokingWindow(this);
     menu->UpdateUI();

-    ClientToScreen( &x , &y ) ;
+    
+    if ( x == -1 && y == -1 )
+    {
+        wxPoint mouse = wxGetMousePosition();
+        x = mouse.x; y = mouse.y;
+    }
+    else
+    {
+        ClientToScreen( &x , &y ) ;
+    }

 
     menu->MacBeforeDisplay( true ) ;
     long menuResult = ::PopUpMenuSelect((MenuHandle) menu->GetHMenu() ,y,x, 0) ;
 
     menu->MacBeforeDisplay( true ) ;
     long menuResult = ::PopUpMenuSelect((MenuHandle) menu->GetHMenu() ,y,x, 0) ;


@@ -1512,21 +1534,21 @@ void wxWindowMac::DoMoveWindow(int x, int y, int width, int height)
     {
         // we don't adjust twice for the origin
         Rect r = wxMacGetBoundsForControl(this , wxPoint( actualX,actualY), wxSize( actualWidth, actualHeight ) , false ) ;
     {
         // we don't adjust twice for the origin
         Rect r = wxMacGetBoundsForControl(this , wxPoint( actualX,actualY), wxSize( actualWidth, actualHeight ) , false ) ;

-        bool vis = IsControlVisible( (ControlRef) m_macControl ) ;
+        bool vis = IsControlVisible( *m_peer ) ;

 #if TARGET_API_MAC_OSX
         // the HIViewSetFrame call itself should invalidate the areas, but when testing with the UnicodeTextCtrl it does not !
         if ( vis )
 #if TARGET_API_MAC_OSX
         // the HIViewSetFrame call itself should invalidate the areas, but when testing with the UnicodeTextCtrl it does not !
         if ( vis )

-            SetControlVisibility(  (ControlRef)m_macControl , false , true ) ;
+            SetControlVisibility(  *m_peer , false , true ) ;

         HIRect hir = { r.left , r.top , r.right - r.left , r.bottom - r.top } ;
         HIRect hir = { r.left , r.top , r.right - r.left , r.bottom - r.top } ;

-        HIViewSetFrame ( (ControlRef) m_macControl , &hir ) ;
+        HIViewSetFrame ( *m_peer , &hir ) ;

         if ( vis )
         if ( vis )

-            SetControlVisibility(  (ControlRef)m_macControl , true , true ) ;
+            SetControlVisibility(  *m_peer , true , true ) ;

 #else
         if ( vis )
 #else
         if ( vis )

-            SetControlVisibility(  (ControlRef)m_macControl , false , true ) ;
-        SetControlBounds( (ControlRef) m_macControl , &r ) ;
+            SetControlVisibility(  *m_peer , false , true ) ;
+        SetControlBounds( *m_peer , &r ) ;

         if ( vis )
         if ( vis )

-            SetControlVisibility(  (ControlRef)m_macControl , true , true ) ;
+            SetControlVisibility(  *m_peer , true , true ) ;

 #endif
         MacRepositionScrollBars() ;
         if ( doMove )
 #endif
         MacRepositionScrollBars() ;
         if ( doMove )


@@ -1556,7 +1578,7 @@ wxSize wxWindowMac::DoGetBestSize() const
     Rect    bestsize = { 0 , 0 , 0 , 0 } ;
     short   baselineoffset ;
     int bestWidth, bestHeight ;
     Rect    bestsize = { 0 , 0 , 0 , 0 } ;
     short   baselineoffset ;
     int bestWidth, bestHeight ;

-    ::GetBestControlRect( (ControlRef) m_macControl , &bestsize , &baselineoffset ) ;
+    ::GetBestControlRect( *m_peer , &bestsize , &baselineoffset ) ;

 
     if ( EmptyRect( &bestsize ) )
     {
 
     if ( EmptyRect( &bestsize ) )
     {


@@ -1663,7 +1685,7 @@ wxPoint wxWindowMac::GetClientAreaOrigin() const
 {
     RgnHandle rgn = NewRgn() ;
     Rect content ;
 {
     RgnHandle rgn = NewRgn() ;
     Rect content ;

-    GetControlRegion( (ControlRef) m_macControl , kControlContentMetaPart , rgn ) ;
+    GetControlRegion( *m_peer , kControlContentMetaPart , rgn ) ;

     GetRegionBounds( rgn , &content ) ;
     DisposeRgn( rgn ) ;
 #if !TARGET_API_MAC_OSX
     GetRegionBounds( rgn , &content ) ;
     DisposeRgn( rgn ) ;
 #if !TARGET_API_MAC_OSX


@@ -1672,7 +1694,7 @@ wxPoint wxWindowMac::GetClientAreaOrigin() const
     if (!::EmptyRect( &content ) )
     {
         Rect structure ;
     if (!::EmptyRect( &content ) )
     {
         Rect structure ;

-        GetControlBounds( (ControlRef) m_macControl , &structure ) ;
+        GetControlBounds( *m_peer , &structure ) ;

         OffsetRect( &content , -structure.left , -structure.top ) ;
     }
 #endif 
         OffsetRect( &content , -structure.left , -structure.top ) ;
     }
 #endif 


@@ -1699,9 +1721,9 @@ void wxWindowMac::SetTitle(const wxString& title)
 {
     m_label = wxStripMenuCodes(title) ;
 
 {
     m_label = wxStripMenuCodes(title) ;
 

-    if ( m_macControl )
+    if ( m_peer && m_peer->Ok() )

     {
     {

-               UMASetControlTitle( (ControlRef) m_macControl , m_label , m_font.GetEncoding() ) ;
+               UMASetControlTitle( *m_peer , m_label , m_font.GetEncoding() ) ;

     }
     Refresh() ;
 }
     }
     Refresh() ;
 }


@@ -1719,7 +1741,7 @@ bool wxWindowMac::Show(bool show)
     // TODO use visibilityChanged Carbon Event for OSX
     bool former = MacIsReallyShown() ;
     
     // TODO use visibilityChanged Carbon Event for OSX
     bool former = MacIsReallyShown() ;
     

-    SetControlVisibility( (ControlRef) m_macControl , show , true ) ;
+    SetControlVisibility( *m_peer , show , true ) ;

     if ( former != MacIsReallyShown() )
         MacPropagateVisibilityChanged() ;
     return TRUE;
     if ( former != MacIsReallyShown() )
         MacPropagateVisibilityChanged() ;
     return TRUE;


@@ -1727,21 +1749,21 @@ bool wxWindowMac::Show(bool show)
 
 bool wxWindowMac::Enable(bool enable)
 {
 
 bool wxWindowMac::Enable(bool enable)
 {

-    wxASSERT( m_macControl != NULL ) ;
+    wxASSERT( m_peer->Ok() ) ;

     if ( !wxWindowBase::Enable(enable) )
         return FALSE;
 
     bool former = MacIsReallyEnabled() ;
 #if TARGET_API_MAC_OSX
     if ( enable )
     if ( !wxWindowBase::Enable(enable) )
         return FALSE;
 
     bool former = MacIsReallyEnabled() ;
 #if TARGET_API_MAC_OSX
     if ( enable )

-        EnableControl( (ControlRef) m_macControl ) ;
+        EnableControl( *m_peer ) ;

     else
     else

-        DisableControl( (ControlRef) m_macControl ) ;
+        DisableControl( *m_peer ) ;

 #else
     if ( enable )
 #else
     if ( enable )

-        ActivateControl( (ControlRef) m_macControl ) ;
+        ActivateControl( *m_peer ) ;

     else
     else

-        DeactivateControl( (ControlRef) m_macControl ) ;
+        DeactivateControl( *m_peer ) ;

 #endif
 
     if ( former != MacIsReallyEnabled() )
 #endif
 
     if ( former != MacIsReallyEnabled() )


@@ -1825,7 +1847,7 @@ bool wxWindowMac::MacIsReallyShown()
 {
     // only under OSX the visibility of the TLW is taken into account
 #if TARGET_API_MAC_OSX
 {
     // only under OSX the visibility of the TLW is taken into account
 #if TARGET_API_MAC_OSX

-    return IsControlVisible( (ControlRef) m_macControl ) ;
+    return IsControlVisible( *m_peer ) ;

 #else
     wxWindow* win = this ;
     while( win->IsShown()  )
 #else
     wxWindow* win = this ;
     while( win->IsShown()  )


@@ -1845,15 +1867,22 @@ bool wxWindowMac::MacIsReallyShown()
 bool wxWindowMac::MacIsReallyEnabled() 
 {
 #if TARGET_API_MAC_OSX
 bool wxWindowMac::MacIsReallyEnabled() 
 {
 #if TARGET_API_MAC_OSX

-    return IsControlEnabled( (ControlRef) m_macControl ) ;
+    return IsControlEnabled( *m_peer ) ;

 #else
 #else

-    return IsControlActive( (ControlRef) m_macControl ) ;
+    return IsControlActive( *m_peer ) ;

 #endif
 }
 
 bool wxWindowMac::MacIsReallyHilited() 
 {
 #endif
 }
 
 bool wxWindowMac::MacIsReallyHilited() 
 {

-    return IsControlActive( (ControlRef) m_macControl ) ;
+    return IsControlActive( *m_peer ) ;
+}
+
+void wxWindowMac::MacFlashInvalidAreas() 
+{
+#if TARGET_API_MAC_OSX
+    HIViewFlashDirtyArea( (WindowRef) MacGetTopLevelWindowRef() ) ;
+#endif

 }
 
 //
 }
 
 //


@@ -1901,7 +1930,7 @@ void wxWindowMac::Refresh(bool eraseBack, const wxRect *rect)
 {
 #if TARGET_API_MAC_OSX
     if ( rect == NULL )
 {
 #if TARGET_API_MAC_OSX
     if ( rect == NULL )

-        HIViewSetNeedsDisplay( (ControlRef) m_macControl , true ) ; 
+        HIViewSetNeedsDisplay( *m_peer , true ) ; 

     else
     {
         RgnHandle update = NewRgn() ;
     else
     {
         RgnHandle update = NewRgn() ;


@@ -1909,7 +1938,7 @@ void wxWindowMac::Refresh(bool eraseBack, const wxRect *rect)
         SectRgn( (RgnHandle) MacGetVisibleRegion().GetWXHRGN() , update , update ) ;
         wxPoint origin = GetClientAreaOrigin() ;
         OffsetRgn( update, origin.x , origin.y ) ;        
         SectRgn( (RgnHandle) MacGetVisibleRegion().GetWXHRGN() , update , update ) ;
         wxPoint origin = GetClientAreaOrigin() ;
         OffsetRgn( update, origin.x , origin.y ) ;        

-        HIViewSetNeedsDisplayInRegion( (ControlRef) m_macControl , update , true ) ;
+        HIViewSetNeedsDisplayInRegion( *m_peer , update , true ) ;

     }
 #else
 /*
     }
 #else
 /*


@@ -1926,16 +1955,16 @@ void wxWindowMac::Refresh(bool eraseBack, const wxRect *rect)
         InvalWindowRgn( (WindowRef) MacGetTopLevelWindowRef() , updateRgn ) ;
         DisposeRgn(updateRgn) ;
 */
         InvalWindowRgn( (WindowRef) MacGetTopLevelWindowRef() , updateRgn ) ;
         DisposeRgn(updateRgn) ;
 */

-    if ( IsControlVisible( (ControlRef) m_macControl ) )
+    if ( IsControlVisible( *m_peer ) )

     {
     {

-        SetControlVisibility( (ControlRef) m_macControl , false , false ) ;
-        SetControlVisibility( (ControlRef) m_macControl , true , true ) ;
+        SetControlVisibility( *m_peer , false , false ) ;
+        SetControlVisibility( *m_peer , true , true ) ;

     }
     /*
     if ( MacGetTopLevelWindow() == NULL )
         return ;
 
     }
     /*
     if ( MacGetTopLevelWindow() == NULL )
         return ;
 

-    if ( !IsControlVisible( (ControlRef) m_macControl ) )
+    if ( !IsControlVisible( *m_peer ) )

        return ;
  
      wxPoint client = GetClientAreaOrigin();
        return ;
  
      wxPoint client = GetClientAreaOrigin();


@@ -1979,7 +2008,7 @@ void wxWindowMac::Freeze()
 #if TARGET_API_MAC_OSX
     if ( !m_frozenness++ )
     {
 #if TARGET_API_MAC_OSX
     if ( !m_frozenness++ )
     {

-        HIViewSetDrawingEnabled( (HIViewRef) m_macControl , false ) ;
+        HIViewSetDrawingEnabled( *m_peer , false ) ;

     }
 #endif
 }
     }
 #endif
 }


@@ -2012,9 +2041,9 @@ void wxWindowMac::Thaw()
 
     if ( !--m_frozenness )
     {
 
     if ( !--m_frozenness )
     {

-        HIViewSetDrawingEnabled( (HIViewRef) m_macControl , true ) ;
-        InvalidateControlAndChildren( (HIViewRef) m_macControl )  ;
-        // HIViewSetNeedsDisplay( (HIViewRef) m_macControl , true ) ;
+        HIViewSetDrawingEnabled( *m_peer , true ) ;
+        InvalidateControlAndChildren( *m_peer )  ;
+        // HIViewSetNeedsDisplay( *m_peer , true ) ;

     }
 #endif
 }
     }
 #endif
 }


@@ -2022,7 +2051,7 @@ void wxWindowMac::Thaw()
 void wxWindowMac::MacRedrawControl()
 {
 /*
 void wxWindowMac::MacRedrawControl()
 {
 /*

-    if ( (ControlRef) m_macControl && MacGetTopLevelWindowRef() && IsControlVisible( (ControlRef) m_macControl ) )
+    if ( *m_peer && MacGetTopLevelWindowRef() && IsControlVisible( *m_peer ) )

     {
 #if TARGET_API_MAC_CARBON
         Update() ;
     {
 #if TARGET_API_MAC_CARBON
         Update() ;


@@ -2031,7 +2060,7 @@ void wxWindowMac::MacRedrawControl()
         wxMacPortSetter helper(&dc) ;
         wxMacWindowClipper clipper(this) ;
         wxDC::MacSetupBackgroundForCurrentPort( MacGetBackgroundBrush() ) ;
         wxMacPortSetter helper(&dc) ;
         wxMacWindowClipper clipper(this) ;
         wxDC::MacSetupBackgroundForCurrentPort( MacGetBackgroundBrush() ) ;

-        UMADrawControl( (ControlRef) m_macControl ) ;
+        UMADrawControl( *m_peer ) ;

 #endif
     }
 */
 #endif
     }
 */


@@ -2274,8 +2303,36 @@ void wxWindowMac::ScrollWindow(int dx, int dy, const wxRect *rect)
         
 
     {
         
 
     {

+

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

+#if TARGET_API_MAC_OSX
+        // note there currently is a bug in OSX which makes inefficient refreshes in case an entire control
+        // area is scrolled, this does not occur if width and height are 2 pixels less, 
+        // TODO write optimal workaround
+        HIRect scrollrect = CGRectMake( MacGetLeftBorderSize() , MacGetTopBorderSize() , width , height ) ;       
+        if ( rect ) 
+        {
+            HIRect scrollarea = CGRectMake( rect->x , rect->y , rect->width , rect->height) ;
+            scrollrect = CGRectIntersection( scrollrect , scrollarea ) ;
+        }
+        if ( HIViewGetNeedsDisplay( *m_peer ) )
+        {
+            // becuase HIViewScrollRect does not scroll the already invalidated area we have two options
+            // either immediate redraw or full invalidate
+#if 1
+            // is the better overall solution, as it does not slow down scrolling
+            HIViewSetNeedsDisplay( *m_peer , true ) ;
+#else
+            // this would be the preferred version for fast drawing controls       
+            if( UMAGetSystemVersion() < 0x1030 )
+                Update() ;
+            else
+                HIViewRender(*m_peer) ;
+#endif
+        }
+        HIViewScrollRect ( *m_peer , &scrollrect , dx ,dy ) ;
+#else

 
         wxPoint pos;
         pos.x = pos.y = 0; 
 
         wxPoint pos;
         pos.x = pos.y = 0; 


@@ -2283,20 +2340,11 @@ void wxWindowMac::ScrollWindow(int dx, int dy, const wxRect *rect)
         Rect scrollrect;
         RgnHandle updateRgn = NewRgn() ;
 
         Rect scrollrect;
         RgnHandle updateRgn = NewRgn() ;
 

-#if TARGET_API_MAC_OSX
-        // if there is already a pending redraw event, we first must flush that, as we don't have
-        // means to retrieve the dirty region of a HIView
-        if ( HIViewGetNeedsDisplay( (ControlRef) m_macControl ) )
-            Update() ;
-#endif
-        {
+       {

             wxClientDC dc(this) ;
             wxMacPortSetter helper(&dc) ;
         
             wxClientDC dc(this) ;
             wxMacPortSetter helper(&dc) ;
         

-            GetControlBounds( (ControlRef) m_macControl, &scrollrect);
-#if TARGET_API_MAC_OSX
-            GetParent()->MacWindowToRootWindow( &scrollrect.left , &scrollrect.top ) ;
-#endif
+            GetControlBounds( *m_peer, &scrollrect);

             scrollrect.top += MacGetTopBorderSize() ;
             scrollrect.left += MacGetLeftBorderSize() ;
             scrollrect.bottom = scrollrect.top + height ;
             scrollrect.top += MacGetTopBorderSize() ;
             scrollrect.left += MacGetLeftBorderSize() ;
             scrollrect.bottom = scrollrect.top + height ;


@@ -2311,11 +2359,6 @@ void wxWindowMac::ScrollWindow(int dx, int dy, const wxRect *rect)
             ScrollRect( &scrollrect , dx , dy , updateRgn ) ;
         }
         // ScrollWindowRect( (WindowRef) MacGetTopLevelWindowRef() , &scrollrect , dx , dy ,  kScrollWindowInvalidate, updateRgn ) ;
             ScrollRect( &scrollrect , dx , dy , updateRgn ) ;
         }
         // ScrollWindowRect( (WindowRef) MacGetTopLevelWindowRef() , &scrollrect , dx , dy ,  kScrollWindowInvalidate, updateRgn ) ;

-#if TARGET_API_MAC_OSX
-        HIViewConvertRegion( updateRgn , (ControlRef) MacGetTopLevelWindow()->GetHandle() , (ControlRef) m_macControl ) ;
-        HIViewSetNeedsDisplayInRegion( (ControlRef) m_macControl , updateRgn , true ) ;
-#else
-        // TODO TEST

 #endif
     }
 
 #endif
     }
 


@@ -2341,9 +2384,6 @@ void wxWindowMac::ScrollWindow(int dx, int dy, const wxRect *rect)
             child->SetSize( x+dx, y+dy, w, h );                
         }        
     }
             child->SetSize( x+dx, y+dy, w, h );                
         }        
     }

-    
-// TODO remove, was moved higher up    Update() ;
-

 }
 
 void wxWindowMac::MacOnScroll(wxScrollEvent &event )
 }
 
 void wxWindowMac::MacOnScroll(wxScrollEvent &event )


@@ -2412,7 +2452,7 @@ void wxWindowMac::OnInternalIdle()
 void wxWindowMac::Raise()
 {
 #if TARGET_API_MAC_OSX
 void wxWindowMac::Raise()
 {
 #if TARGET_API_MAC_OSX

-    HIViewSetZOrder((ControlRef)m_macControl,kHIViewZOrderAbove, NULL) ;
+    HIViewSetZOrder(*m_peer,kHIViewZOrderAbove, NULL) ;

 #endif
 }
 
 #endif
 }
 


@@ -2420,7 +2460,7 @@ void wxWindowMac::Raise()
 void wxWindowMac::Lower()
 {
 #if TARGET_API_MAC_OSX
 void wxWindowMac::Lower()
 {
 #if TARGET_API_MAC_OSX

-    HIViewSetZOrder((ControlRef)m_macControl,kHIViewZOrderBelow, NULL) ;
+    HIViewSetZOrder(*m_peer,kHIViewZOrderBelow, NULL) ;

 #endif
 }
 
 #endif
 }
 


@@ -2510,10 +2550,10 @@ void wxWindowMac::Update()
             status = ReceiveNextEvent( 0 , NULL , kEventDurationNoWait , false , &theEvent ) ;
         }
         else
             status = ReceiveNextEvent( 0 , NULL , kEventDurationNoWait , false , &theEvent ) ;
         }
         else

-            HIViewSetNeedsDisplay( (ControlRef) m_macControl , true ) ;
+            HIViewSetNeedsDisplay( *m_peer , true ) ;

     }
 #else
     }
 #else

-    ::Draw1Control( (ControlRef) m_macControl ) ;
+    ::Draw1Control( *m_peer ) ;

 #endif
 }
 
 #endif
 }
 


@@ -2533,9 +2573,9 @@ wxRegion wxWindowMac::MacGetVisibleRegion( bool includeOuterStructures )
     Rect r ;
     RgnHandle visRgn = NewRgn() ;
     RgnHandle tempRgn = NewRgn() ;
     Rect r ;
     RgnHandle visRgn = NewRgn() ;
     RgnHandle tempRgn = NewRgn() ;

-    if ( IsControlVisible( (ControlRef) m_macControl ) )
+    if ( IsControlVisible( *m_peer ) )

     {
     {

-        GetControlBounds( (ControlRef) m_macControl , &r ) ;
+        GetControlBounds( *m_peer , &r ) ;

         if (! MacGetTopLevelWindow()->MacUsesCompositing() )
         {
             MacRootWindowToWindow( &r.left , & r.top ) ;
         if (! MacGetTopLevelWindow()->MacUsesCompositing() )
         {
             MacRootWindowToWindow( &r.left , & r.top ) ;


@@ -2659,7 +2699,7 @@ void wxWindowMac::MacRedraw( WXHRGN updatergnr , long time, bool erase)
     if ( MacGetTopLevelWindow()->MacUsesCompositing() == false )
     { 
         Rect bounds;
     if ( MacGetTopLevelWindow()->MacUsesCompositing() == false )
     { 
         Rect bounds;

-        UMAGetControlBoundsInWindowCoords( (ControlRef)m_macControl, &bounds );
+        UMAGetControlBoundsInWindowCoords( *m_peer, &bounds );

         RgnHandle controlRgn = NewRgn();
         RectRgn( controlRgn, &bounds );
         //KO: This sets the ownUpdateRgn to the area of this control that is inside
         RgnHandle controlRgn = NewRgn();
         RectRgn( controlRgn, &bounds );
         //KO: This sets the ownUpdateRgn to the area of this control that is inside