X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f3b2e2d7196297adadd899fe56e7aeffde605f0f..6862383251a9f1f103182c04f0d60bb1dac919c6:/src/mac/carbon/toplevel.cpp?ds=sidebyside

diff --git a/src/mac/carbon/toplevel.cpp b/src/mac/carbon/toplevel.cpp
index 12f31a9e93..6a5284d6da 100644
--- a/src/mac/carbon/toplevel.cpp
+++ b/src/mac/carbon/toplevel.cpp
@@ -24,9 +24,10 @@
     #pragma hdrstop
 #endif
 
+#include "wx/toplevel.h"
+
 #ifndef WX_PRECOMP
     #include "wx/app.h"
-    #include "wx/toplevel.h"
     #include "wx/frame.h"
     #include "wx/string.h"
     #include "wx/log.h"
@@ -38,7 +39,6 @@
 
 #include "wx/mac/uma.h"
 #include "wx/mac/aga.h"
-#include "wx/app.h"
 #include "wx/tooltip.h"
 #include "wx/dnd.h"
 
@@ -81,19 +81,17 @@ END_EVENT_TABLE()
 // Carbon Events
 // ---------------------------------------------------------------------------
 
-extern long wxMacTranslateKey(unsigned char key, unsigned char code) ;
-
 static const EventTypeSpec eventList[] =
 {
     // TODO: remove control related event like key and mouse (except for WindowLeave events)
-#if 1
-    { kEventClassTextInput, kEventTextInputUnicodeForKeyEvent } ,
 
     { kEventClassKeyboard, kEventRawKeyDown } ,
     { kEventClassKeyboard, kEventRawKeyRepeat } ,
     { kEventClassKeyboard, kEventRawKeyUp } ,
     { kEventClassKeyboard, kEventRawKeyModifiersChanged } ,
-#endif
+
+    { kEventClassTextInput, kEventTextInputUnicodeForKeyEvent } ,
+    { kEventClassTextInput, kEventTextInputUpdateActiveInputArea } ,
 
     { kEventClassWindow , kEventWindowShown } ,
     { kEventClassWindow , kEventWindowActivated } ,
@@ -112,62 +110,6 @@ static const EventTypeSpec eventList[] =
     { kEventClassMouse , kEventMouseDragged } ,
 } ;
 
-static pascal OSStatus TextInputEventHandler( EventHandlerCallRef handler , EventRef event , void *data )
-{
-    OSStatus result = eventNotHandledErr ;
-    wxWindow* focus ;
-    UInt32 keyCode, modifiers ;
-    Point point ;
-    EventRef rawEvent ;
-    unsigned char charCode ;
-
-    GetEventParameter( event, kEventParamTextInputSendKeyboardEvent, typeEventRef, NULL, sizeof(rawEvent), NULL, &rawEvent ) ;
-
-    GetEventParameter( rawEvent, kEventParamKeyMacCharCodes, typeChar, NULL, sizeof(char), NULL, &charCode );
-    GetEventParameter( rawEvent, kEventParamKeyCode, typeUInt32, NULL, sizeof(UInt32), NULL, &keyCode );
-    GetEventParameter( rawEvent, kEventParamKeyModifiers, typeUInt32, NULL, sizeof(UInt32), NULL, &modifiers );
-    GetEventParameter( rawEvent, kEventParamMouseLocation, typeQDPoint, NULL, sizeof(Point), NULL, &point );
-
-    focus = wxWindow::FindFocus() ;
-
-    switch ( GetEventKind( event ) )
-    {
-        case kEventTextInputUnicodeForKeyEvent :
-            {
-                // this is only called when no default handler has jumped in, e.g. a wxControl on a floater window does not
-                // get its own kEventTextInputUnicodeForKeyEvent, so we reroute the event back to the control
-                wxControl* control = wxDynamicCast( focus , wxControl ) ;
-                if ( control )
-                {
-                    ControlRef macControl = (ControlRef) control->GetHandle() ;
-                    if ( macControl )
-                    {
-                        ::HandleControlKey( macControl , keyCode , charCode , modifiers ) ;
-                        result = noErr ;
-                    }
-                }
-
-#if 0
-                // this may lead to double events sent to a window in case all handlers have skipped the key down event
-                UInt32 when = EventTimeToTicks( GetEventTime( event ) ) ;
-                UInt32 message = (keyCode << 8) + charCode;
-
-                if ( (focus != NULL) &&
-                    wxTheApp->MacSendKeyDownEvent( focus , message , modifiers , when , point.h , point.v ) )
-                {
-                    result = noErr ;
-                }
-#endif
-            }
-            break ;
-
-        default:
-            break ;
-    }
-
-    return result ;
-}
-
 static pascal OSStatus KeyboardEventHandler( EventHandlerCallRef handler , EventRef event , void *data )
 {
     OSStatus result = eventNotHandledErr ;
@@ -178,7 +120,10 @@ static pascal OSStatus KeyboardEventHandler( EventHandlerCallRef handler , Event
         focus = (wxTopLevelWindowMac*) data ;
 
     unsigned char charCode ;
-    wxChar uniChar = 0 ;
+    wxChar uniChar[2] ;
+    uniChar[0] = 0;
+    uniChar[1] = 0;
+
     UInt32 keyCode ;
     UInt32 modifiers ;
     Point point ;
@@ -189,21 +134,23 @@ static pascal OSStatus KeyboardEventHandler( EventHandlerCallRef handler , Event
     if ( GetEventParameter( event, kEventParamKeyUnicodes, typeUnicodeText, NULL, 0 , &dataSize, NULL ) == noErr )
     {
         UniChar buf[2] ;
+        int numChars = dataSize / sizeof( UniChar) + 1;
 
         UniChar* charBuf = buf ;
 
-        if ( dataSize > 4 )
-            charBuf = new UniChar[ dataSize / sizeof( UniChar) ] ;
+        if ( numChars * 2 > 4 )
+            charBuf = new UniChar[ numChars ] ;
         GetEventParameter( event, kEventParamKeyUnicodes, typeUnicodeText, NULL, dataSize , NULL , charBuf ) ;
+        charBuf[ numChars - 1 ] = 0;
 
 #if SIZEOF_WCHAR_T == 2
         uniChar = charBuf[0] ;
 #else
         wxMBConvUTF16 converter ;
-        converter.MB2WC( &uniChar , (const char*)charBuf , 1 ) ;
+        converter.MB2WC( uniChar , (const char*)charBuf , 2 ) ;
 #endif
 
-        if ( dataSize > 4 )
+        if ( numChars * 2 > 4 )
             delete[] charBuf ;
     }
 #endif
@@ -223,7 +170,7 @@ static pascal OSStatus KeyboardEventHandler( EventHandlerCallRef handler , Event
                 WXEVENTHANDLERCALLREF formerHandler = wxTheApp->MacGetCurrentEventHandlerCallRef() ;
                 wxTheApp->MacSetCurrentEvent( event , handler ) ;
                 if ( /* focus && */ wxTheApp->MacSendKeyDownEvent(
-                    focus , message , modifiers , when , point.h , point.v , uniChar ) )
+                    focus , message , modifiers , when , point.h , point.v , uniChar[0] ) )
                 {
                     result = noErr ;
                 }
@@ -233,7 +180,7 @@ static pascal OSStatus KeyboardEventHandler( EventHandlerCallRef handler , Event
 
         case kEventRawKeyUp :
             if ( /* focus && */ wxTheApp->MacSendKeyUpEvent(
-                focus , message , modifiers , when , point.h , point.v , uniChar ) )
+                focus , message , modifiers , when , point.h , point.v , uniChar[0] ) )
             {
                 result = noErr ;
             }
@@ -251,7 +198,7 @@ static pascal OSStatus KeyboardEventHandler( EventHandlerCallRef handler , Event
                 event.m_y = point.v;
 
 #if wxUSE_UNICODE
-                event.m_uniChar = uniChar ;
+                event.m_uniChar = uniChar[0] ;
 #endif
 
                 event.SetTimestamp(when);
@@ -460,7 +407,7 @@ ControlRef wxMacFindSubControl( wxTopLevelWindowMac* toplevelWindow, const Point
                     {
                         Point testLocation = location ;
 
-                        if ( toplevelWindow && toplevelWindow->MacUsesCompositing() )
+                        if ( toplevelWindow )
                         {
                             testLocation.h -= r.left ;
                             testLocation.v -= r.top ;
@@ -481,7 +428,7 @@ ControlRef wxMacFindSubControl( wxTopLevelWindowMac* toplevelWindow, const Point
 ControlRef wxMacFindControlUnderMouse( wxTopLevelWindowMac* toplevelWindow , const Point& location , WindowRef window , ControlPartCode *outPart )
 {
 #if TARGET_API_MAC_OSX
-    if ( UMAGetSystemVersion() >= 0x1030 && ( toplevelWindow == 0 || toplevelWindow->MacUsesCompositing() ) )
+    if ( UMAGetSystemVersion() >= 0x1030 )
         return FindControlUnderMouse( location , window , outPart ) ;
 #endif
 
@@ -504,7 +451,7 @@ pascal OSStatus wxMacTopLevelMouseEventHandler( EventHandlerCallRef handler , Ev
     Point screenMouseLocation = cEvent.GetParameter<Point>(kEventParamMouseLocation) ;
     Point windowMouseLocation = screenMouseLocation ;
 
-    WindowRef window ;
+    WindowRef window = NULL;
     short windowPart = ::FindWindow(screenMouseLocation, &window);
 
     wxWindow* currentMouseWindow = NULL ;
@@ -555,6 +502,10 @@ pascal OSStatus wxMacTopLevelMouseEventHandler( EventHandlerCallRef handler , Ev
 #endif
                 }
             }
+
+            // disabled windows must not get any input messages
+            if ( currentMouseWindow && !currentMouseWindow->MacIsReallyEnabled() )
+                currentMouseWindow = NULL;
         }
     }
 
@@ -619,9 +570,7 @@ pascal OSStatus wxMacTopLevelMouseEventHandler( EventHandlerCallRef handler , Ev
         // make tooltips current
 
 #if wxUSE_TOOLTIPS
-        if ( wxevent.GetEventType() == wxEVT_MOTION
-            || wxevent.GetEventType() == wxEVT_ENTER_WINDOW
-            || wxevent.GetEventType() == wxEVT_LEAVE_WINDOW )
+        if ( wxevent.GetEventType() == wxEVT_MOTION )
             wxToolTip::RelayEvent( currentMouseWindow , wxevent );
 #endif
 
@@ -661,8 +610,7 @@ pascal OSStatus wxMacTopLevelMouseEventHandler( EventHandlerCallRef handler , Ev
                     EventModifiers modifiers = cEvent.GetParameter<EventModifiers>(kEventParamKeyModifiers, typeUInt32) ;
                     Point clickLocation = windowMouseLocation ;
 
-                    if ( toplevelWindow->MacUsesCompositing() )
-                        currentMouseWindow->MacRootWindowToWindow( &clickLocation.h , &clickLocation.v ) ;
+                    currentMouseWindow->MacRootWindowToWindow( &clickLocation.h , &clickLocation.v ) ;
 
                     HandleControlClick( (ControlRef) currentMouseWindow->GetHandle() , clickLocation ,
                         modifiers , (ControlActionUPP ) -1 ) ;
@@ -696,8 +644,8 @@ pascal OSStatus wxMacTopLevelMouseEventHandler( EventHandlerCallRef handler , Ev
                 cursorPoint += cursorTarget->GetPosition();
         }
 
-    } // else if ( currentMouseWindow )
-    else
+    }
+    else // currentMouseWindow == NULL
     {
         // don't mess with controls we don't know about
         // for some reason returning eventNotHandledErr does not lead to the correct behaviour
@@ -706,17 +654,14 @@ pascal OSStatus wxMacTopLevelMouseEventHandler( EventHandlerCallRef handler , Ev
         {
             EventModifiers modifiers = cEvent.GetParameter<EventModifiers>(kEventParamKeyModifiers, typeUInt32) ;
             Point clickLocation = windowMouseLocation ;
-            if ( toplevelWindow->MacUsesCompositing() )
-            {
-#ifdef __WXMAC_OSX__
-                HIPoint hiPoint ;
-                hiPoint.x = clickLocation.h ;
-                hiPoint.y = clickLocation.v ;
-                HIViewConvertPoint( &hiPoint , (ControlRef) toplevelWindow->GetHandle() , control  ) ;
-                clickLocation.h = (int)hiPoint.x ;
-                clickLocation.v = (int)hiPoint.y ;
-#endif
-            }
+#if TARGET_API_MAC_OSX
+            HIPoint hiPoint ;
+            hiPoint.x = clickLocation.h ;
+            hiPoint.y = clickLocation.v ;
+            HIViewConvertPoint( &hiPoint , (ControlRef) toplevelWindow->GetHandle() , control  ) ;
+            clickLocation.h = (int)hiPoint.x ;
+            clickLocation.v = (int)hiPoint.y ;
+#endif // TARGET_API_MAC_OSX
 
             HandleControlClick( control , clickLocation , modifiers , (ControlActionUPP ) -1 ) ;
             result = noErr ;
@@ -781,12 +726,7 @@ static pascal OSStatus wxMacTopLevelWindowEventHandler( EventHandlerCallRef hand
                 wxFrame *frame = wxDynamicCast( toplevelWindow , wxFrame ) ;
                 if ( frame )
                 {
-#if wxUSE_STATUSBAR
-                    frame->PositionStatusBar();
-#endif
-#if wxUSE_TOOLBAR
-                    frame->PositionToolBar();
-#endif
+                    frame->PositionBars();
                 }
 
                 wxSizeEvent event( r.GetSize() , toplevelWindow->GetId() ) ;
@@ -856,18 +796,21 @@ static pascal OSStatus wxMacTopLevelWindowEventHandler( EventHandlerCallRef hand
     return result ;
 }
 
+// mix this in from window.cpp
+pascal OSStatus wxMacUnicodeTextEventHandler( EventHandlerCallRef handler , EventRef event , void *data ) ;
+
 pascal OSStatus wxMacTopLevelEventHandler( EventHandlerCallRef handler , EventRef event , void *data )
 {
     OSStatus result = eventNotHandledErr ;
 
     switch ( GetEventClass( event ) )
     {
-        case kEventClassKeyboard :
-            result = KeyboardEventHandler( handler, event , data ) ;
+        case kEventClassTextInput :
+            result = wxMacUnicodeTextEventHandler( handler, event , data ) ;
             break ;
 
-        case kEventClassTextInput :
-            result = TextInputEventHandler( handler, event , data ) ;
+        case kEventClassKeyboard :
+            result = KeyboardEventHandler( handler, event , data ) ;
             break ;
 
         case kEventClassWindow :
@@ -939,8 +882,7 @@ typedef struct
     wxPoint m_position ;
     wxSize m_size ;
     bool m_wasResizable ;
-}
-FullScreenData ;
+} FullScreenData ;
 
 void wxTopLevelWindowMac::Init()
 {
@@ -948,12 +890,6 @@ void wxTopLevelWindowMac::Init()
     m_maximizeOnShow = false;
     m_macWindow = NULL ;
 
-#if TARGET_API_MAC_OSX
-    m_macUsesCompositing = ( UMAGetSystemVersion() >= 0x1030 );
-#else
-    m_macUsesCompositing = false;
-#endif
-
     m_macEventHandler = NULL ;
     m_macFullScreenData = NULL ;
 }
@@ -1041,22 +977,15 @@ wxTopLevelWindowMac::~wxTopLevelWindowMac()
 
 void wxTopLevelWindowMac::Maximize(bool maximize)
 {
-    // TODO: check if this is still necessary
-#if 0
-    wxMacPortStateHelper help( (GrafPtr)GetWindowPort( (WindowRef)m_macWindow) ) ;
-    wxMacWindowClipper clip( this );
-#endif
-
-    if ( !IsWindowInStandardState( (WindowRef)m_macWindow, NULL, NULL ) )
+    Point idealSize = { 0 , 0 } ;
+    if ( maximize )
     {
-        Rect rect;
-
-        GetWindowBounds((WindowRef)m_macWindow, kWindowGlobalPortRgn, &rect);
-        SetWindowIdealUserState((WindowRef)m_macWindow, &rect);
-        SetWindowUserState((WindowRef)m_macWindow, &rect);
+        Rect rect ;
+        GetAvailableWindowPositioningBounds(GetMainDevice(),&rect) ;
+        idealSize.h = rect.right - rect.left ;
+        idealSize.v = rect.bottom - rect.top ;
     }
-
-    ZoomWindow( (WindowRef)m_macWindow , maximize ? inZoomOut : inZoomIn , false ) ;
+    ZoomWindowIdeal( (WindowRef)m_macWindow , maximize ? inZoomOut : inZoomIn , &idealSize ) ;
 }
 
 bool wxTopLevelWindowMac::IsMaximized() const
@@ -1182,8 +1111,6 @@ void  wxTopLevelWindowMac::MacCreateRealWindow(
     else if ( HasFlag( wxFRAME_DRAWER ) )
     {
         wclass = kDrawerWindowClass;
-        // we must force compositing on a drawer
-        m_macUsesCompositing = true ;
     }
 #endif  //10.2 and up
     else
@@ -1221,9 +1148,9 @@ void  wxTopLevelWindowMac::MacCreateRealWindow(
     if ( HasFlag(wxSTAY_ON_TOP) )
         group = GetWindowGroupOfClass(kUtilityWindowClass) ;
 
-#if TARGET_API_MAC_OSX
-    if ( m_macUsesCompositing )
-        attr |= kWindowCompositingAttribute;
+    attr |= kWindowCompositingAttribute;
+#if 0 // wxMAC_USE_CORE_GRAPHICS ; TODO : decide on overall handling of high dpi screens (pixel vs userscale)
+    attr |= kWindowFrameworkScaledAttribute;
 #endif
 
     if ( HasFlag(wxFRAME_SHAPED) )
@@ -1246,6 +1173,11 @@ void  wxTopLevelWindowMac::MacCreateRealWindow(
 
     wxCHECK_RET( err == noErr, wxT("Mac OS error when trying to create new window") );
 
+    // setup a separate group for each window, so that overlays can be handled easily
+    verify_noerr( CreateWindowGroup( kWindowGroupAttrMoveTogether | kWindowGroupAttrLayerTogether | kWindowGroupAttrHideOnCollapse, &group ));
+    verify_noerr( SetWindowGroupParent( group, GetWindowGroup( (WindowRef) m_macWindow )));
+    verify_noerr( SetWindowGroup( (WindowRef) m_macWindow , group ));
+  
     // the create commands are only for content rect,
     // so we have to set the size again as structure bounds
     SetWindowBounds(  (WindowRef) m_macWindow , kWindowStructureRgn , &theBoundsRect ) ;
@@ -1254,28 +1186,22 @@ void  wxTopLevelWindowMac::MacCreateRealWindow(
     UMASetWTitle( (WindowRef) m_macWindow , title , m_font.GetEncoding() ) ;
     m_peer = new wxMacControl(this , true /*isRootControl*/) ;
 
-#if TARGET_API_MAC_OSX
-    if ( m_macUsesCompositing )
-    {
-        // There is a bug in 10.2.X for ::GetRootControl returning the window view instead of
-        // the content view, so we have to retrieve it explicitly
-        HIViewFindByID( HIViewGetRoot( (WindowRef) m_macWindow ) , kHIViewWindowContentID ,
-            m_peer->GetControlRefAddr() ) ;
-        if ( !m_peer->Ok() )
-        {
-            // compatibility mode fallback
-            GetRootControl( (WindowRef) m_macWindow , m_peer->GetControlRefAddr() ) ;
-        }
-    }
-#endif
+    // There is a bug in 10.2.X for ::GetRootControl returning the window view instead of
+    // the content view, so we have to retrieve it explicitly
+    HIViewFindByID( HIViewGetRoot( (WindowRef) m_macWindow ) , kHIViewWindowContentID ,
+        m_peer->GetControlRefAddr() ) ;
+    if ( !m_peer->Ok() )
     {
-        ::CreateRootControl( (WindowRef)m_macWindow , m_peer->GetControlRefAddr() ) ;
+        // compatibility mode fallback
+        GetRootControl( (WindowRef) m_macWindow , m_peer->GetControlRefAddr() ) ;
     }
 
     // the root control level handler
     MacInstallEventHandler( (WXWidget) m_peer->GetControlRef() ) ;
 
-#if TARGET_API_MAC_OSX
+    // Causes the inner part of the window not to be metal
+    // if the style is used before window creation.
+#if 0 // TARGET_API_MAC_OSX
     if ( m_macUsesCompositing && m_macWindow != NULL )
     {
         if ( GetExtraStyle() & wxFRAME_EX_METAL )
@@ -1446,14 +1372,14 @@ bool wxTopLevelWindowMac::ShowFullScreen(bool show, long style)
         }
 
         SetSize( x , y , w, h ) ;
-        if( data->m_wasResizable )
+        if ( data->m_wasResizable )
             MacChangeWindowAttributes( kWindowNoAttributes , kWindowResizableAttribute ) ;
     }
     else
     {
         ShowMenuBar() ;
         FullScreenData *data = (FullScreenData *) m_macFullScreenData ;
-        if( data->m_wasResizable )
+        if ( data->m_wasResizable )
             MacChangeWindowAttributes( kWindowResizableAttribute ,  kWindowNoAttributes ) ;
         SetPosition( data->m_position ) ;
         SetSize( data->m_size ) ;
@@ -1470,15 +1396,29 @@ bool wxTopLevelWindowMac::IsFullScreen() const
     return m_macFullScreenData != NULL ;
 }
 
-void wxTopLevelWindowMac::SetExtraStyle(long exStyle) 
+
+bool wxTopLevelWindowMac::SetTransparent(wxByte alpha)
+{
+    OSStatus result = SetWindowAlpha((WindowRef)m_macWindow, float(alpha)/255.0);
+    return result == noErr;
+}
+
+
+bool wxTopLevelWindowMac::CanSetTransparent()
+{
+    return true;
+}
+
+
+void wxTopLevelWindowMac::SetExtraStyle(long exStyle)
 {
     if ( GetExtraStyle() == exStyle )
         return ;
-    
+
     wxTopLevelWindowBase::SetExtraStyle( exStyle ) ;
 
 #if TARGET_API_MAC_OSX
-    if ( m_macUsesCompositing && m_macWindow != NULL )
+    if ( m_macWindow != NULL )
     {
         bool metal = GetExtraStyle() & wxFRAME_EX_METAL ;
         if ( MacGetMetalAppearance() != metal )
@@ -1487,8 +1427,8 @@ void wxTopLevelWindowMac::SetExtraStyle(long exStyle)
 #endif
 }
 
+// TODO: switch to structure bounds -
 // we are still using coordinates of the content view
-// TODO: switch to structure bounds
 //
 void wxTopLevelWindowMac::MacGetContentAreaInset( int &left , int &top , int &right , int &bottom )
 {
@@ -1550,9 +1490,6 @@ void wxTopLevelWindowMac::DoGetClientSize( int *width, int *height ) const
 void wxTopLevelWindowMac::MacSetMetalAppearance( bool set )
 {
 #if TARGET_API_MAC_OSX
-    wxASSERT_MSG( m_macUsesCompositing ,
-        wxT("Cannot set metal appearance on a non-compositing window") ) ;
-
     MacChangeWindowAttributes( set ? kWindowMetalAttribute : kWindowNoAttributes ,
         set ? kWindowNoAttributes : kWindowMetalAttribute ) ;
 #endif
@@ -1582,57 +1519,31 @@ wxUint32 wxTopLevelWindowMac::MacGetWindowAttributes() const
 
 void wxTopLevelWindowMac::MacPerformUpdates()
 {
-#if TARGET_API_MAC_OSX
-    if ( m_macUsesCompositing )
-    {
 #if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_3
-        // for composited windows this also triggers a redraw of all
-        // invalid views in the window
-        if ( UMAGetSystemVersion() >= 0x1030 )
-            HIWindowFlush((WindowRef) m_macWindow) ;
-        else
-#endif
-        {
-            // the only way to trigger the redrawing on earlier systems is to call
-            // ReceiveNextEvent
-
-            EventRef currentEvent = (EventRef) wxTheApp->MacGetCurrentEvent() ;
-            UInt32 currentEventClass = 0 ;
-            UInt32 currentEventKind = 0 ;
-            if ( currentEvent != NULL )
-            {
-                currentEventClass = ::GetEventClass( currentEvent ) ;
-                currentEventKind = ::GetEventKind( currentEvent ) ;
-            }
-
-            if ( currentEventClass != kEventClassMenu )
-            {
-                // when tracking a menu, strange redraw errors occur if we flush now, so leave..
-                EventRef theEvent;
-                OSStatus status = noErr ;
-                status = ReceiveNextEvent( 0 , NULL , kEventDurationNoWait , false , &theEvent ) ;
-            }
-        }
-    }
+    // for composited windows this also triggers a redraw of all
+    // invalid views in the window
+    if ( UMAGetSystemVersion() >= 0x1030 )
+        HIWindowFlush((WindowRef) m_macWindow) ;
     else
 #endif
     {
-        BeginUpdate( (WindowRef) m_macWindow ) ;
+        // the only way to trigger the redrawing on earlier systems is to call
+        // ReceiveNextEvent
 
-        RgnHandle updateRgn = NewRgn();
-        if ( updateRgn )
+        EventRef currentEvent = (EventRef) wxTheApp->MacGetCurrentEvent() ;
+        UInt32 currentEventClass = 0 ;
+        if ( currentEvent != NULL )
         {
-            GetPortVisibleRegion( GetWindowPort( (WindowRef)m_macWindow ), updateRgn );
-            UpdateControls(  (WindowRef)m_macWindow , updateRgn ) ;
-
-            // if ( !EmptyRgn( updateRgn ) )
-            //    MacDoRedraw( updateRgn , 0 , true) ;
-
-            DisposeRgn( updateRgn );
+            currentEventClass = ::GetEventClass( currentEvent ) ;
+            ::GetEventKind( currentEvent ) ;
         }
 
-        EndUpdate( (WindowRef)m_macWindow ) ;
-        QDFlushPortBuffer( GetWindowPort( (WindowRef)m_macWindow ) , NULL ) ;
+        if ( currentEventClass != kEventClassMenu )
+        {
+            // when tracking a menu, strange redraw errors occur if we flush now, so leave..
+            EventRef theEvent;
+            ReceiveNextEvent( 0 , NULL , kEventDurationNoWait , false , &theEvent ) ;
+        }
     }
 }
 
@@ -1838,4 +1749,3 @@ static pascal long wxShapedMacWindowDef(short varCode, WindowRef window, SInt16
 
     return 0;
 }
-