compilation fix for !USE_PCH

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

diff --git a/src/mac/carbon/toplevel.cpp b/src/mac/carbon/toplevel.cpp
index 69708ed1a394759ab2cf657843d69ae74295eaba..b9dec80021dfd7dc6abc0e5d0b4231a7731594b9 100644 (file)
--- a/src/mac/carbon/toplevel.cpp
+++ b/src/mac/carbon/toplevel.cpp
@@ -71,7 +71,7 @@ static   long      gs_lastWhen = 0;
 
 extern long wxMacTranslateKey(unsigned char key, unsigned char code) ;
 
 
 extern long wxMacTranslateKey(unsigned char key, unsigned char code) ;
 

-static const EventTypeSpec eventList[] = 
+static const EventTypeSpec eventList[] =

 {
     { kEventClassTextInput, kEventTextInputUnicodeForKeyEvent } ,
 
 {
     { kEventClassTextInput, kEventTextInputUnicodeForKeyEvent } ,
 


@@ -100,15 +100,15 @@ static pascal OSStatus TextInputEventHandler( EventHandlerCallRef handler , Even
 
     wxWindow* focus = wxWindow::FindFocus() ;
     char charCode ;
 
     wxWindow* focus = wxWindow::FindFocus() ;
     char charCode ;

-    UInt32 keyCode ;    
+    UInt32 keyCode ;

     UInt32 modifiers ;
     Point point ;
     UInt32 when = EventTimeToTicks( GetEventTime( event ) ) ;
 
     EventRef rawEvent ;
     UInt32 modifiers ;
     Point point ;
     UInt32 when = EventTimeToTicks( GetEventTime( event ) ) ;
 
     EventRef rawEvent ;

-    
+

     GetEventParameter( event , kEventParamTextInputSendKeyboardEvent ,typeEventRef,NULL,sizeof(rawEvent),NULL,&rawEvent ) ;
     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, 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);


@@ -120,7 +120,7 @@ static pascal OSStatus TextInputEventHandler( EventHandlerCallRef handler , Even
     switch ( GetEventKind( event ) )
     {
         case kEventTextInputUnicodeForKeyEvent :
     switch ( GetEventKind( event ) )
     {
         case kEventTextInputUnicodeForKeyEvent :

-            if ( (focus != NULL) && wxTheApp->MacSendKeyDownEvent( 
+            if ( (focus != NULL) && wxTheApp->MacSendKeyDownEvent(

                 focus , message , modifiers , when , point.h , point.v ) )
             {
                 result = noErr ;
                 focus , message , modifiers , when , point.h , point.v ) )
             {
                 result = noErr ;


@@ -137,7 +137,7 @@ static pascal OSStatus KeyboardEventHandler( EventHandlerCallRef handler , Event
 
     wxWindow* focus = wxWindow::FindFocus() ;
     char charCode ;
 
     wxWindow* focus = wxWindow::FindFocus() ;
     char charCode ;

-    UInt32 keyCode ;    
+    UInt32 keyCode ;

     UInt32 modifiers ;
     Point point ;
     UInt32 when = EventTimeToTicks( GetEventTime( event ) ) ;
     UInt32 modifiers ;
     Point point ;
     UInt32 when = EventTimeToTicks( GetEventTime( event ) ) ;


@@ -153,14 +153,14 @@ static pascal OSStatus KeyboardEventHandler( EventHandlerCallRef handler , Event
     {
         case kEventRawKeyRepeat :
         case kEventRawKeyDown :
     {
         case kEventRawKeyRepeat :
         case kEventRawKeyDown :

-            if ( (focus != NULL) && wxTheApp->MacSendKeyDownEvent( 
+            if ( (focus != NULL) && wxTheApp->MacSendKeyDownEvent(

                 focus , message , modifiers , when , point.h , point.v ) )
             {
                 result = noErr ;
             }
             break ;
         case kEventRawKeyUp :
                 focus , message , modifiers , when , point.h , point.v ) )
             {
                 result = noErr ;
             }
             break ;
         case kEventRawKeyUp :

-            if ( (focus != NULL) && wxTheApp->MacSendKeyUpEvent( 
+            if ( (focus != NULL) && wxTheApp->MacSendKeyUpEvent(

                 focus , message , modifiers , when , point.h , point.v ) )
             {
                 result = noErr ;
                 focus , message , modifiers , when , point.h , point.v ) )
             {
                 result = noErr ;


@@ -181,19 +181,19 @@ static pascal OSStatus KeyboardEventHandler( EventHandlerCallRef handler , Event
                 wxWindow* focus = wxWindow::FindFocus() ;
                 event.SetEventObject(focus);
 
                 wxWindow* focus = wxWindow::FindFocus() ;
                 event.SetEventObject(focus);
 

-                if ( (modifiers ^ wxTheApp->s_lastModifiers ) & controlKey )
+                if ( focus && (modifiers ^ wxTheApp->s_lastModifiers ) & controlKey )

                 {
                     event.m_keyCode = WXK_CONTROL ;
                     event.SetEventType( ( modifiers & controlKey ) ? wxEVT_KEY_DOWN : wxEVT_KEY_UP ) ;
                     focus->GetEventHandler()->ProcessEvent( event ) ;
                 }
                 {
                     event.m_keyCode = WXK_CONTROL ;
                     event.SetEventType( ( modifiers & controlKey ) ? wxEVT_KEY_DOWN : wxEVT_KEY_UP ) ;
                     focus->GetEventHandler()->ProcessEvent( event ) ;
                 }

-                if ( (modifiers ^ wxTheApp->s_lastModifiers ) & shiftKey )
+                if ( focus && (modifiers ^ wxTheApp->s_lastModifiers ) & shiftKey )

                 {
                     event.m_keyCode = WXK_SHIFT ;
                     event.SetEventType( ( modifiers & shiftKey ) ? wxEVT_KEY_DOWN : wxEVT_KEY_UP ) ;
                     focus->GetEventHandler()->ProcessEvent( event ) ;
                 }
                 {
                     event.m_keyCode = WXK_SHIFT ;
                     event.SetEventType( ( modifiers & shiftKey ) ? wxEVT_KEY_DOWN : wxEVT_KEY_UP ) ;
                     focus->GetEventHandler()->ProcessEvent( event ) ;
                 }

-                if ( (modifiers ^ wxTheApp->s_lastModifiers ) & optionKey )
+                if ( focus && (modifiers ^ wxTheApp->s_lastModifiers ) & optionKey )

                 {
                     event.m_keyCode = WXK_ALT ;
                     event.SetEventType( ( modifiers & optionKey ) ? wxEVT_KEY_DOWN : wxEVT_KEY_UP ) ;
                 {
                     event.m_keyCode = WXK_ALT ;
                     event.SetEventType( ( modifiers & optionKey ) ? wxEVT_KEY_DOWN : wxEVT_KEY_UP ) ;


@@ -216,7 +216,7 @@ static pascal OSStatus MouseEventHandler( EventHandlerCallRef handler , EventRef
     UInt32 modifiers = 0;
     EventMouseButton button = 0 ;
     UInt32 click = 0 ;
     UInt32 modifiers = 0;
     EventMouseButton button = 0 ;
     UInt32 click = 0 ;

-    
+

     GetEventParameter( event, kEventParamMouseLocation, typeQDPoint, NULL,
         sizeof( Point ), NULL, &point );
     GetEventParameter( event, kEventParamKeyModifiers, typeUInt32, NULL,
     GetEventParameter( event, kEventParamMouseLocation, typeQDPoint, NULL,
         sizeof( Point ), NULL, &point );
     GetEventParameter( event, kEventParamKeyModifiers, typeUInt32, NULL,


@@ -225,10 +225,10 @@ static pascal OSStatus MouseEventHandler( EventHandlerCallRef handler , EventRef
         sizeof( EventMouseButton ), NULL, &button );
     GetEventParameter( event, kEventParamClickCount, typeUInt32, NULL,
         sizeof( UInt32 ), NULL, &click );
         sizeof( EventMouseButton ), NULL, &button );
     GetEventParameter( event, kEventParamClickCount, typeUInt32, NULL,
         sizeof( UInt32 ), NULL, &click );

-        
+

     if ( button == 0 || GetEventKind( event ) == kEventMouseUp )
         modifiers += btnState ;
     if ( button == 0 || GetEventKind( event ) == kEventMouseUp )
         modifiers += btnState ;

-    
+

     WindowRef window ;
     short windowPart = ::FindWindow(point, &window);
 
     WindowRef window ;
     short windowPart = ::FindWindow(point, &window);
 


@@ -256,9 +256,9 @@ static pascal OSStatus MouseEventHandler( EventHandlerCallRef handler , EventRef
                 break ;
         }
     }
                 break ;
         }
     }

-    
+

     return result ;
     return result ;

-    
+

 
 }
 static pascal OSStatus WindowEventHandler( EventHandlerCallRef handler , EventRef event , void *data )
 
 }
 static pascal OSStatus WindowEventHandler( EventHandlerCallRef handler , EventRef event , void *data )


@@ -269,10 +269,10 @@ static pascal OSStatus WindowEventHandler( EventHandlerCallRef handler , EventRe
     UInt32        attributes;
     WindowRef windowRef ;
     wxTopLevelWindowMac* toplevelWindow = (wxTopLevelWindowMac*) data ;
     UInt32        attributes;
     WindowRef windowRef ;
     wxTopLevelWindowMac* toplevelWindow = (wxTopLevelWindowMac*) data ;

-    
+

     GetEventParameter( event, kEventParamDirectObject, typeWindowRef, NULL,
         sizeof( WindowRef ), NULL, &windowRef );
     GetEventParameter( event, kEventParamDirectObject, typeWindowRef, NULL,
         sizeof( WindowRef ), NULL, &windowRef );

-        
+

     switch( GetEventKind( event ) )
     {
         case kEventWindowUpdate :
     switch( GetEventKind( event ) )
     {
         case kEventWindowUpdate :


@@ -301,9 +301,9 @@ static pascal OSStatus WindowEventHandler( EventHandlerCallRef handler , EventRe
 
                 GetEventParameter( event, kEventParamCurrentBounds, typeQDRectangle, NULL,
                     sizeof( newContentRect ), NULL, &newContentRect );
 
                 GetEventParameter( event, kEventParamCurrentBounds, typeQDRectangle, NULL,
                     sizeof( newContentRect ), NULL, &newContentRect );

-                
-                toplevelWindow->SetSize( newContentRect.left , newContentRect.top , 
-                    newContentRect.right - newContentRect.left , 
+
+                toplevelWindow->SetSize( newContentRect.left , newContentRect.top ,
+                    newContentRect.right - newContentRect.left ,

                     newContentRect.bottom - newContentRect.top, wxSIZE_USE_EXISTING);
 
                 result = noErr;
                     newContentRect.bottom - newContentRect.top, wxSIZE_USE_EXISTING);
 
                 result = noErr;


@@ -362,7 +362,7 @@ void wxAssociateWinWithMacWindow(WXWindow inWindowRef, wxTopLevelWindowMac *win)
 {
     // adding NULL WindowRef is (first) surely a result of an error and
     // (secondly) breaks menu command processing
 {
     // adding NULL WindowRef is (first) surely a result of an error and
     // (secondly) breaks menu command processing

-    wxCHECK_RET( inWindowRef != (WindowRef) NULL, "attempt to add a NULL WindowRef to window list" );
+    wxCHECK_RET( inWindowRef != (WindowRef) NULL, wxT("attempt to add a NULL WindowRef to window list") );

 
     if ( !wxWinMacWindowList->Find((long)inWindowRef) )
         wxWinMacWindowList->Append((long)inWindowRef, win);
 
     if ( !wxWinMacWindowList->Find((long)inWindowRef) )
         wxWinMacWindowList->Append((long)inWindowRef, win);


@@ -395,13 +395,13 @@ void wxTopLevelWindowMac::Init()
 class wxMacDeferredWindowDeleter : public wxObject
 {
 public :
 class wxMacDeferredWindowDeleter : public wxObject
 {
 public :

-    wxMacDeferredWindowDeleter( WindowRef windowRef ) 
-    { 
-        m_macWindow = windowRef ; 
+    wxMacDeferredWindowDeleter( WindowRef windowRef )
+    {
+        m_macWindow = windowRef ;

     }
     }

-    virtual ~wxMacDeferredWindowDeleter() 
-    { 
-        UMADisposeWindow( (WindowRef) m_macWindow ) ; 
+    virtual ~wxMacDeferredWindowDeleter()
+    {
+        UMADisposeWindow( (WindowRef) m_macWindow ) ;

     }
  protected :
     WindowRef m_macWindow ;
     }
  protected :
     WindowRef m_macWindow ;


@@ -439,14 +439,14 @@ wxTopLevelWindowMac::~wxTopLevelWindowMac()
         wxToolTip::NotifyWindowDelete(m_macWindow) ;
         wxPendingDelete.Append( new wxMacDeferredWindowDeleter( (WindowRef) m_macWindow ) ) ;
     }
         wxToolTip::NotifyWindowDelete(m_macWindow) ;
         wxPendingDelete.Append( new wxMacDeferredWindowDeleter( (WindowRef) m_macWindow ) ) ;
     }

- 
+

 #if TARGET_CARBON
     if ( m_macEventHandler )
     {
         ::RemoveEventHandler((EventHandlerRef) m_macEventHandler);
         m_macEventHandler = NULL ;
     }
 #if TARGET_CARBON
     if ( m_macEventHandler )
     {
         ::RemoveEventHandler((EventHandlerRef) m_macEventHandler);
         m_macEventHandler = NULL ;
     }

-#endif   
+#endif

 
     wxRemoveMacWindowAssociation( this ) ;
 
 
     wxRemoveMacWindowAssociation( this ) ;
 


@@ -468,7 +468,7 @@ void wxTopLevelWindowMac::Maximize(bool maximize)
 
 bool wxTopLevelWindowMac::IsMaximized() const
 {
 
 bool wxTopLevelWindowMac::IsMaximized() const
 {

-    return false ; 
+    return false ;

 }
 
 void wxTopLevelWindowMac::Iconize(bool iconize)
 }
 
 void wxTopLevelWindowMac::Iconize(bool iconize)


@@ -501,40 +501,40 @@ void  wxTopLevelWindowMac::MacCreateRealWindow( const wxString& title,
            const wxPoint& pos,
            const wxSize& size,
            long style,
            const wxPoint& pos,
            const wxSize& size,
            long style,

-           const wxString& name ) 
+           const wxString& name )

 {
     SetName(name);
     m_windowStyle = style;
     m_isShown = FALSE;
 {
     SetName(name);
     m_windowStyle = style;
     m_isShown = FALSE;

-    
+

     // create frame.
     // create frame.

-    
+

     Rect theBoundsRect;
     Rect theBoundsRect;

-    
+

     m_x = (int)pos.x;
     m_y = (int)pos.y;
     if ( m_y < 50 )
         m_y = 50 ;
     if ( m_x < 20 )
         m_x = 20 ;
     m_x = (int)pos.x;
     m_y = (int)pos.y;
     if ( m_y < 50 )
         m_y = 50 ;
     if ( m_x < 20 )
         m_x = 20 ;

-    
+

     m_width = size.x;
     m_width = size.x;

-    if (m_width == -1) 
+    if (m_width == -1)

         m_width = 20;
     m_height = size.y;
         m_width = 20;
     m_height = size.y;

-    if (m_height == -1) 
+    if (m_height == -1)

         m_height = 20;
         m_height = 20;

-    
+

     ::SetRect(&theBoundsRect, m_x, m_y , m_x + m_width, m_y + m_height);
     ::SetRect(&theBoundsRect, m_x, m_y , m_x + m_width, m_y + m_height);

-    
+

     // translate the window attributes in the appropriate window class and attributes
     // translate the window attributes in the appropriate window class and attributes

-    
+

     WindowClass wclass = 0;
     WindowAttributes attr = kWindowNoAttributes ;
     WindowClass wclass = 0;
     WindowAttributes attr = kWindowNoAttributes ;

-    
+

     if ( HasFlag( wxFRAME_TOOL_WINDOW) )
     {
     if ( HasFlag( wxFRAME_TOOL_WINDOW) )
     {

-        if ( 
+        if (

             HasFlag( wxMINIMIZE_BOX ) || HasFlag( wxMAXIMIZE_BOX ) ||
             HasFlag( wxSYSTEM_MENU ) || HasFlag( wxCAPTION ) ||
             HasFlag(wxTINY_CAPTION_HORIZ) ||  HasFlag(wxTINY_CAPTION_VERT)
             HasFlag( wxMINIMIZE_BOX ) || HasFlag( wxMAXIMIZE_BOX ) ||
             HasFlag( wxSYSTEM_MENU ) || HasFlag( wxCAPTION ) ||
             HasFlag(wxTINY_CAPTION_HORIZ) ||  HasFlag(wxTINY_CAPTION_VERT)


@@ -557,7 +557,7 @@ void  wxTopLevelWindowMac::MacCreateRealWindow( const wxString& title,
     }
     else if ( HasFlag( wxCAPTION ) )
     {
     }
     else if ( HasFlag( wxCAPTION ) )
     {

-        wclass = kDocumentWindowClass ; 
+        wclass = kDocumentWindowClass ;

     }
     else
     {
     }
     else
     {


@@ -575,7 +575,7 @@ void  wxTopLevelWindowMac::MacCreateRealWindow( const wxString& title,
 #endif
         }
     }
 #endif
         }
     }

-    
+

     if ( HasFlag( wxMINIMIZE_BOX ) || HasFlag( wxMAXIMIZE_BOX ) )
     {
         attr |= kWindowFullZoomAttribute ;
     if ( HasFlag( wxMINIMIZE_BOX ) || HasFlag( wxMAXIMIZE_BOX ) )
     {
         attr |= kWindowFullZoomAttribute ;


@@ -589,25 +589,20 @@ void  wxTopLevelWindowMac::MacCreateRealWindow( const wxString& title,
     {
         attr |= kWindowCloseBoxAttribute ;
     }
     {
         attr |= kWindowCloseBoxAttribute ;
     }

-    
+

     ::CreateNewWindow( wclass , attr , &theBoundsRect , (WindowRef*)&m_macWindow ) ;
     wxAssociateWinWithMacWindow( m_macWindow , this ) ;
     ::CreateNewWindow( wclass , attr , &theBoundsRect , (WindowRef*)&m_macWindow ) ;
     wxAssociateWinWithMacWindow( m_macWindow , this ) ;

-    wxString label ;
-    if( wxApp::s_macDefaultEncodingIsPC )
-        label = wxMacMakeMacStringFromPC( title ) ;
-    else
-        label = title ;
-    UMASetWTitleC( (WindowRef)m_macWindow , label ) ;
+    UMASetWTitle( (WindowRef)m_macWindow , title ) ;

     ::CreateRootControl( (WindowRef)m_macWindow , (ControlHandle*)&m_macRootControl ) ;
 #if TARGET_CARBON
     InstallStandardEventHandler( GetWindowEventTarget(MAC_WXHWND(m_macWindow)) ) ;
     ::CreateRootControl( (WindowRef)m_macWindow , (ControlHandle*)&m_macRootControl ) ;
 #if TARGET_CARBON
     InstallStandardEventHandler( GetWindowEventTarget(MAC_WXHWND(m_macWindow)) ) ;

-    InstallWindowEventHandler(MAC_WXHWND(m_macWindow), GetwxMacWindowEventHandlerUPP(), 
-        GetEventTypeCount(eventList), eventList, this, &((EventHandlerRef)m_macEventHandler));    
+    InstallWindowEventHandler(MAC_WXHWND(m_macWindow), GetwxMacWindowEventHandlerUPP(),
+        GetEventTypeCount(eventList), eventList, this, &((EventHandlerRef)m_macEventHandler));

 #endif
     m_macFocus = NULL ;
 }
 
 #endif
     m_macFocus = NULL ;
 }
 

-void wxTopLevelWindowMac::MacGetPortParams(WXPOINTPTR localOrigin, WXRECTPTR clipRect, WXHWND *window  , wxWindowMac** rootwin) 
+void wxTopLevelWindowMac::MacGetPortParams(WXPOINTPTR localOrigin, WXRECTPTR clipRect, WXHWND *window  , wxWindowMac** rootwin)

 {
     ((Point*)localOrigin)->h = 0;
     ((Point*)localOrigin)->v = 0;
 {
     ((Point*)localOrigin)->h = 0;
     ((Point*)localOrigin)->v = 0;


@@ -624,7 +619,7 @@ void wxTopLevelWindowMac::Clear()
     wxWindow::Clear() ;
 }
 
     wxWindow::Clear() ;
 }
 

-WXWidget wxTopLevelWindowMac::MacGetContainerForEmbedding() 
+WXWidget wxTopLevelWindowMac::MacGetContainerForEmbedding()

 {
     return m_macRootControl ;
 }
 {
     return m_macRootControl ;
 }


@@ -636,11 +631,24 @@ void wxTopLevelWindowMac::MacUpdate( long timestamp)
 
     BeginUpdate( (WindowRef)m_macWindow ) ;
 
 
     BeginUpdate( (WindowRef)m_macWindow ) ;
 

-    RgnHandle       updateRgn = NewRgn();    
+    RgnHandle       updateRgn = NewRgn();

     RgnHandle       diffRgn = NewRgn() ;
     if ( updateRgn && diffRgn )
     {
     RgnHandle       diffRgn = NewRgn() ;
     if ( updateRgn && diffRgn )
     {

+#if 1
+        // macos internal control redraws clean up areas we'd like to redraw ourselves
+        // therefore we pick the boundary rect and make sure we can redraw it
+        RgnHandle trueUpdateRgn = NewRgn() ;
+        Rect trueUpdateRgnBoundary ;
+        GetPortVisibleRegion( GetWindowPort( (WindowRef)m_macWindow ), trueUpdateRgn );
+        GetRegionBounds( trueUpdateRgn , &trueUpdateRgnBoundary ) ;
+        RectRgn( (RgnHandle) updateRgn , &trueUpdateRgnBoundary ) ;
+        if ( trueUpdateRgn )
+            DisposeRgn( trueUpdateRgn ) ;
+        SetPortVisibleRegion(  GetWindowPort( (WindowRef)m_macWindow ), updateRgn ) ;
+#else

         GetPortVisibleRegion( GetWindowPort( (WindowRef)m_macWindow ), updateRgn );
         GetPortVisibleRegion( GetWindowPort( (WindowRef)m_macWindow ), updateRgn );

+#endif

         DiffRgn( updateRgn , (RgnHandle) m_macNoEraseUpdateRgn , diffRgn ) ;
         if ( !EmptyRgn( updateRgn ) )
         {
         DiffRgn( updateRgn , (RgnHandle) m_macNoEraseUpdateRgn , diffRgn ) ;
         if ( !EmptyRgn( updateRgn ) )
         {


@@ -669,15 +677,15 @@ void wxTopLevelWindowMac::Lower()
     ::SendBehind( (WindowRef)m_macWindow , NULL ) ;
 }
 
     ::SendBehind( (WindowRef)m_macWindow , NULL ) ;
 }
 

-void wxTopLevelWindowMac::MacFireMouseEvent( 
+void wxTopLevelWindowMac::MacFireMouseEvent(

     wxUint16 kind , wxInt32 x , wxInt32 y ,wxUint32 modifiers , long timestamp )
 {
     wxMouseEvent event(wxEVT_LEFT_DOWN);
     bool isDown = !(modifiers & btnState) ; // 1 is for up
     bool controlDown = modifiers & controlKey ; // for simulating right mouse
     wxUint16 kind , wxInt32 x , wxInt32 y ,wxUint32 modifiers , long timestamp )
 {
     wxMouseEvent event(wxEVT_LEFT_DOWN);
     bool isDown = !(modifiers & btnState) ; // 1 is for up
     bool controlDown = modifiers & controlKey ; // for simulating right mouse

-    
+

     event.m_leftDown = isDown && !controlDown;
     event.m_leftDown = isDown && !controlDown;

-    
+

     event.m_middleDown = FALSE;
     event.m_rightDown = isDown && controlDown;
 
     event.m_middleDown = FALSE;
     event.m_rightDown = isDown && controlDown;
 


@@ -708,8 +716,8 @@ void wxTopLevelWindowMac::MacFireMouseEvent(
     Point       localwhere ;
     localwhere.h = x ;
     localwhere.v = y ;
     Point       localwhere ;
     localwhere.h = x ;
     localwhere.v = y ;

-        
-    GrafPtr     port ;  
+
+    GrafPtr     port ;

     ::GetPort( &port ) ;
     ::SetPort( UMAGetWindowPort( (WindowRef)m_macWindow ) ) ;
     ::GlobalToLocal( &localwhere ) ;
     ::GetPort( &port ) ;
     ::SetPort( UMAGetWindowPort( (WindowRef)m_macWindow ) ) ;
     ::GlobalToLocal( &localwhere ) ;


@@ -754,7 +762,7 @@ void wxTopLevelWindowMac::MacFireMouseEvent(
         event.m_y = y ;
         event.SetEventObject( wxTheApp->s_captureWindow ) ;
         wxTheApp->s_captureWindow->GetEventHandler()->ProcessEvent( event ) ;
         event.m_y = y ;
         event.SetEventObject( wxTheApp->s_captureWindow ) ;
         wxTheApp->s_captureWindow->GetEventHandler()->ProcessEvent( event ) ;

-        
+

         if ( kind == mouseUp )
         {
             wxTheApp->s_captureWindow = NULL ;
         if ( kind == mouseUp )
         {
             wxTheApp->s_captureWindow = NULL ;


@@ -774,7 +782,7 @@ void wxTopLevelWindowMac::MacFireMouseEvent(
 
 void wxTopLevelWindowMac::MacMouseDown( WXEVENTREF ev , short part)
 {
 
 void wxTopLevelWindowMac::MacMouseDown( WXEVENTREF ev , short part)
 {

-    MacFireMouseEvent( mouseDown , ((EventRecord*)ev)->where.h , ((EventRecord*)ev)->where.v , 
+    MacFireMouseEvent( mouseDown , ((EventRecord*)ev)->where.h , ((EventRecord*)ev)->where.v ,

         ((EventRecord*)ev)->modifiers , ((EventRecord*)ev)->when ) ;
 }
 
         ((EventRecord*)ev)->modifiers , ((EventRecord*)ev)->when ) ;
 }
 


@@ -782,9 +790,9 @@ void wxTopLevelWindowMac::MacMouseUp( WXEVENTREF ev , short part)
 {
     switch (part)
     {
 {
     switch (part)
     {

-        case inContent:     
+        case inContent:

             {
             {

-                MacFireMouseEvent( mouseUp , ((EventRecord*)ev)->where.h , ((EventRecord*)ev)->where.v , 
+                MacFireMouseEvent( mouseUp , ((EventRecord*)ev)->where.h , ((EventRecord*)ev)->where.v ,

                     ((EventRecord*)ev)->modifiers , ((EventRecord*)ev)->when ) ;
             }
             break ;
                     ((EventRecord*)ev)->modifiers , ((EventRecord*)ev)->when ) ;
             }
             break ;


@@ -795,9 +803,9 @@ void wxTopLevelWindowMac::MacMouseMoved( WXEVENTREF ev , short part)
 {
     switch (part)
     {
 {
     switch (part)
     {

-        case inContent:     
+        case inContent:

             {
             {

-                MacFireMouseEvent( nullEvent /*moved*/ , ((EventRecord*)ev)->where.h , ((EventRecord*)ev)->where.v , 
+                MacFireMouseEvent( nullEvent /*moved*/ , ((EventRecord*)ev)->where.h , ((EventRecord*)ev)->where.v ,

                     ((EventRecord*)ev)->modifiers , ((EventRecord*)ev)->when ) ;
             }
             break ;
                     ((EventRecord*)ev)->modifiers , ((EventRecord*)ev)->when ) ;
             }
             break ;


@@ -811,23 +819,29 @@ void wxTopLevelWindowMac::MacActivate( long timestamp , bool inIsActivating )
     wxActivateEvent event(wxEVT_ACTIVATE, inIsActivating , m_windowId);
     event.m_timeStamp = timestamp ;
     event.SetEventObject(this);
     wxActivateEvent event(wxEVT_ACTIVATE, inIsActivating , m_windowId);
     event.m_timeStamp = timestamp ;
     event.SetEventObject(this);

-    
+

     GetEventHandler()->ProcessEvent(event);
     GetEventHandler()->ProcessEvent(event);

-    
+

     UMAHighlightAndActivateWindow( (WindowRef)m_macWindow , inIsActivating ) ;
     UMAHighlightAndActivateWindow( (WindowRef)m_macWindow , inIsActivating ) ;

-    
+

     // Early versions of MacOS X don't refresh backgrounds properly,
     // so refresh the whole window on activation and deactivation.
     long osVersion = UMAGetSystemVersion();
     if (osVersion >= 0x1000 && osVersion < 0x1020)
     // Early versions of MacOS X don't refresh backgrounds properly,
     // so refresh the whole window on activation and deactivation.
     long osVersion = UMAGetSystemVersion();
     if (osVersion >= 0x1000 && osVersion < 0x1020)

+    {

         Refresh(TRUE);
         Refresh(TRUE);

+    }

     else
     else

-        MacSuperEnabled( inIsActivating ) ;
+    {
+        // for the moment we have to resolve some redrawing issues like this
+        // the OS is stealing some redrawing areas as soon as it draws a control
+        Refresh(TRUE);
+    }

 }
 
 #if !TARGET_CARBON
 
 }
 
 #if !TARGET_CARBON
 

-void wxTopLevelWindowMac::MacKeyDown( WXEVENTREF ev ) 
+void wxTopLevelWindowMac::MacKeyDown( WXEVENTREF ev )

 {
 }
 
 {
 }
 


@@ -836,15 +850,7 @@ void wxTopLevelWindowMac::MacKeyDown( WXEVENTREF ev )
 void wxTopLevelWindowMac::SetTitle(const wxString& title)
 {
     wxWindow::SetTitle( title ) ;
 void wxTopLevelWindowMac::SetTitle(const wxString& title)
 {
     wxWindow::SetTitle( title ) ;

-    
-    wxString label ;
-    
-    if( wxApp::s_macDefaultEncodingIsPC )
-        label = wxMacMakeMacStringFromPC( m_label ) ;
-    else
-        label = m_label ;
-
-    UMASetWTitleC( (WindowRef)m_macWindow , label ) ;
+    UMASetWTitle( (WindowRef)m_macWindow , title ) ;

 }
 
 bool wxTopLevelWindowMac::Show(bool show)
 }
 
 bool wxTopLevelWindowMac::Show(bool show)


@@ -853,8 +859,10 @@ bool wxTopLevelWindowMac::Show(bool show)
         return FALSE;
 
     if (show)
         return FALSE;
 
     if (show)

-    { 
-      ::TransitionWindow((WindowRef)m_macWindow,kWindowZoomTransitionEffect,kWindowShowTransitionAction,nil);
+    {
+      // this is leading to incorrect window layering in some situations
+      // ::TransitionWindow((WindowRef)m_macWindow,kWindowZoomTransitionEffect,kWindowShowTransitionAction,nil);
+      ::ShowWindow( (WindowRef)m_macWindow ) ;

       ::SelectWindow( (WindowRef)m_macWindow ) ;
       // no need to generate events here, they will get them triggered by macos
       // actually they should be , but apparently they are not
       ::SelectWindow( (WindowRef)m_macWindow ) ;
       // no need to generate events here, they will get them triggered by macos
       // actually they should be , but apparently they are not


@@ -865,7 +873,9 @@ bool wxTopLevelWindowMac::Show(bool show)
     }
     else
     {
     }
     else
     {

-      ::TransitionWindow((WindowRef)m_macWindow,kWindowZoomTransitionEffect,kWindowHideTransitionAction,nil);
+      // this is leading to incorrect window layering in some situations
+      // ::TransitionWindow((WindowRef)m_macWindow,kWindowZoomTransitionEffect,kWindowHideTransitionAction,nil);
+      ::HideWindow( (WindowRef)m_macWindow ) ;

     }
 
     if ( !show )
     }
 
     if ( !show )


@@ -873,7 +883,7 @@ bool wxTopLevelWindowMac::Show(bool show)
     }
     else
     {
     }
     else
     {

-        Refresh() ; 
+        Refresh() ;

     }
 
     return TRUE;
     }
 
     return TRUE;


@@ -885,24 +895,24 @@ void wxTopLevelWindowMac::DoMoveWindow(int x, int y, int width, int height)
     int former_y = m_y ;
     int former_w = m_width ;
     int former_h = m_height ;
     int former_y = m_y ;
     int former_w = m_width ;
     int former_h = m_height ;

-    
+

     int actualWidth = width;
     int actualHeight = height;
     int actualX = x;
     int actualY = y;
     int actualWidth = width;
     int actualHeight = height;
     int actualX = x;
     int actualY = y;

-    
-    if ((m_minWidth != -1) && (actualWidth < m_minWidth)) 
+
+    if ((m_minWidth != -1) && (actualWidth < m_minWidth))

         actualWidth = m_minWidth;
         actualWidth = m_minWidth;

-    if ((m_minHeight != -1) && (actualHeight < m_minHeight)) 
+    if ((m_minHeight != -1) && (actualHeight < m_minHeight))

         actualHeight = m_minHeight;
         actualHeight = m_minHeight;

-    if ((m_maxWidth != -1) && (actualWidth > m_maxWidth)) 
+    if ((m_maxWidth != -1) && (actualWidth > m_maxWidth))

         actualWidth = m_maxWidth;
         actualWidth = m_maxWidth;

-    if ((m_maxHeight != -1) && (actualHeight > m_maxHeight)) 
+    if ((m_maxHeight != -1) && (actualHeight > m_maxHeight))

         actualHeight = m_maxHeight;
 
     bool doMove = false ;
     bool doResize = false ;
         actualHeight = m_maxHeight;
 
     bool doMove = false ;
     bool doResize = false ;

-    
+

     if ( actualX != former_x || actualY != former_y )
     {
         doMove = true ;
     if ( actualX != former_x || actualY != former_y )
     {
         doMove = true ;


@@ -921,17 +931,17 @@ void wxTopLevelWindowMac::DoMoveWindow(int x, int y, int width, int height)
 
         if ( doMove )
             ::MoveWindow((WindowRef)m_macWindow, m_x, m_y  , false); // don't make frontmost
 
         if ( doMove )
             ::MoveWindow((WindowRef)m_macWindow, m_x, m_y  , false); // don't make frontmost

-        
+

         if ( doResize )
         if ( doResize )

-            ::SizeWindow((WindowRef)m_macWindow, m_width, m_height  , true); 
-            
+            ::SizeWindow((WindowRef)m_macWindow, m_width, m_height  , true);
+

         // the OS takes care of invalidating and erasing the new area so we only have to
         // take care of refreshing for full repaints
 
         if ( doResize && !HasFlag(wxNO_FULL_REPAINT_ON_RESIZE) )
             Refresh() ;
         // the OS takes care of invalidating and erasing the new area so we only have to
         // take care of refreshing for full repaints
 
         if ( doResize && !HasFlag(wxNO_FULL_REPAINT_ON_RESIZE) )
             Refresh() ;

-        
-        
+
+

         if ( IsKindOf( CLASSINFO( wxFrame ) ) )
         {
             wxFrame* frame = (wxFrame*) this ;
         if ( IsKindOf( CLASSINFO( wxFrame ) ) )
         {
             wxFrame* frame = (wxFrame*) this ;


@@ -958,7 +968,7 @@ void wxTopLevelWindowMac::DoMoveWindow(int x, int y, int width, int height)
              GetEventHandler()->ProcessEvent(event);
         }
     }
              GetEventHandler()->ProcessEvent(event);
         }
     }

-    
+

 }
 
 /*
 }
 
 /*


@@ -969,28 +979,28 @@ void wxTopLevelWindowMac::DoMoveWindow(int x, int y, int width, int height)
  * has been true for any part of the update rgn the background is erased in the entire region
  * not just in the specified rect.
  *
  * has been true for any part of the update rgn the background is erased in the entire region
  * not just in the specified rect.
  *

- * In order to achive this, we also have an internal m_macNoEraseUpdateRgn, all rects that have 
+ * In order to achive this, we also have an internal m_macNoEraseUpdateRgn, all rects that have

  * the eraseBackground flag set to false are also added to this rgn. upon receiving an update event
  * the update rgn is compared to the m_macNoEraseUpdateRgn and in case they differ, every window
  * will get the eraseBackground event first
  */
  * the eraseBackground flag set to false are also added to this rgn. upon receiving an update event
  * the update rgn is compared to the m_macNoEraseUpdateRgn and in case they differ, every window
  * will get the eraseBackground event first
  */

- 
-void wxTopLevelWindowMac::MacInvalidate( const WXRECTPTR rect, bool eraseBackground ) 
+
+void wxTopLevelWindowMac::MacInvalidate( const WXRECTPTR rect, bool eraseBackground )

 {
     GrafPtr formerPort ;
     GetPort( &formerPort ) ;
     SetPortWindowPort( (WindowRef)m_macWindow ) ;
 {
     GrafPtr formerPort ;
     GetPort( &formerPort ) ;
     SetPortWindowPort( (WindowRef)m_macWindow ) ;

-    
+

     m_macNeedsErasing |= eraseBackground ;
     m_macNeedsErasing |= eraseBackground ;

-    
+

     // if we already know that we will have to erase, there's no need to track the rest
     if ( !m_macNeedsErasing)
     {
         // we end only here if eraseBackground is false
         // if we already have a difference between m_macNoEraseUpdateRgn and UpdateRgn
         // we will have to erase anyway
     // if we already know that we will have to erase, there's no need to track the rest
     if ( !m_macNeedsErasing)
     {
         // we end only here if eraseBackground is false
         // if we already have a difference between m_macNoEraseUpdateRgn and UpdateRgn
         // we will have to erase anyway

-        
-        RgnHandle       updateRgn = NewRgn();    
+
+        RgnHandle       updateRgn = NewRgn();

         RgnHandle       diffRgn = NewRgn() ;
         if ( updateRgn && diffRgn )
         {
         RgnHandle       diffRgn = NewRgn() ;
         if ( updateRgn && diffRgn )
         {


@@ -1008,7 +1018,7 @@ void wxTopLevelWindowMac::MacInvalidate( const WXRECTPTR rect, bool eraseBackgro
             DisposeRgn( updateRgn );
         if ( diffRgn )
             DisposeRgn( diffRgn );
             DisposeRgn( updateRgn );
         if ( diffRgn )
             DisposeRgn( diffRgn );

-        
+

         if ( !m_macNeedsErasing )
         {
             RgnHandle rectRgn = NewRgn() ;
         if ( !m_macNeedsErasing )
         {
             RgnHandle rectRgn = NewRgn() ;


@@ -1025,3 +1035,7 @@ void wxTopLevelWindowMac::MacInvalidate( const WXRECTPTR rect, bool eraseBackgro
     SetPort( formerPort ) ;
 }
 
     SetPort( formerPort ) ;
 }
 

+bool wxTopLevelWindowMac::SetShape(const wxRegion& region)
+{
+    return FALSE;
+}