Fix building wxSTC as a DLL using MinGW GCC 3.x.

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

diff --git a/src/mac/toplevel.cpp b/src/mac/toplevel.cpp
index 34db5c2604c57c1639328d483fa4de4f93ee2318..a6a9882aea62cb2af5920324d19995571c8c0e55 100644 (file)
--- a/src/mac/toplevel.cpp
+++ b/src/mac/toplevel.cpp
@@ -111,7 +111,6 @@ static pascal OSStatus TextInputEventHandler( EventHandlerCallRef handler , Even
     UInt32 keyCode ;
     UInt32 modifiers ;
     Point point ;
     UInt32 keyCode ;
     UInt32 modifiers ;
     Point point ;

-    UInt32 when = EventTimeToTicks( GetEventTime( event ) ) ;

 
     EventRef rawEvent ;
 
 
     EventRef rawEvent ;
 


@@ -123,16 +122,32 @@ static pascal OSStatus TextInputEventHandler( EventHandlerCallRef handler , Even
     GetEventParameter( rawEvent, kEventParamMouseLocation, typeQDPoint, NULL,
         sizeof( Point ), NULL, &point );
 
     GetEventParameter( rawEvent, kEventParamMouseLocation, typeQDPoint, NULL,
         sizeof( Point ), NULL, &point );
 

-    UInt32 message = (keyCode << 8) + charCode;
-

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

+            // this is only called when no default handler has jumped in, eg a wxControl on a floater window does not
+            // get its own kEventTextInputUnicodeForKeyEvent, so we route back the
+            wxControl* control = wxDynamicCast( focus , wxControl ) ;
+            if ( control )
+            {
+                ControlHandle macControl = (ControlHandle) control->GetMacControl() ;
+                if ( macControl )
+                {
+                    ::HandleControlKey( macControl , keyCode , charCode , modifiers ) ;
+                    result = noErr ;
+                }
+            }
+            /*
+            // this may lead to double events sent to a window in case all handlers have skipped the key down event
+            UInt32 when = EventTimeToTicks( GetEventTime( event ) ) ;
+            UInt32 message = (keyCode << 8) + charCode;
+

             if ( (focus != NULL) && wxTheApp->MacSendKeyDownEvent(
                 focus , message , modifiers , when , point.h , point.v ) )
             {
                 result = noErr ;
             }
             if ( (focus != NULL) && wxTheApp->MacSendKeyDownEvent(
                 focus , message , modifiers , when , point.h , point.v ) )
             {
                 result = noErr ;
             }

+            */

             break ;
     }
 
             break ;
     }
 


@@ -161,10 +176,16 @@ static pascal OSStatus KeyboardEventHandler( EventHandlerCallRef handler , Event
     {
         case kEventRawKeyRepeat :
         case kEventRawKeyDown :
     {
         case kEventRawKeyRepeat :
         case kEventRawKeyDown :

-            if ( (focus != NULL) && wxTheApp->MacSendKeyDownEvent(
-                focus , message , modifiers , when , point.h , point.v ) )

             {
             {

-                result = noErr ;
+                WXEVENTREF formerEvent = wxTheApp->MacGetCurrentEvent() ;
+                WXEVENTHANDLERCALLREF formerHandler = wxTheApp->MacGetCurrentEventHandlerCallRef() ;
+                wxTheApp->MacSetCurrentEvent( event , handler ) ;
+                if ( (focus != NULL) && wxTheApp->MacSendKeyDownEvent(
+                    focus , message , modifiers , when , point.h , point.v ) )
+                {
+                    result = noErr ;
+                }
+                wxTheApp->MacSetCurrentEvent( formerEvent , formerHandler ) ;

             }
             break ;
         case kEventRawKeyUp :
             }
             break ;
         case kEventRawKeyUp :


@@ -207,6 +228,12 @@ static pascal OSStatus KeyboardEventHandler( EventHandlerCallRef handler , Event
                     event.SetEventType( ( modifiers & optionKey ) ? wxEVT_KEY_DOWN : wxEVT_KEY_UP ) ;
                     focus->GetEventHandler()->ProcessEvent( event ) ;
                 }
                     event.SetEventType( ( modifiers & optionKey ) ? wxEVT_KEY_DOWN : wxEVT_KEY_UP ) ;
                     focus->GetEventHandler()->ProcessEvent( event ) ;
                 }

+                if ( focus && (modifiers ^ wxTheApp->s_lastModifiers ) & cmdKey )
+                {
+                    event.m_keyCode = WXK_COMMAND ;
+                    event.SetEventType( ( modifiers & cmdKey ) ? wxEVT_KEY_DOWN : wxEVT_KEY_UP ) ;
+                    focus->GetEventHandler()->ProcessEvent( event ) ;
+                }

                 wxTheApp->s_lastModifiers = modifiers ;
             }
              break ;
                 wxTheApp->s_lastModifiers = modifiers ;
             }
              break ;


@@ -317,6 +344,43 @@ static pascal OSStatus WindowEventHandler( EventHandlerCallRef handler , EventRe
                 result = noErr;
             }
             break ;
                 result = noErr;
             }
             break ;

+        case kEventWindowBoundsChanging :
+            err = GetEventParameter( event, kEventParamAttributes, typeUInt32,
+                        NULL, sizeof( UInt32 ), NULL, &attributes );
+            if ( err == noErr )
+            {
+                Rect newContentRect ;
+
+                GetEventParameter( event, kEventParamCurrentBounds, typeQDRectangle, NULL,
+                    sizeof( newContentRect ), NULL, &newContentRect );
+
+                wxRect contentRect(newContentRect.left , newContentRect.top ,
+                    newContentRect.right - newContentRect.left ,
+                    newContentRect.bottom - newContentRect.top) ;
+
+                bool handled = false ;
+                if ((attributes & kWindowBoundsChangeSizeChanged) != 0)
+                {
+                    wxSizeEvent event(contentRect , toplevelWindow->GetId());
+                    event.SetEventObject(toplevelWindow);
+                    handled = toplevelWindow->GetEventHandler()->ProcessEvent(event);
+                    contentRect = event.GetRect() ;
+                }
+                else if ( attributes & kWindowBoundsChangeOriginChanged != 0)
+                {
+                    wxMoveEvent event(contentRect , toplevelWindow->GetId());
+                    event.SetEventObject(toplevelWindow);
+                    handled = toplevelWindow->GetEventHandler()->ProcessEvent(event);
+                    contentRect = event.GetRect() ;
+                }
+                if ( handled )
+                {
+                    SetRect( &newContentRect , contentRect.GetLeft() , contentRect.GetTop() , contentRect.GetRight() , contentRect.GetBottom() ) ;
+                    SetEventParameter( event, kEventParamCurrentBounds, typeQDRectangle, sizeof( newContentRect ), &newContentRect );
+                }
+                result = noErr ;
+            }
+            break ;

         default :
             break ;
     }
         default :
             break ;
     }


@@ -349,64 +413,6 @@ pascal OSStatus wxMacWindowEventHandler( EventHandlerCallRef handler , EventRef
 
 DEFINE_ONE_SHOT_HANDLER_GETTER( wxMacWindowEventHandler )
 
 
 DEFINE_ONE_SHOT_HANDLER_GETTER( wxMacWindowEventHandler )
 

-// Patch 531199 defined a window event handler, as follows.
-// TODO: merge the moving/sizing event handling with the event
-// handler above.
-#if 0
-static pascal OSStatus
-WindowHandler( EventHandlerCallRef inHandler, EventRef inEvent, void* userData )
-{
-    Rect               bounds;
-    SInt16             height, width;
-    UInt32             attributes;
-    OSStatus   result = eventNotHandledErr;
-    
-    GetEventParameter( inEvent, kEventParamAttributes, typeUInt32, NULL, sizeof( UInt32 ), NULL, &attributes );
-    
-    if ((attributes & (kWindowBoundsChangeSizeChanged | kWindowBoundsChangeOriginChanged)) != 0)
-    {
-        // Extract the current bounds. This is the paramter you get to modify to
-        // alter the window position or size during a window resizing.
-        GetEventParameter( inEvent, kEventParamCurrentBounds, typeQDRectangle, NULL, sizeof( bounds ), NULL, &bounds );
-        
-        wxRect rect;
-        rect.SetLeft(bounds.left);
-        rect.SetTop(bounds.top);
-        rect.SetRight(bounds.right);
-        rect.SetBottom(bounds.bottom);
-        
-        bool rc;
-        wxWindowMac *pWindow = (wxWindowMac*)userData;
-        if ((attributes & kWindowBoundsChangeSizeChanged) != 0) {
-            wxSizeEvent event(rect, pWindow->GetId());
-            event.SetEventObject(pWindow);
-            rc = pWindow->GetEventHandler()->ProcessEvent(event);
-            rect = event.GetRect();
-        }
-        else {
-            wxMoveEvent event(rect, pWindow->GetId());
-            event.SetEventObject(pWindow);
-            rc = pWindow->GetEventHandler()->ProcessEvent(event);
-            rect = event.GetRect();
-        }
-        
-        if (rc) {
-            bounds.left = rect.GetLeft();
-            bounds.top = rect.GetTop();
-            bounds.right = rect.GetRight();
-            bounds.bottom = rect.GetBottom();
-        }
-        
-        // Set the current bounds parameter to our adjusted bounds. Return
-        // noErr to indicate we handled this event.
-        SetEventParameter( inEvent, kEventParamCurrentBounds, typeQDRectangle, sizeof( bounds ), &bounds );
-        result = noErr;
-    }
-    return result;
-}
-#endif
-    // WindowHandler
-

 #endif
 
 // ---------------------------------------------------------------------------
 #endif
 
 // ---------------------------------------------------------------------------


@@ -445,6 +451,7 @@ void wxRemoveMacWindowAssociation(wxTopLevelWindowMac *win)
 // ----------------------------------------------------------------------------
 
 WXHWND wxTopLevelWindowMac::s_macWindowInUpdate = NULL;
 // ----------------------------------------------------------------------------
 
 WXHWND wxTopLevelWindowMac::s_macWindowInUpdate = NULL;

+wxTopLevelWindowMac *wxTopLevelWindowMac::s_macDeactivateWindow = NULL;

 
 void wxTopLevelWindowMac::Init()
 {
 
 void wxTopLevelWindowMac::Init()
 {


@@ -529,23 +536,35 @@ wxTopLevelWindowMac::~wxTopLevelWindowMac()
 
 void wxTopLevelWindowMac::Maximize(bool maximize)
 {
 
 void wxTopLevelWindowMac::Maximize(bool maximize)
 {

-    // not available on mac
+    ZoomWindow( (WindowRef)m_macWindow , maximize ? inZoomOut : inZoomIn , false ) ;
+
+    Rect tempRect ;
+    GrafPtr port ;
+    GetPort( &port ) ;
+    Point pt = { 0, 0 } ;
+    SetPortWindowPort((WindowRef)m_macWindow) ;
+    LocalToGlobal( &pt ) ;
+    SetPort( port ) ;
+
+    GetWindowPortBounds((WindowRef)m_macWindow, &tempRect ) ;
+    SetSize( pt.h , pt.v , tempRect.right-tempRect.left ,
+        tempRect.bottom-tempRect.top, wxSIZE_USE_EXISTING);

 }
 
 bool wxTopLevelWindowMac::IsMaximized() const
 {
 }
 
 bool wxTopLevelWindowMac::IsMaximized() const
 {

-    return false ;
+    return IsWindowInStandardState(  (WindowRef)m_macWindow , NULL , NULL ) ;

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

-    // not available on mac
+    if ( IsWindowCollapsable((WindowRef)m_macWindow) )
+        CollapseWindow((WindowRef)m_macWindow , iconize ) ;

 }
 
 bool wxTopLevelWindowMac::IsIconized() const
 {
 }
 
 bool wxTopLevelWindowMac::IsIconized() const
 {

-    // mac dialogs cannot be iconized
-    return FALSE;
+    return IsWindowCollapsed((WindowRef)m_macWindow ) ;

 }
 
 void wxTopLevelWindowMac::Restore()
 }
 
 void wxTopLevelWindowMac::Restore()


@@ -569,6 +588,7 @@ void  wxTopLevelWindowMac::MacCreateRealWindow( const wxString& title,
            long style,
            const wxString& name )
 {
            long style,
            const wxString& name )
 {

+    OSStatus err = noErr ;

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


@@ -628,7 +648,7 @@ void  wxTopLevelWindowMac::MacCreateRealWindow( const wxString& title,
     else
     {
         if ( HasFlag( wxMINIMIZE_BOX ) || HasFlag( wxMAXIMIZE_BOX ) ||
     else
     {
         if ( HasFlag( wxMINIMIZE_BOX ) || HasFlag( wxMAXIMIZE_BOX ) ||

-            HasFlag( wxSYSTEM_MENU ) )
+            HasFlag( wxCLOSE_BOX ) || HasFlag( wxSYSTEM_MENU ) )

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


@@ -642,16 +662,19 @@ void  wxTopLevelWindowMac::MacCreateRealWindow( const wxString& title,
         }
     }
 
         }
     }
 

-    if ( HasFlag( wxMINIMIZE_BOX ) || HasFlag( wxMAXIMIZE_BOX ) )
+    if ( HasFlag( wxMINIMIZE_BOX ) )

     {
     {

-        attr |= kWindowFullZoomAttribute ;

         attr |= kWindowCollapseBoxAttribute ;
     }
         attr |= kWindowCollapseBoxAttribute ;
     }

+    if ( HasFlag( wxMAXIMIZE_BOX ) )
+    {
+        attr |= kWindowFullZoomAttribute ;
+    }

     if ( HasFlag( wxRESIZE_BORDER ) )
     {
         attr |= kWindowResizableAttribute ;
     }
     if ( HasFlag( wxRESIZE_BORDER ) )
     {
         attr |= kWindowResizableAttribute ;
     }

-    if ( HasFlag( wxSYSTEM_MENU ) )
+    if ( HasFlag( wxCLOSE_BOX) )

     {
         attr |= kWindowCloseBoxAttribute ;
     }
     {
         attr |= kWindowCloseBoxAttribute ;
     }


@@ -670,34 +693,24 @@ void  wxTopLevelWindowMac::MacCreateRealWindow( const wxString& title,
         customWindowDefSpec.defType = kWindowDefProcPtr;
         customWindowDefSpec.u.defProc = NewWindowDefUPP(wxShapedMacWindowDef);
 
         customWindowDefSpec.defType = kWindowDefProcPtr;
         customWindowDefSpec.u.defProc = NewWindowDefUPP(wxShapedMacWindowDef);
 

-        ::CreateCustomWindow( &customWindowDefSpec, wclass,
+        err = ::CreateCustomWindow( &customWindowDefSpec, wclass,

                               attr, &theBoundsRect,
                               (WindowRef*) &m_macWindow);
     }
     else
 #endif
     {
                               attr, &theBoundsRect,
                               (WindowRef*) &m_macWindow);
     }
     else
 #endif
     {

-        ::CreateNewWindow( wclass , attr , &theBoundsRect , (WindowRef*)&m_macWindow ) ;
+        err = ::CreateNewWindow( wclass , attr , &theBoundsRect , (WindowRef*)&m_macWindow ) ;

     }
 
     }
 

+    wxCHECK_RET( err == noErr, wxT("Mac OS error when trying to create new window") );

     wxAssociateWinWithMacWindow( m_macWindow , this ) ;
     UMASetWTitle( (WindowRef)m_macWindow , title ) ;
     ::CreateRootControl( (WindowRef)m_macWindow , (ControlHandle*)&m_macRootControl ) ;
 #if TARGET_CARBON
     InstallStandardEventHandler( GetWindowEventTarget(MAC_WXHWND(m_macWindow)) ) ;
     InstallWindowEventHandler(MAC_WXHWND(m_macWindow), GetwxMacWindowEventHandlerUPP(),
     wxAssociateWinWithMacWindow( m_macWindow , this ) ;
     UMASetWTitle( (WindowRef)m_macWindow , title ) ;
     ::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));
-
-    // Patch 531199 also defined a window event handler, as follows:
-#if 0
-    // install a window event handler to send wxEVT_MOVING and wxEVT_SIZING events
-    EventTypeSpec events[] = { { kEventClassWindow, kEventWindowBoundsChanging } };
-    EventHandlerUPP    handlerProc = NewEventHandlerUPP( WindowHandler );
-    EventHandlerRef eventHandlerRef;
-    InstallWindowEventHandler( m_macWindowData->m_macWindow, handlerProc, GetEventTypeCount(events),
-        events, (void*)this, &eventHandlerRef);
-#endif
-
+        GetEventTypeCount(eventList), eventList, this, (EventHandlerRef *)&m_macEventHandler);

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


@@ -724,9 +737,9 @@ void wxTopLevelWindowMac::MacGetPortParams(WXPOINTPTR localOrigin, WXRECTPTR cli
     *rootwin = this ;
 }
 
     *rootwin = this ;
 }
 

-void wxTopLevelWindowMac::Clear()
+void wxTopLevelWindowMac::ClearBackground()

 {
 {

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

 }
 
 WXWidget wxTopLevelWindowMac::MacGetContainerForEmbedding()
 }
 
 WXWidget wxTopLevelWindowMac::MacGetContainerForEmbedding()


@@ -777,7 +790,7 @@ void wxTopLevelWindowMac::MacUpdate( long timestamp)
         DisposeRgn( diffRgn );
     if ( visRgn )
         DisposeRgn( visRgn ) ;
         DisposeRgn( diffRgn );
     if ( visRgn )
         DisposeRgn( visRgn ) ;

-        
+

     EndUpdate( (WindowRef)m_macWindow ) ;
     SetEmptyRgn( (RgnHandle) m_macNoEraseUpdateRgn ) ;
     m_macNeedsErasing = false ;
     EndUpdate( (WindowRef)m_macWindow ) ;
     SetEmptyRgn( (RgnHandle) m_macNoEraseUpdateRgn ) ;
     m_macNeedsErasing = false ;


@@ -844,7 +857,7 @@ void wxTopLevelWindowMac::MacFireMouseEvent(
 
     if ( kind == mouseDown )
     {
 
     if ( kind == mouseDown )
     {

-        if ( timestamp - gs_lastWhen <= GetDblTime() )
+        if ( timestamp - gs_lastWhen <= (long) GetDblTime() )

         {
             if ( abs( localwhere.h - gs_lastWhere.h ) < 3 && abs( localwhere.v - gs_lastWhere.v ) < 3 )
             {
         {
             if ( abs( localwhere.h - gs_lastWhere.h ) < 3 && abs( localwhere.v - gs_lastWhere.v ) < 3 )
             {


@@ -933,8 +946,22 @@ void wxTopLevelWindowMac::MacMouseMoved( WXEVENTREF ev , short part)
 
 #endif
 
 
 #endif
 

+void wxTopLevelWindowMac::MacDelayedDeactivation(long timestamp)
+{
+    if(s_macDeactivateWindow)
+    {
+        wxLogDebug(wxT("Doing delayed deactivation of %p"),s_macDeactivateWindow);
+        s_macDeactivateWindow->MacActivate(timestamp, false);
+    }
+}
+

 void wxTopLevelWindowMac::MacActivate( long timestamp , bool inIsActivating )
 {
 void wxTopLevelWindowMac::MacActivate( long timestamp , bool inIsActivating )
 {

+    // wxLogDebug(wxT("TopLevel=%p::MacActivate"),this);
+
+    if(s_macDeactivateWindow==this)
+        s_macDeactivateWindow=NULL;
+    MacDelayedDeactivation(timestamp);

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