Enable UpdateUI events in wxTaskBarIcon.

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

diff --git a/src/mac/carbon/toplevel.cpp b/src/mac/carbon/toplevel.cpp
index 1b89824fa736e6e8d931ef07aacd49a88f25c7b7..1fbb44d100ce2dffced576fff61a249b5bb87fcc 100644 (file)
--- a/src/mac/carbon/toplevel.cpp
+++ b/src/mac/carbon/toplevel.cpp
@@ -49,6 +49,9 @@
 
 #include <ToolUtils.h>
 
 
 #include <ToolUtils.h>
 

+//For targeting OSX
+#include "wx/mac/private.h"
+

 // ----------------------------------------------------------------------------
 // globals
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // globals
 // ----------------------------------------------------------------------------


@@ -156,8 +159,9 @@ static pascal OSStatus TextInputEventHandler( EventHandlerCallRef handler , Even
 static pascal OSStatus KeyboardEventHandler( EventHandlerCallRef handler , EventRef event , void *data )
 {
     OSStatus result = eventNotHandledErr ;
 static pascal OSStatus KeyboardEventHandler( EventHandlerCallRef handler , EventRef event , void *data )
 {
     OSStatus result = eventNotHandledErr ;

-
-    wxWindow* focus = wxWindow::FindFocus() ;
+    // call DoFindFocus instead of FindFocus, because for Composite Windows(like WxGenericListCtrl)
+    // FindFocus does not return the actual focus window,but the enclosing window
+    wxWindow* focus = wxWindow::DoFindFocus();

     if ( focus == NULL )
         return result ;
         
     if ( focus == NULL )
         return result ;
         


@@ -208,8 +212,7 @@ static pascal OSStatus KeyboardEventHandler( EventHandlerCallRef handler , Event
 
                 event.m_x = point.h;
                 event.m_y = point.v;
 
                 event.m_x = point.h;
                 event.m_y = point.v;

-                event.m_timeStamp = when;
-                wxWindow* focus = wxWindow::FindFocus() ;
+                event.SetTimestamp(when);

                 event.SetEventObject(focus);
 
                 if ( focus && (modifiers ^ wxTheApp->s_lastModifiers ) & controlKey )
                 event.SetEventObject(focus);
 
                 if ( focus && (modifiers ^ wxTheApp->s_lastModifiers ) & controlKey )


@@ -306,29 +309,39 @@ static void SetupMouseEvent( wxMouseEvent &wxevent , wxMacCarbonEvent &cEvent )
                 break ;
         }
     }
                 break ;
         }
     }

-    // determinate the correct click button
-    if ( button == kEventMouseButtonSecondary )
-    {
-        if (cEvent.GetKind() == kEventMouseDown )
-            wxevent.SetEventType( clickCount > 1 ? wxEVT_RIGHT_DCLICK : wxEVT_RIGHT_DOWN ) ;
-        else if ( cEvent.GetKind() == kEventMouseUp )
-            wxevent.SetEventType(wxEVT_RIGHT_UP ) ;
-    }
-    else if ( button == kEventMouseButtonTertiary )
+    // translate into wx types
+    switch ( cEvent.GetKind() )

     {
     {

-        if (cEvent.GetKind() == kEventMouseDown )
-            wxevent.SetEventType(clickCount > 1 ? wxEVT_MIDDLE_DCLICK : wxEVT_MIDDLE_DOWN ) ;
-        else if ( cEvent.GetKind() == kEventMouseUp )
-            wxevent.SetEventType(wxEVT_MIDDLE_UP ) ;
-    }
-    else
-    {
-        if (cEvent.GetKind() == kEventMouseDown )
-            wxevent.SetEventType(clickCount > 1 ? wxEVT_LEFT_DCLICK : wxEVT_LEFT_DOWN ) ;
-        else if ( cEvent.GetKind() == kEventMouseUp )
-            wxevent.SetEventType(wxEVT_LEFT_UP ) ;
-        else if ( cEvent.GetKind() == kEventMouseWheelMoved )
-        {
+        case kEventMouseDown :
+            switch( button )
+            {
+                case kEventMouseButtonPrimary :
+                    wxevent.SetEventType(clickCount > 1 ? wxEVT_LEFT_DCLICK : wxEVT_LEFT_DOWN )  ;
+                    break ;
+                case kEventMouseButtonSecondary :
+                    wxevent.SetEventType( clickCount > 1 ? wxEVT_RIGHT_DCLICK : wxEVT_RIGHT_DOWN ) ;
+                    break ;
+                case kEventMouseButtonTertiary :
+                    wxevent.SetEventType(clickCount > 1 ? wxEVT_MIDDLE_DCLICK : wxEVT_MIDDLE_DOWN ) ;
+                    break ;
+            }
+            break ;
+        case kEventMouseUp :
+            switch( button )
+            {
+                case kEventMouseButtonPrimary :
+                    wxevent.SetEventType( wxEVT_LEFT_UP )  ;
+                    break ;
+                case kEventMouseButtonSecondary :
+                    wxevent.SetEventType( wxEVT_RIGHT_UP ) ;
+                    break ;
+                case kEventMouseButtonTertiary :
+                    wxevent.SetEventType( wxEVT_MIDDLE_UP ) ;
+                    break ;
+            }
+            break ;
+     case kEventMouseWheelMoved :
+         {

             wxevent.SetEventType(wxEVT_MOUSEWHEEL ) ;
 
             // EventMouseWheelAxis axis = cEvent.GetParameter<EventMouseWheelAxis>(kEventParamMouseWheelAxis, typeMouseWheelAxis) ;
             wxevent.SetEventType(wxEVT_MOUSEWHEEL ) ;
 
             // EventMouseWheelAxis axis = cEvent.GetParameter<EventMouseWheelAxis>(kEventParamMouseWheelAxis, typeMouseWheelAxis) ;


@@ -337,10 +350,12 @@ static void SetupMouseEvent( wxMouseEvent &wxevent , wxMacCarbonEvent &cEvent )
             wxevent.m_wheelRotation = delta;
             wxevent.m_wheelDelta = 1;
             wxevent.m_linesPerAction = 1;
             wxevent.m_wheelRotation = delta;
             wxevent.m_wheelDelta = 1;
             wxevent.m_linesPerAction = 1;

-        }
-        else
+            break ;
+         }
+        default :

             wxevent.SetEventType(wxEVT_MOTION ) ;
             wxevent.SetEventType(wxEVT_MOTION ) ;

-    }
+            break ;
+    }       

 }
 
 ControlRef wxMacFindSubControl( Point location , ControlRef superControl , ControlPartCode *outPart )
 }
 
 ControlRef wxMacFindSubControl( Point location , ControlRef superControl , ControlPartCode *outPart )


@@ -412,7 +427,8 @@ pascal OSStatus wxMacTopLevelMouseEventHandler( EventHandlerCallRef handler , Ev
     short windowPart = ::FindWindow(screenMouseLocation, &window);
 
     wxWindow* currentMouseWindow = NULL ;
     short windowPart = ::FindWindow(screenMouseLocation, &window);
 
     wxWindow* currentMouseWindow = NULL ;

-
+    ControlRef control = NULL ;
+    

     if ( window )
     {
         QDGlobalToLocalPoint( UMAGetWindowPort(window ) ,  &windowMouseLocation ) ;
     if ( window )
     {
         QDGlobalToLocalPoint( UMAGetWindowPort(window ) ,  &windowMouseLocation ) ;


@@ -424,14 +440,27 @@ pascal OSStatus wxMacTopLevelMouseEventHandler( EventHandlerCallRef handler , Ev
         else if ( (IsWindowActive(window) && windowPart == inContent) )
         {
             ControlPartCode part ;
         else if ( (IsWindowActive(window) && windowPart == inContent) )
         {
             ControlPartCode part ;

-            ControlRef control = wxMacFindControlUnderMouse( windowMouseLocation , window , &part ) ;
+            control = wxMacFindControlUnderMouse( windowMouseLocation , window , &part ) ;
+            // if there is no control below the mouse position, send the event to the toplevel window itself

             if ( control == 0 )
                 currentMouseWindow = (wxWindow*) data ;
             else
             if ( control == 0 )
                 currentMouseWindow = (wxWindow*) data ;
             else

+            {

                 currentMouseWindow = wxFindControlFromMacControl( control ) ;
                 currentMouseWindow = wxFindControlFromMacControl( control ) ;

+                if ( currentMouseWindow == NULL && cEvent.GetKind() == kEventMouseMoved )
+                {
+                       // for wxToolBar to function we have to send certaint events to it
+                       // instead of its children (wxToolBarTools)     
+                    ControlRef parent ;
+                    GetSuperControl(control, &parent );
+                    wxWindow *wxParent = wxFindControlFromMacControl( parent ) ;
+                    if ( wxParent && wxParent->IsKindOf( CLASSINFO( wxToolBar ) ) )
+                        currentMouseWindow = wxParent ;
+                }
+            }

         }        
     }
         }        
     }

-
+    

     wxMouseEvent wxevent(wxEVT_LEFT_DOWN);
     SetupMouseEvent( wxevent , cEvent ) ;
 
     wxMouseEvent wxevent(wxEVT_LEFT_DOWN);
     SetupMouseEvent( wxevent , cEvent ) ;
 


@@ -476,31 +505,12 @@ pascal OSStatus wxMacTopLevelMouseEventHandler( EventHandlerCallRef handler , Ev
     } // if ( windowPart == inMenuBar )
     else if ( currentMouseWindow )
     {
     } // if ( windowPart == inMenuBar )
     else if ( currentMouseWindow )
     {

+        wxWindow *currentMouseWindowParent = currentMouseWindow->GetParent();
+

         currentMouseWindow->ScreenToClient( &wxevent.m_x , &wxevent.m_y ) ;
         
         wxevent.SetEventObject( currentMouseWindow ) ;
 
         currentMouseWindow->ScreenToClient( &wxevent.m_x , &wxevent.m_y ) ;
         
         wxevent.SetEventObject( currentMouseWindow ) ;
 

-        // update cursor
-        
-        wxWindow* cursorTarget = currentMouseWindow ;
-        wxPoint cursorPoint( wxevent.m_x , wxevent.m_y ) ;
-
-        while( cursorTarget && !cursorTarget->MacSetupCursor( cursorPoint ) )
-        {
-            cursorTarget = cursorTarget->GetParent() ;
-            if ( cursorTarget )
-                cursorPoint += cursorTarget->GetPosition() ;
-        }
-
-        // update focus
-
-        if ( wxevent.GetEventType() == wxEVT_LEFT_DOWN )
-        {
-            // set focus to this window
-            if (currentMouseWindow->AcceptsFocus() && wxWindow::FindFocus()!=currentMouseWindow)
-                currentMouseWindow->SetFocus();
-        }
-

         // make tooltips current
         
     #if wxUSE_TOOLTIPS
         // make tooltips current
         
     #if wxUSE_TOOLTIPS


@@ -510,9 +520,24 @@ pascal OSStatus wxMacTopLevelMouseEventHandler( EventHandlerCallRef handler , Ev
             wxToolTip::RelayEvent( currentMouseWindow , wxevent);
     #endif // wxUSE_TOOLTIPS                
         if ( currentMouseWindow->GetEventHandler()->ProcessEvent(wxevent) )
             wxToolTip::RelayEvent( currentMouseWindow , wxevent);
     #endif // wxUSE_TOOLTIPS                
         if ( currentMouseWindow->GetEventHandler()->ProcessEvent(wxevent) )

+        {
+            if ((currentMouseWindowParent != NULL) && 
+                (currentMouseWindowParent->GetChildren().Find(currentMouseWindow) == NULL))
+                currentMouseWindow = NULL;
+                

             result = noErr;
             result = noErr;

+        }

         else
         {
         else
         {

+            // if the user code did _not_ handle the event, then perform the
+            // default processing
+            if ( wxevent.GetEventType() == wxEVT_LEFT_DOWN )
+            {
+                // ... that is set focus to this window
+                if (currentMouseWindow->AcceptsFocus() && wxWindow::FindFocus()!=currentMouseWindow)
+                    currentMouseWindow->SetFocus();
+            }
+

             ControlPartCode dummyPart ;
             // if built-in find control is finding the wrong control (ie static box instead of overlaid
             // button, we cannot let the standard handler do its job, but must handle manually
             ControlPartCode dummyPart ;
             // if built-in find control is finding the wrong control (ie static box instead of overlaid
             // button, we cannot let the standard handler do its job, but must handle manually


@@ -521,13 +546,20 @@ pascal OSStatus wxMacTopLevelMouseEventHandler( EventHandlerCallRef handler , Ev
                 (FindControlUnderMouse(windowMouseLocation , window , &dummyPart) != 
                 wxMacFindControlUnderMouse( windowMouseLocation , window , &dummyPart ) ) )
             {
                 (FindControlUnderMouse(windowMouseLocation , window , &dummyPart) != 
                 wxMacFindControlUnderMouse( windowMouseLocation , window , &dummyPart ) ) )
             {

-                EventModifiers modifiers = cEvent.GetParameter<EventModifiers>(kEventParamKeyModifiers, typeUInt32) ;
-                Point clickLocation = windowMouseLocation ;
-#if TARGET_API_MAC_OSX
-                currentMouseWindow->MacRootWindowToWindow( &clickLocation.h , &clickLocation.v ) ;
-#endif
-                HandleControlClick( (ControlRef) currentMouseWindow->GetHandle() , clickLocation ,
-                    modifiers , (ControlActionUPP ) -1 ) ;
+                if ( currentMouseWindow->MacIsReallyEnabled() ) 
+                {
+                    EventModifiers modifiers = cEvent.GetParameter<EventModifiers>(kEventParamKeyModifiers, typeUInt32) ;
+                    Point clickLocation = windowMouseLocation ;
+    #if TARGET_API_MAC_OSX
+                    currentMouseWindow->MacRootWindowToWindow( &clickLocation.h , &clickLocation.v ) ;
+    #endif
+                    HandleControlClick( (ControlRef) currentMouseWindow->GetHandle() , clickLocation ,
+                        modifiers , (ControlActionUPP ) -1 ) ;
+                        
+                    if ((currentMouseWindowParent != NULL) && 
+                        (currentMouseWindowParent->GetChildren().Find(currentMouseWindow) == NULL))
+                        currentMouseWindow = NULL;
+                }

                 result = noErr ;
             }
         }
                 result = noErr ;
             }
         }


@@ -536,7 +568,43 @@ pascal OSStatus wxMacTopLevelMouseEventHandler( EventHandlerCallRef handler , Ev
             wxTheApp->s_captureWindow = NULL ;
             // update cursor ?
          }
             wxTheApp->s_captureWindow = NULL ;
             // update cursor ?
          }

+
+        // update cursor
+        
+        wxWindow* cursorTarget = currentMouseWindow ;
+        wxPoint cursorPoint( wxevent.m_x , wxevent.m_y ) ;
+
+        while( cursorTarget && !cursorTarget->MacSetupCursor( cursorPoint ) )
+        {
+            cursorTarget = cursorTarget->GetParent() ;
+            if ( cursorTarget )
+                cursorPoint += cursorTarget->GetPosition();
+        }
+

     } // else if ( currentMouseWindow )
     } // else if ( currentMouseWindow )

+    else
+    {
+        // don't mess with controls we don't know about
+        // for some reason returning eventNotHandledErr does not lead to the correct behaviour
+        // so we try sending them the correct control directly
+        wxTopLevelWindowMac* toplevelWindow = (wxTopLevelWindowMac*) data ;
+        if ( cEvent.GetKind() == kEventMouseDown && toplevelWindow && control )
+        {
+            EventModifiers modifiers = cEvent.GetParameter<EventModifiers>(kEventParamKeyModifiers, typeUInt32) ;
+            Point clickLocation = windowMouseLocation ;
+#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
+            HandleControlClick( control , clickLocation ,
+                modifiers , (ControlActionUPP ) -1 ) ;
+            result = noErr ;
+        }
+    }

     return result ;
 }
 
     return result ;
 }
 


@@ -686,6 +754,7 @@ DEFINE_ONE_SHOT_HANDLER_GETTER( wxMacTopLevelEventHandler )
 
 // Find an item given the Macintosh Window Reference
 
 
 // Find an item given the Macintosh Window Reference
 

+#if KEY_wxList_DEPRECATED

 wxList wxWinMacWindowList(wxKEY_INTEGER);
 wxTopLevelWindowMac *wxFindWinFromMacWindow(WindowRef inWindowRef)
 {
 wxList wxWinMacWindowList(wxKEY_INTEGER);
 wxTopLevelWindowMac *wxFindWinFromMacWindow(WindowRef inWindowRef)
 {


@@ -711,7 +780,43 @@ void wxRemoveMacWindowAssociation(wxTopLevelWindowMac *win)
 {
     wxWinMacWindowList.DeleteObject(win);
 }
 {
     wxWinMacWindowList.DeleteObject(win);
 }

+#else
+
+WX_DECLARE_HASH_MAP(WindowRef, wxTopLevelWindowMac*, wxPointerHash, wxPointerEqual, MacWindowMap);
+
+static MacWindowMap wxWinMacWindowList;

 
 

+wxTopLevelWindowMac *wxFindWinFromMacWindow(WindowRef inWindowRef)
+{
+    MacWindowMap::iterator node = wxWinMacWindowList.find(inWindowRef);
+
+    return (node == wxWinMacWindowList.end()) ? NULL : node->second;
+}
+
+void wxAssociateWinWithMacWindow(WindowRef inWindowRef, wxTopLevelWindowMac *win) ;
+void wxAssociateWinWithMacWindow(WindowRef inWindowRef, wxTopLevelWindowMac *win)
+{
+    // adding NULL WindowRef is (first) surely a result of an error and
+    // nothing else :-)
+    wxCHECK_RET( inWindowRef != (WindowRef) NULL, wxT("attempt to add a NULL WindowRef to window list") );
+
+    wxWinMacWindowList[inWindowRef] = win;
+}
+
+void wxRemoveMacWindowAssociation(wxTopLevelWindowMac *win) ;
+void wxRemoveMacWindowAssociation(wxTopLevelWindowMac *win)
+{
+    MacWindowMap::iterator it;
+    for ( it = wxWinMacWindowList.begin(); it != wxWinMacWindowList.end(); ++it )
+    {
+        if ( it->second == win )
+        {
+            wxWinMacWindowList.erase(it);
+            break;
+        }
+    }
+}
+#endif // deprecated wxList

 
 // ----------------------------------------------------------------------------
 // wxTopLevelWindowMac creation
 
 // ----------------------------------------------------------------------------
 // wxTopLevelWindowMac creation


@@ -719,6 +824,12 @@ void wxRemoveMacWindowAssociation(wxTopLevelWindowMac *win)
 
 wxTopLevelWindowMac *wxTopLevelWindowMac::s_macDeactivateWindow = NULL;
 
 
 wxTopLevelWindowMac *wxTopLevelWindowMac::s_macDeactivateWindow = NULL;
 

+typedef struct 
+{
+    wxPoint m_position ;
+    wxSize m_size ;  
+} FullScreenData ;
+

 void wxTopLevelWindowMac::Init()
 {
     m_iconized =
 void wxTopLevelWindowMac::Init()
 {
     m_iconized =


@@ -730,6 +841,7 @@ void wxTopLevelWindowMac::Init()
     m_macUsesCompositing = FALSE;
 #endif
     m_macEventHandler = NULL ;
     m_macUsesCompositing = FALSE;
 #endif
     m_macEventHandler = NULL ;

+    m_macFullScreenData = NULL ;

 }
 
 class wxMacDeferredWindowDeleter : public wxObject
 }
 
 class wxMacDeferredWindowDeleter : public wxObject


@@ -763,6 +875,7 @@ bool wxTopLevelWindowMac::Create(wxWindow *parent,
     SetName(name);
 
     m_windowId = id == -1 ? NewControlId() : id;
     SetName(name);
 
     m_windowId = id == -1 ? NewControlId() : id;

+    wxWindow::SetTitle( title ) ;

 
     MacCreateRealWindow( title, pos , size , MacRemoveBordersFromStyle(style) , name ) ;
 
 
     MacCreateRealWindow( title, pos , size , MacRemoveBordersFromStyle(style) , name ) ;
 


@@ -794,6 +907,10 @@ wxTopLevelWindowMac::~wxTopLevelWindowMac()
 
     if ( wxModelessWindows.Find(this) )
         wxModelessWindows.DeleteObject(this);
 
     if ( wxModelessWindows.Find(this) )
         wxModelessWindows.DeleteObject(this);

+        
+    FullScreenData *data = (FullScreenData *) m_macFullScreenData ;
+    delete data ;
+    m_macFullScreenData = NULL ;

 }
 
 
 }
 
 


@@ -881,10 +998,14 @@ void  wxTopLevelWindowMac::MacCreateRealWindow( const wxString& title,
 
     int x = (int)pos.x;
     int y = (int)pos.y;
 
     int x = (int)pos.x;
     int y = (int)pos.y;

-    if ( y < 50 )
-        y = 50 ;
-    if ( x < 20 )
-        x = 20 ;
+    
+    wxRect display = wxGetClientDisplayRect() ;
+
+    if ( x == wxDefaultPosition.x )
+        x = display.x ;
+    
+    if ( y == wxDefaultPosition.y )
+        y = display.y ;

 
     int w = WidthDefault(size.x);
     int h = HeightDefault(size.y);
 
     int w = WidthDefault(size.x);
     int h = HeightDefault(size.y);


@@ -895,6 +1016,7 @@ void  wxTopLevelWindowMac::MacCreateRealWindow( const wxString& title,
 
     WindowClass wclass = 0;
     WindowAttributes attr = kWindowNoAttributes ;
 
     WindowClass wclass = 0;
     WindowAttributes attr = kWindowNoAttributes ;

+    WindowGroupRef group = NULL ;

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


@@ -919,6 +1041,16 @@ void  wxTopLevelWindowMac::MacCreateRealWindow( const wxString& title,
     {
         wclass = kDocumentWindowClass ;
     }
     {
         wclass = kDocumentWindowClass ;
     }

+#if defined( __WXMAC__ ) && TARGET_API_MAC_OSX && ( MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_2 )
+    else if ( HasFlag( wxFRAME_DRAWER ) )
+    {
+        wclass = kDrawerWindowClass;
+        // Should this be left for compositing check below?
+        // CreateNewWindow will fail without it, should wxDrawerWindow turn
+        // on compositing before calling MacCreateRealWindow?
+        attr |= kWindowCompositingAttribute;// | kWindowStandardHandlerAttribute;
+    }
+#endif  //10.2 and up

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


@@ -955,8 +1087,10 @@ void  wxTopLevelWindowMac::MacCreateRealWindow( const wxString& title,
         attr |= kWindowLiveResizeAttribute;
     }
 
         attr |= kWindowLiveResizeAttribute;
     }
 

-    if (HasFlag(wxSTAY_ON_TOP))
-        wclass = kUtilityWindowClass;
+    if ( HasFlag(wxSTAY_ON_TOP) )
+    {
+        group = GetWindowGroupOfClass(kUtilityWindowClass) ;
+    }

 
 #if TARGET_API_MAC_OSX 
     attr |= kWindowCompositingAttribute;
 
 #if TARGET_API_MAC_OSX 
     attr |= kWindowCompositingAttribute;


@@ -977,6 +1111,9 @@ void  wxTopLevelWindowMac::MacCreateRealWindow( const wxString& title,
         err = ::CreateNewWindow( wclass , attr , &theBoundsRect , (WindowRef*)&m_macWindow ) ;
     }
 
         err = ::CreateNewWindow( wclass , attr , &theBoundsRect , (WindowRef*)&m_macWindow ) ;
     }
 

+    if ( err == noErr && m_macWindow != NULL && group != NULL )
+        SetWindowGroup( (WindowRef) m_macWindow , group ) ;
+

     wxCHECK_RET( err == noErr, wxT("Mac OS error when trying to create new window") );
 
     // the create commands are only for content rect, so we have to set the size again as
     wxCHECK_RET( err == noErr, wxT("Mac OS error when trying to create new window") );
 
     // the create commands are only for content rect, so we have to set the size again as


@@ -990,17 +1127,17 @@ void  wxTopLevelWindowMac::MacCreateRealWindow( const wxString& title,
     // 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 explicitely
     HIViewFindByID( HIViewGetRoot( (WindowRef) m_macWindow ) , kHIViewWindowContentID , 
     // 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 explicitely
     HIViewFindByID( HIViewGetRoot( (WindowRef) m_macWindow ) , kHIViewWindowContentID , 

-        *m_peer ) ;
+        m_peer->GetControlRefAddr() ) ;

     if ( !m_peer->Ok() )
     {
         // compatibility mode fallback
     if ( !m_peer->Ok() )
     {
         // compatibility mode fallback

-        GetRootControl( (WindowRef) m_macWindow , *m_peer ) ;
+        GetRootControl( (WindowRef) m_macWindow , m_peer->GetControlRefAddr() ) ;

     }
 #else
     }
 #else

-    ::CreateRootControl( (WindowRef)m_macWindow , *m_peer ) ;
+    ::CreateRootControl( (WindowRef)m_macWindow , m_peer->GetControlRefAddr() ) ;

 #endif
     // the root control level handleer
 #endif
     // the root control level handleer

-    MacInstallEventHandler() ;
+    MacInstallEventHandler( (WXWidget) m_peer->GetControlRef() ) ;

 
     // the frame window event handler
     InstallStandardEventHandler( GetWindowEventTarget(MAC_WXHWND(m_macWindow)) ) ;
 
     // the frame window event handler
     InstallStandardEventHandler( GetWindowEventTarget(MAC_WXHWND(m_macWindow)) ) ;


@@ -1104,6 +1241,72 @@ bool wxTopLevelWindowMac::Show(bool show)
     return TRUE ;
 }
 
     return TRUE ;
 }
 

+bool wxTopLevelWindowMac::ShowFullScreen(bool show, long style)
+{    
+    if ( show )
+    {
+        FullScreenData *data = (FullScreenData *)m_macFullScreenData ;
+        delete data ;
+        data = new FullScreenData() ;
+        
+        m_macFullScreenData = data ;
+        data->m_position = GetPosition() ;
+        data->m_size = GetSize() ;
+        
+        if ( style & wxFULLSCREEN_NOMENUBAR )
+        {
+                HideMenuBar() ;
+        }
+        int left , top , right , bottom ;
+        wxRect client = wxGetClientDisplayRect() ;
+
+        int x, y, w, h ;
+        
+        x = client.x ;
+        y = client.y ;
+        w = client.width ;
+        h = client.height ;
+        
+        MacGetContentAreaInset( left , top , right , bottom ) ;
+
+        if ( style & wxFULLSCREEN_NOCAPTION )
+        {
+            y -= top ;
+            h += top ;
+        }
+        if ( style & wxFULLSCREEN_NOBORDER )
+        {
+            x -= left ;
+            w += left + right ;
+            h += bottom ;
+        }
+        if ( style & wxFULLSCREEN_NOTOOLBAR )
+        {
+            // TODO
+        }
+        if ( style & wxFULLSCREEN_NOSTATUSBAR )
+        {
+            // TODO
+        }
+        SetSize( x , y , w, h ) ;
+    }
+    else
+    {
+        ShowMenuBar() ;
+        FullScreenData *data = (FullScreenData *) m_macFullScreenData ;
+        SetPosition( data->m_position ) ;
+        SetSize( data->m_size ) ;
+        delete data ;
+        m_macFullScreenData = NULL ;
+    }
+    return FALSE; 
+}
+
+bool wxTopLevelWindowMac::IsFullScreen() const 
+{ 
+    return m_macFullScreenData != NULL ; 
+}
+

 // 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 )
 // 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 )


@@ -1182,6 +1385,31 @@ wxUint32 wxTopLevelWindowMac::MacGetWindowAttributes() const
     return attr ;
 }
 
     return attr ;
 }
 

+// Attracts the users attention to this window if the application is
+// inactive (should be called when a background event occurs)
+
+static pascal void wxMacNMResponse( NMRecPtr ptr )
+{
+    NMRemove( ptr ) ;
+    DisposePtr( (Ptr) ptr ) ;
+}
+
+
+void wxTopLevelWindowMac::RequestUserAttention(int flags )
+{
+    NMRecPtr notificationRequest = (NMRecPtr) NewPtr( sizeof( NMRec) ) ;
+    static wxMacNMUPP nmupp( wxMacNMResponse )
+     ;
+    memset( notificationRequest , 0 , sizeof(*notificationRequest) ) ;
+    notificationRequest->qType = nmType ;
+    notificationRequest->nmMark = 1 ;
+    notificationRequest->nmIcon = 0 ;
+    notificationRequest->nmSound = 0 ;
+    notificationRequest->nmStr = NULL ;
+    notificationRequest->nmResp = nmupp ;
+    verify_noerr( NMInstall( notificationRequest ) ) ;
+}
+

 // ---------------------------------------------------------------------------
 // Shape implementation
 // ---------------------------------------------------------------------------
 // ---------------------------------------------------------------------------
 // Shape implementation
 // ---------------------------------------------------------------------------


@@ -1250,7 +1478,7 @@ static SInt32 wxShapedMacWindowGetFeatures(WindowRef window, SInt32 param)
                         kWindowCanDrawInCurrentPort|
                         //kWindowCanMeasureTitle|
                         kWindowWantsDisposeAtProcessDeath|
                         kWindowCanDrawInCurrentPort|
                         //kWindowCanMeasureTitle|
                         kWindowWantsDisposeAtProcessDeath|

-                        kWindowSupportsSetGrowImageRegion|
+                        kWindowSupportsGetGrowImageRegion|

                         kWindowDefSupportsColorGrafPort;
     return 1;
 }
                         kWindowDefSupportsColorGrafPort;
     return 1;
 }