Add tests for XShape extension API in configure,

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

diff --git a/src/mac/toplevel.cpp b/src/mac/toplevel.cpp
index 4fed48c94330d28680adb807e60c50d774b538c5..2da89cd414782bc5d4f015bccd974fe89508cbbd 100644 (file)
--- a/src/mac/toplevel.cpp
+++ b/src/mac/toplevel.cpp
@@ -6,7 +6,7 @@
 // Created:     24.09.01
 // RCS-ID:      $Id$
 // Copyright:   (c) 2001 SciTech Software, Inc. (www.scitechsoft.com)
 // Created:     24.09.01
 // RCS-ID:      $Id$
 // Copyright:   (c) 2001 SciTech Software, Inc. (www.scitechsoft.com)

-// License:     wxWindows license
+// License:     wxWindows licence

 ///////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
 ///////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================


@@ -71,15 +71,15 @@ 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 } ,

-    /*
-       { kEventClassKeyboard, kEventRawKeyDown } ,
-           { kEventClassKeyboard, kEventRawKeyRepeat } ,
-           { kEventClassKeyboard, kEventRawKeyUp } ,
-           { kEventClassKeyboard, kEventRawKeyModifiersChanged } ,
-       */
+
+    { kEventClassKeyboard, kEventRawKeyDown } ,
+    { kEventClassKeyboard, kEventRawKeyRepeat } ,
+    { kEventClassKeyboard, kEventRawKeyUp } ,
+    { kEventClassKeyboard, kEventRawKeyModifiersChanged } ,
+

     { kEventClassWindow , kEventWindowUpdate } ,
     { kEventClassWindow , kEventWindowActivated } ,
     { kEventClassWindow , kEventWindowDeactivated } ,
     { kEventClassWindow , kEventWindowUpdate } ,
     { kEventClassWindow , kEventWindowActivated } ,
     { kEventClassWindow , kEventWindowDeactivated } ,


@@ -97,17 +97,111 @@ static const EventTypeSpec eventList[] =
 static pascal OSStatus TextInputEventHandler( EventHandlerCallRef handler , EventRef event , void *data )
 {
     OSStatus result = eventNotHandledErr ;
 static pascal OSStatus TextInputEventHandler( EventHandlerCallRef handler , EventRef event , void *data )
 {
     OSStatus result = eventNotHandledErr ;

-    EventRecord rec ;

 
 

-    if ( wxMacConvertEventToRecord( event , &rec ) )
+    wxWindow* focus = wxWindow::FindFocus() ;
+    char charCode ;
+    UInt32 keyCode ;
+    UInt32 modifiers ;
+    Point point ;
+    UInt32 when = EventTimeToTicks( GetEventTime( event ) ) ;
+
+    EventRef 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, kEventParamMouseLocation, typeQDPoint, NULL,
+        sizeof( Point ), NULL, &point );
+
+    UInt32 message = (keyCode << 8) + charCode;
+
+    switch ( GetEventKind( event ) )

     {
     {

-               wxTheApp->m_macCurrentEvent = &rec ;
-        wxWindow* focus = wxWindow::FindFocus() ;
-        if ( (focus != NULL) && !UMAMenuEvent(&rec) && wxTheApp->MacSendKeyDownEvent( focus , rec.message , rec.modifiers , rec.when , rec.where.h , rec.where.v ) )
-        {
-            // was handled internally
-            result = noErr ;
-        }
+        case kEventTextInputUnicodeForKeyEvent :
+            if ( (focus != NULL) && wxTheApp->MacSendKeyDownEvent(
+                focus , message , modifiers , when , point.h , point.v ) )
+            {
+                result = noErr ;
+            }
+            break ;
+    }
+
+    return result ;
+}
+
+static pascal OSStatus KeyboardEventHandler( EventHandlerCallRef handler , EventRef event , void *data )
+{
+    OSStatus result = eventNotHandledErr ;
+
+    wxWindow* focus = wxWindow::FindFocus() ;
+    char charCode ;
+    UInt32 keyCode ;
+    UInt32 modifiers ;
+    Point point ;
+    UInt32 when = EventTimeToTicks( GetEventTime( event ) ) ;
+
+    GetEventParameter( event, kEventParamKeyMacCharCodes, typeChar, NULL,sizeof(char), NULL,&charCode );
+    GetEventParameter( event, kEventParamKeyCode, typeUInt32, NULL,  sizeof(UInt32), NULL, &keyCode );
+       GetEventParameter(event, kEventParamKeyModifiers, typeUInt32, NULL, sizeof(UInt32), NULL, &modifiers);
+    GetEventParameter( event, kEventParamMouseLocation, typeQDPoint, NULL,
+        sizeof( Point ), NULL, &point );
+
+    UInt32 message = (keyCode << 8) + charCode;
+    switch( GetEventKind( event ) )
+    {
+        case kEventRawKeyRepeat :
+        case kEventRawKeyDown :
+            if ( (focus != NULL) && wxTheApp->MacSendKeyDownEvent(
+                focus , message , modifiers , when , point.h , point.v ) )
+            {
+                result = noErr ;
+            }
+            break ;
+        case kEventRawKeyUp :
+            if ( (focus != NULL) && wxTheApp->MacSendKeyUpEvent(
+                focus , message , modifiers , when , point.h , point.v ) )
+            {
+                result = noErr ;
+            }
+            break ;
+        case kEventRawKeyModifiersChanged :
+            {
+                wxKeyEvent event(wxEVT_KEY_DOWN);
+
+                event.m_shiftDown = modifiers & shiftKey;
+                event.m_controlDown = modifiers & controlKey;
+                event.m_altDown = modifiers & optionKey;
+                event.m_metaDown = modifiers & cmdKey;
+
+                event.m_x = point.h;
+                event.m_y = point.v;
+                event.m_timeStamp = when;
+                wxWindow* focus = wxWindow::FindFocus() ;
+                event.SetEventObject(focus);
+
+                if ( (modifiers ^ wxTheApp->s_lastModifiers ) & controlKey )
+                {
+                    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 )
+                {
+                    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 )
+                {
+                    event.m_keyCode = WXK_ALT ;
+                    event.SetEventType( ( modifiers & optionKey ) ? wxEVT_KEY_DOWN : wxEVT_KEY_UP ) ;
+                    focus->GetEventHandler()->ProcessEvent( event ) ;
+                }
+                wxTheApp->s_lastModifiers = modifiers ;
+            }
+             break ;

     }
 
     return result ;
     }
 
     return result ;


@@ -117,53 +211,54 @@ static pascal OSStatus MouseEventHandler( EventHandlerCallRef handler , EventRef
 {
     OSStatus result = eventNotHandledErr ;
 
 {
     OSStatus result = eventNotHandledErr ;
 

-       wxTopLevelWindowMac* toplevelWindow = (wxTopLevelWindowMac*) data ;
-       Point point ;
-       UInt32 modifiers = 0;
-       EventMouseButton button = 0 ;
-       UInt32 click = 0 ;
-       
-       GetEventParameter( event, kEventParamMouseLocation, typeQDPoint, NULL,
-               sizeof( Point ), NULL, &point );
-       GetEventParameter( event, kEventParamKeyModifiers, typeUInt32, NULL,
-               sizeof( UInt32 ), NULL, &modifiers );
-       GetEventParameter( event, kEventParamMouseButton, typeMouseButton, NULL,
-               sizeof( EventMouseButton ), NULL, &button );
-       GetEventParameter( event, kEventParamClickCount, typeUInt32, NULL,
-               sizeof( UInt32 ), NULL, &click );
-               
-       if ( button == 0 || GetEventKind( event ) == kEventMouseUp )
-               modifiers += btnState ;
-       
-       WindowRef window ;
+    wxTopLevelWindowMac* toplevelWindow = (wxTopLevelWindowMac*) data ;
+    Point point ;
+    UInt32 modifiers = 0;
+    EventMouseButton button = 0 ;
+    UInt32 click = 0 ;
+
+    GetEventParameter( event, kEventParamMouseLocation, typeQDPoint, NULL,
+        sizeof( Point ), NULL, &point );
+    GetEventParameter( event, kEventParamKeyModifiers, typeUInt32, NULL,
+        sizeof( UInt32 ), NULL, &modifiers );
+    GetEventParameter( event, kEventParamMouseButton, typeMouseButton, NULL,
+        sizeof( EventMouseButton ), NULL, &button );
+    GetEventParameter( event, kEventParamClickCount, typeUInt32, NULL,
+        sizeof( UInt32 ), NULL, &click );
+
+    if ( button == 0 || GetEventKind( event ) == kEventMouseUp )
+        modifiers += btnState ;
+
+    WindowRef window ;

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

-    if ( windowPart == inContent )
-    {
-               switch ( GetEventKind( event ) )
-               {
-                       case kEventMouseDown :
-                               toplevelWindow->MacFireMouseEvent( mouseDown , point.h , point.v , modifiers , EventTimeToTicks( GetEventTime( event ) ) ) ;
-                               result = noErr ;
-                               break ;
-                       case kEventMouseUp :
-                               toplevelWindow->MacFireMouseEvent( mouseUp , point.h , point.v , modifiers , EventTimeToTicks( GetEventTime( event ) ) ) ;
-                               result = noErr ;
-                               break ;
-                       case kEventMouseMoved :
-                               toplevelWindow->MacFireMouseEvent( nullEvent , point.h , point.v , modifiers , EventTimeToTicks( GetEventTime( event ) ) ) ;
-                               result = noErr ;
-                               break ;
-                       case kEventMouseDragged :
-                               toplevelWindow->MacFireMouseEvent( nullEvent , point.h , point.v , modifiers , EventTimeToTicks( GetEventTime( event ) ) ) ;
-                               result = noErr ;
-                               break ;
-                       default :
-                               break ;
-               }
-       }
-       
-       return result ;
-       
+
+    if ( IsWindowActive(window) && windowPart == inContent )
+    {
+        switch ( GetEventKind( event ) )
+        {
+            case kEventMouseDown :
+                toplevelWindow->MacFireMouseEvent( mouseDown , point.h , point.v , modifiers , EventTimeToTicks( GetEventTime( event ) ) ) ;
+                result = noErr ;
+                break ;
+            case kEventMouseUp :
+                toplevelWindow->MacFireMouseEvent( mouseUp , point.h , point.v , modifiers , EventTimeToTicks( GetEventTime( event ) ) ) ;
+                result = noErr ;
+                break ;
+            case kEventMouseMoved :
+                toplevelWindow->MacFireMouseEvent( nullEvent , point.h , point.v , modifiers , EventTimeToTicks( GetEventTime( event ) ) ) ;
+                result = noErr ;
+                break ;
+            case kEventMouseDragged :
+                toplevelWindow->MacFireMouseEvent( nullEvent , point.h , point.v , modifiers , EventTimeToTicks( GetEventTime( event ) ) ) ;
+                result = noErr ;
+                break ;
+            default :
+                break ;
+        }
+    }
+
+    return result ;
+

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


@@ -171,53 +266,53 @@ static pascal OSStatus WindowEventHandler( EventHandlerCallRef handler , EventRe
     OSStatus result = eventNotHandledErr ;
     OSStatus err = noErr ;
 
     OSStatus result = eventNotHandledErr ;
     OSStatus err = noErr ;
 

-       UInt32          attributes;
-       WindowRef windowRef ;
-       wxTopLevelWindowMac* toplevelWindow = (wxTopLevelWindowMac*) data ;
-       
-       GetEventParameter( event, kEventParamDirectObject, typeWindowRef, NULL,
-               sizeof( WindowRef ), NULL, &windowRef );
-               
-       switch( GetEventKind( event ) )
-       {
-               case kEventWindowUpdate :
-               if ( !wxPendingDelete.Member(toplevelWindow) )
-                               toplevelWindow->MacUpdate( EventTimeToTicks( GetEventTime( event ) ) ) ;
-                       result = noErr ;
-                       break ;
-               case kEventWindowActivated :
-                               toplevelWindow->MacActivate( EventTimeToTicks( GetEventTime( event ) ) , true) ;
-                       result = noErr ;
-                       break ;
-               case kEventWindowDeactivated :
-                               toplevelWindow->MacActivate( EventTimeToTicks( GetEventTime( event ) ) , false) ;
-                       result = noErr ;
-                       break ;
-               case kEventWindowClose :
-               toplevelWindow->Close() ;
-                       result = noErr ;
-                       break ;
-               case kEventWindowBoundsChanged :
-                       err = GetEventParameter( event, kEventParamAttributes, typeUInt32,
-                                               NULL, sizeof( UInt32 ), NULL, &attributes );
-                       if ( err == noErr )
-                       {
-                               Rect newContentRect ;
-
-                               GetEventParameter( event, kEventParamCurrentBounds, typeQDRectangle, NULL,
-                                       sizeof( newContentRect ), NULL, &newContentRect );
-                               
-                toplevelWindow->SetSize( newContentRect.left , newContentRect.top , 
-                    newContentRect.right - newContentRect.left , 
+    UInt32        attributes;
+    WindowRef windowRef ;
+    wxTopLevelWindowMac* toplevelWindow = (wxTopLevelWindowMac*) data ;
+
+    GetEventParameter( event, kEventParamDirectObject, typeWindowRef, NULL,
+        sizeof( WindowRef ), NULL, &windowRef );
+
+    switch( GetEventKind( event ) )
+    {
+        case kEventWindowUpdate :
+            if ( !wxPendingDelete.Member(toplevelWindow) )
+                toplevelWindow->MacUpdate( EventTimeToTicks( GetEventTime( event ) ) ) ;
+            result = noErr ;
+            break ;
+        case kEventWindowActivated :
+                toplevelWindow->MacActivate( EventTimeToTicks( GetEventTime( event ) ) , true) ;
+            result = noErr ;
+            break ;
+        case kEventWindowDeactivated :
+                toplevelWindow->MacActivate( EventTimeToTicks( GetEventTime( event ) ) , false) ;
+            result = noErr ;
+            break ;
+        case kEventWindowClose :
+                toplevelWindow->Close() ;
+            result = noErr ;
+            break ;
+        case kEventWindowBoundsChanged :
+            err = GetEventParameter( event, kEventParamAttributes, typeUInt32,
+                        NULL, sizeof( UInt32 ), NULL, &attributes );
+            if ( err == noErr )
+            {
+                Rect newContentRect ;
+
+                GetEventParameter( event, kEventParamCurrentBounds, typeQDRectangle, NULL,
+                    sizeof( newContentRect ), NULL, &newContentRect );
+
+                toplevelWindow->SetSize( newContentRect.left , newContentRect.top ,
+                    newContentRect.right - newContentRect.left ,

                     newContentRect.bottom - newContentRect.top, wxSIZE_USE_EXISTING);
 
                     newContentRect.bottom - newContentRect.top, wxSIZE_USE_EXISTING);
 

-                               result = noErr;
-                       }
-                       break ;
-               default :
-                       break ;
-       }
-       return result ;
+                result = noErr;
+            }
+            break ;
+        default :
+            break ;
+    }
+    return result ;

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


@@ -226,15 +321,18 @@ pascal OSStatus wxMacWindowEventHandler( EventHandlerCallRef handler , EventRef
 
     switch ( GetEventClass( event ) )
     {
 
     switch ( GetEventClass( event ) )
     {

+        case kEventClassKeyboard :
+            result = KeyboardEventHandler( handler, event , data ) ;
+            break ;

         case kEventClassTextInput :
         case kEventClassTextInput :

-               result = TextInputEventHandler( handler, event , data ) ;
+            result = TextInputEventHandler( handler, event , data ) ;

             break ;
         case kEventClassWindow :
             break ;
         case kEventClassWindow :

-               result = WindowEventHandler( handler, event , data ) ;
-               break ;
+            result = WindowEventHandler( handler, event , data ) ;
+            break ;

         case kEventClassMouse :
         case kEventClassMouse :

-               result = MouseEventHandler( handler, event , data ) ;
-               break ;
+            result = MouseEventHandler( handler, event , data ) ;
+            break ;

         default :
             break ;
     }
         default :
             break ;
     }


@@ -264,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);


@@ -297,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 ;


@@ -341,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 ) ;
 


@@ -370,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)


@@ -403,28 +501,28 @@ 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_width = size.x;
-    if (m_width == -1) 
+    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;
+    if (m_width == -1)

         m_width = 20;
         m_width = 20;

-  m_height = size.y;
-    if (m_height == -1) 
+    m_height = size.y;
+    if (m_height == -1)

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


@@ -433,14 +531,14 @@ void  wxTopLevelWindowMac::MacCreateRealWindow( const wxString& title,
 
     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)

-             )
+            )

         {
             wclass = kFloatingWindowClass ;
             if ( HasFlag(wxTINY_CAPTION_VERT) )
         {
             wclass = kFloatingWindowClass ;
             if ( HasFlag(wxTINY_CAPTION_VERT) )


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

-        if ( HasFlag( wxDIALOG_MODAL ) )
-        {
-            wclass = kDocumentWindowClass ; // kMovableModalWindowClass ;
-        }
-        else 
-        {
-            wclass = kDocumentWindowClass ;
-        }
+        wclass = kDocumentWindowClass ;

     }
     else
     {
         if ( HasFlag( wxMINIMIZE_BOX ) || HasFlag( wxMAXIMIZE_BOX ) ||
     }
     else
     {
         if ( HasFlag( wxMINIMIZE_BOX ) || HasFlag( wxMAXIMIZE_BOX ) ||

-             HasFlag( wxSYSTEM_MENU ) )
+            HasFlag( wxSYSTEM_MENU ) )

         {
             wclass = kDocumentWindowClass ;
         }
         {
             wclass = kDocumentWindowClass ;
         }


@@ -484,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 ;


@@ -498,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
     ::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));    
+    InstallStandardEventHandler( GetWindowEventTarget(MAC_WXHWND(m_macWindow)) ) ;
+    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;


@@ -530,10 +616,10 @@ void wxTopLevelWindowMac::MacGetPortParams(WXPOINTPTR localOrigin, WXRECTPTR cli
 
 void wxTopLevelWindowMac::Clear()
 {
 
 void wxTopLevelWindowMac::Clear()
 {

-  wxWindow::Clear() ;
+    wxWindow::Clear() ;

 }
 
 }
 

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

 {
     return m_macRootControl ;
 }
 {
     return m_macRootControl ;
 }


@@ -541,12 +627,11 @@ WXWidget wxTopLevelWindowMac::MacGetContainerForEmbedding()
 
 void wxTopLevelWindowMac::MacUpdate( long timestamp)
 {
 
 void wxTopLevelWindowMac::MacUpdate( long timestamp)
 {

-

     wxMacPortStateHelper help( (GrafPtr) GetWindowPort( (WindowRef) m_macWindow) ) ;
 
     BeginUpdate( (WindowRef)m_macWindow ) ;
 
     wxMacPortStateHelper help( (GrafPtr) GetWindowPort( (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 )
     {


@@ -570,7 +655,7 @@ void wxTopLevelWindowMac::MacUpdate( long timestamp)
 // Raise the window to the top of the Z order
 void wxTopLevelWindowMac::Raise()
 {
 // Raise the window to the top of the Z order
 void wxTopLevelWindowMac::Raise()
 {

-    ::BringToFront( (WindowRef)m_macWindow ) ;
+    ::SelectWindow( (WindowRef)m_macWindow ) ;

 }
 
 // Lower the window to the bottom of the Z order
 }
 
 // Lower the window to the bottom of the Z order


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

-void wxTopLevelWindowMac::MacFireMouseEvent( 
-       wxUint16 kind , wxInt32 x , wxInt32 y ,wxUint32 modifiers , long timestamp )
+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
 {
     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;
 


@@ -618,8 +703,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 ) ;


@@ -664,7 +749,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 ;


@@ -679,22 +764,23 @@ void wxTopLevelWindowMac::MacFireMouseEvent(
         MacDispatchMouseEvent( event ) ;
     }
 }
         MacDispatchMouseEvent( event ) ;
     }
 }

+

 #if !TARGET_CARBON
 
 void wxTopLevelWindowMac::MacMouseDown( WXEVENTREF ev , short part)
 {
 #if !TARGET_CARBON
 
 void wxTopLevelWindowMac::MacMouseDown( WXEVENTREF ev , short part)
 {

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

 }
 
 void wxTopLevelWindowMac::MacMouseUp( WXEVENTREF ev , short part)
 {
     switch (part)
     {
 }
 
 void wxTopLevelWindowMac::MacMouseUp( WXEVENTREF ev , short part)
 {
     switch (part)
     {

-        case inContent:     
+        case inContent:

             {
             {

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

             }
             break ;
     }
             }
             break ;
     }


@@ -704,10 +790,10 @@ 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 , 
-                               ((EventRecord*)ev)->modifiers , ((EventRecord*)ev)->when ) ;
+                MacFireMouseEvent( nullEvent /*moved*/ , ((EventRecord*)ev)->where.h , ((EventRecord*)ev)->where.v ,
+                    ((EventRecord*)ev)->modifiers , ((EventRecord*)ev)->when ) ;

             }
             break ;
     }
             }
             break ;
     }


@@ -720,11 +806,11 @@ 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();
     // Early versions of MacOS X don't refresh backgrounds properly,
     // so refresh the whole window on activation and deactivation.
     long osVersion = UMAGetSystemVersion();


@@ -736,7 +822,7 @@ void wxTopLevelWindowMac::MacActivate( long timestamp , bool inIsActivating )
 
 #if !TARGET_CARBON
 
 
 #if !TARGET_CARBON
 

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

 {
 }
 
 {
 }
 


@@ -745,15 +831,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)


@@ -762,7 +840,7 @@ bool wxTopLevelWindowMac::Show(bool show)
         return FALSE;
 
     if (show)
         return FALSE;
 
     if (show)

-    { 
+    {

       ::TransitionWindow((WindowRef)m_macWindow,kWindowZoomTransitionEffect,kWindowShowTransitionAction,nil);
       ::SelectWindow( (WindowRef)m_macWindow ) ;
       // no need to generate events here, they will get them triggered by macos
       ::TransitionWindow((WindowRef)m_macWindow,kWindowZoomTransitionEffect,kWindowShowTransitionAction,nil);
       ::SelectWindow( (WindowRef)m_macWindow ) ;
       // no need to generate events here, they will get them triggered by macos


@@ -782,7 +860,7 @@ bool wxTopLevelWindowMac::Show(bool show)
     }
     else
     {
     }
     else
     {

-        Refresh() ; 
+        Refresh() ;

     }
 
     return TRUE;
     }
 
     return TRUE;


@@ -794,24 +872,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;
-  
-    if ((m_minWidth != -1) && (actualWidth < m_minWidth)) 
+
+    int actualWidth = width;
+    int actualHeight = height;
+    int actualX = x;
+    int actualY = y;
+
+    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 ;


@@ -830,17 +908,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 ;


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

-    
+

 }
 
 /*
 }
 
 /*


@@ -878,59 +956,63 @@ 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 ) 
-{
-  GrafPtr formerPort ;
-  GetPort( &formerPort ) ;
-  SetPortWindowPort( (WindowRef)m_macWindow ) ;
-  
-  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
-      
-    RgnHandle       updateRgn = NewRgn();    
-    RgnHandle       diffRgn = NewRgn() ;
-    if ( updateRgn && diffRgn )
+
+void wxTopLevelWindowMac::MacInvalidate( const WXRECTPTR rect, bool eraseBackground )
+{
+    GrafPtr formerPort ;
+    GetPort( &formerPort ) ;
+    SetPortWindowPort( (WindowRef)m_macWindow ) ;
+
+    m_macNeedsErasing |= eraseBackground ;
+
+    // if we already know that we will have to erase, there's no need to track the rest
+    if ( !m_macNeedsErasing)

     {
     {

-        GetWindowUpdateRgn( (WindowRef)m_macWindow , updateRgn );
-        Point pt = {0,0} ;
-        LocalToGlobal( &pt ) ;
-        OffsetRgn( updateRgn , -pt.h , -pt.v ) ;
-        DiffRgn( updateRgn , (RgnHandle) m_macNoEraseUpdateRgn , diffRgn ) ;
-        if ( !EmptyRgn( diffRgn ) )
+        // 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       diffRgn = NewRgn() ;
+        if ( updateRgn && diffRgn )

         {
         {

-            m_macNeedsErasing = true ;
+            GetWindowUpdateRgn( (WindowRef)m_macWindow , updateRgn );
+            Point pt = {0,0} ;
+            LocalToGlobal( &pt ) ;
+            OffsetRgn( updateRgn , -pt.h , -pt.v ) ;
+            DiffRgn( updateRgn , (RgnHandle) m_macNoEraseUpdateRgn , diffRgn ) ;
+            if ( !EmptyRgn( diffRgn ) )
+            {
+                m_macNeedsErasing = true ;
+            }

         }
         }

-    }
-    if ( updateRgn )
-        DisposeRgn( updateRgn );
-    if ( diffRgn )
-        DisposeRgn( diffRgn );
+        if ( updateRgn )
+            DisposeRgn( updateRgn );
+        if ( diffRgn )
+            DisposeRgn( diffRgn );

 
 

-    if ( !m_macNeedsErasing )
-    {
-      RgnHandle rectRgn = NewRgn() ;
-      SetRectRgn( rectRgn , ((Rect*)rect)->left , ((Rect*)rect)->top , ((Rect*)rect)->right , ((Rect*)rect)->bottom ) ;
-      UnionRgn( (RgnHandle) m_macNoEraseUpdateRgn , rectRgn , (RgnHandle) m_macNoEraseUpdateRgn ) ;
-      DisposeRgn( rectRgn ) ;
+        if ( !m_macNeedsErasing )
+        {
+            RgnHandle rectRgn = NewRgn() ;
+            SetRectRgn( rectRgn , ((Rect*)rect)->left , ((Rect*)rect)->top , ((Rect*)rect)->right , ((Rect*)rect)->bottom ) ;
+            UnionRgn( (RgnHandle) m_macNoEraseUpdateRgn , rectRgn , (RgnHandle) m_macNoEraseUpdateRgn ) ;
+            DisposeRgn( rectRgn ) ;
+        }

     }
     }

-  }
-  InvalWindowRect( (WindowRef)m_macWindow , (Rect*)rect ) ;
-  // turn this on to debug the refreshing cycle
+    InvalWindowRect( (WindowRef)m_macWindow , (Rect*)rect ) ;
+    // turn this on to debug the refreshing cycle

 #if wxMAC_DEBUG_REDRAW
 #if wxMAC_DEBUG_REDRAW

-  PaintRect( rect ) ;
+    PaintRect( rect ) ;

 #endif
 #endif

-  SetPort( formerPort ) ;
+    SetPort( formerPort ) ;

 }
 
 }
 

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