A little clarification

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

diff --git a/src/mac/toplevel.cpp b/src/mac/toplevel.cpp
index 8e4a9551c5f90cb7fce2cde8130dacbaabc42cc9..190bcd89465e2479cb5b0084f977f66dd1dad4be 100644 (file)
--- a/src/mac/toplevel.cpp
+++ b/src/mac/toplevel.cpp
@@ -97,6 +97,7 @@ static const EventTypeSpec eventList[] =
 
     { kEventClassMouse , kEventMouseDown } ,
     { kEventClassMouse , kEventMouseUp } ,
 
     { kEventClassMouse , kEventMouseDown } ,
     { kEventClassMouse , kEventMouseUp } ,

+    { kEventClassMouse , kEventMouseWheelMoved } ,

     { kEventClassMouse , kEventMouseMoved } ,
     { kEventClassMouse , kEventMouseDragged } ,
 
     { kEventClassMouse , kEventMouseMoved } ,
     { kEventClassMouse , kEventMouseDragged } ,
 


@@ -126,7 +127,7 @@ static pascal OSStatus TextInputEventHandler( EventHandlerCallRef handler , Even
     {
         case kEventTextInputUnicodeForKeyEvent :
             // this is only called when no default handler has jumped in, eg a wxControl on a floater window does not
     {
         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 
+            // get its own kEventTextInputUnicodeForKeyEvent, so we route back the

             wxControl* control = wxDynamicCast( focus , wxControl ) ;
             if ( control )
             {
             wxControl* control = wxDynamicCast( focus , wxControl ) ;
             if ( control )
             {


@@ -176,10 +177,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 :


@@ -222,6 +229,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 ;


@@ -230,7 +243,7 @@ static pascal OSStatus KeyboardEventHandler( EventHandlerCallRef handler , Event
     return result ;
 }
 
     return result ;
 }
 

-static pascal OSStatus MouseEventHandler( EventHandlerCallRef handler , EventRef event , void *data )
+pascal OSStatus MouseEventHandler( EventHandlerCallRef handler , EventRef event , void *data )

 {
     OSStatus result = eventNotHandledErr ;
 
 {
     OSStatus result = eventNotHandledErr ;
 


@@ -252,10 +265,18 @@ static pascal OSStatus MouseEventHandler( EventHandlerCallRef handler , EventRef
     if ( button == 0 || GetEventKind( event ) == kEventMouseUp )
         modifiers += btnState ;
 
     if ( button == 0 || GetEventKind( event ) == kEventMouseUp )
         modifiers += btnState ;
 

+       // temporary hack to support true two button mouse
+       if ( button == kEventMouseButtonSecondary )
+       {
+               modifiers |= controlKey ;
+       }

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

-    if ( IsWindowActive(window) && windowPart == inContent )
+    // either we really are active or we are capturing mouse events
+
+    if ( (IsWindowActive(window) && windowPart == inContent) || 
+        (wxTheApp->s_captureWindow && wxTheApp->s_captureWindow->MacGetTopLevelWindow() == toplevelWindow) )

     {
         switch ( GetEventKind( event ) )
         {
     {
         switch ( GetEventKind( event ) )
         {


@@ -268,13 +289,46 @@ static pascal OSStatus MouseEventHandler( EventHandlerCallRef handler , EventRef
                 result = noErr ;
                 break ;
             case kEventMouseMoved :
                 result = noErr ;
                 break ;
             case kEventMouseMoved :

-                toplevelWindow->MacFireMouseEvent( nullEvent , point.h , point.v , modifiers , EventTimeToTicks( GetEventTime( event ) ) ) ;
+                wxTheApp->MacHandleMouseMovedEvent( 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 ;
                 result = noErr ;
                 break ;
             case kEventMouseDragged :
                 toplevelWindow->MacFireMouseEvent( nullEvent , point.h , point.v , modifiers , EventTimeToTicks( GetEventTime( event ) ) ) ;
                 result = noErr ;
                 break ;

+            case kEventMouseWheelMoved :
+                {
+                    //bClearTooltip = false;
+                    EventMouseWheelAxis axis = kEventMouseWheelAxisY;
+                    SInt32 delta = 0;
+                    Point mouseLoc = {0, 0};
+                    if (::GetEventParameter(event, kEventParamMouseWheelAxis, typeMouseWheelAxis,
+                                        NULL, sizeof(EventMouseWheelAxis), NULL, &axis) == noErr &&
+                        ::GetEventParameter(event, kEventParamMouseWheelDelta, typeLongInteger,
+                                        NULL, sizeof(SInt32), NULL, &delta) == noErr &&
+                        ::GetEventParameter(event, kEventParamMouseLocation, typeQDPoint,
+                                        NULL, sizeof(Point), NULL, &mouseLoc) == noErr)
+                    {
+                        wxMouseEvent wheelEvent(wxEVT_MOUSEWHEEL);
+                       
+                        wheelEvent.m_x = mouseLoc.h;
+                        wheelEvent.m_y = mouseLoc.v;
+                       
+                        wheelEvent.m_wheelRotation = delta;
+                        wheelEvent.m_wheelDelta = 1;
+                        wheelEvent.m_linesPerAction = 1;
+
+                        wxWindow* currentMouseWindow = NULL;
+                        wxWindow::MacGetWindowFromPoint(wxPoint(mouseLoc.h, mouseLoc.v), &currentMouseWindow);
+                       
+                        if (currentMouseWindow)
+                        {
+                            currentMouseWindow->GetEventHandler()->ProcessEvent(wheelEvent);
+                            result = noErr;
+                        }
+                    }
+                }
+                break ;

             default :
                 break ;
         }
             default :
                 break ;
         }


@@ -341,31 +395,28 @@ 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 );

-                    
-                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 )
+
+                wxSize formerSize = toplevelWindow->GetSize() ;
+
+                if ( (attributes & kWindowBoundsChangeSizeChanged ) || 
+                    ( attributes & kWindowBoundsChangeOriginChanged ) )
+                    toplevelWindow->SetSize( newContentRect.left , newContentRect.top ,
+                        newContentRect.right - newContentRect.left ,
+                        newContentRect.bottom - newContentRect.top, wxSIZE_USE_EXISTING);
+    
+                int x , y , w , h ;
+                toplevelWindow->GetPosition( &x , &y ) ;
+                toplevelWindow->GetSize( &w , &h ) ;
+                Rect adjustedRect  = { y , x , y + h , x + w } ;
+
+                if ( !EqualRect( &newContentRect , &adjustedRect ) )

                 {
                 {

-                    SetRect( &newContentRect , contentRect.GetLeft() , contentRect.GetTop() , contentRect.GetRight() , contentRect.GetBottom() ) ;
-                    SetEventParameter( event, kEventParamCurrentBounds, typeQDRectangle, sizeof( newContentRect ), &newContentRect );
+                    SetEventParameter( event , kEventParamCurrentBounds , typeQDRectangle, sizeof( adjustedRect ) , &adjustedRect ) ;

                 }
                 }

+                
+                if ( toplevelWindow->GetSize() != formerSize )
+                    toplevelWindow->Update() ;
+        

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


@@ -412,6 +463,8 @@ DEFINE_ONE_SHOT_HANDLER_GETTER( wxMacWindowEventHandler )
 wxList *wxWinMacWindowList = NULL;
 wxTopLevelWindowMac *wxFindWinFromMacWindow(WXWindow inWindowRef)
 {
 wxList *wxWinMacWindowList = NULL;
 wxTopLevelWindowMac *wxFindWinFromMacWindow(WXWindow inWindowRef)
 {

+    if ( wxWinMacWindowList == NULL )
+        return NULL ;

     wxNode *node = wxWinMacWindowList->Find((long)inWindowRef);
     if (!node)
         return NULL;
     wxNode *node = wxWinMacWindowList->Find((long)inWindowRef);
     if (!node)
         return NULL;


@@ -524,23 +577,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()


@@ -713,9 +778,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()


@@ -766,7 +831,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 ;


@@ -926,14 +991,15 @@ void wxTopLevelWindowMac::MacDelayedDeactivation(long timestamp)
 {
     if(s_macDeactivateWindow)
     {
 {
     if(s_macDeactivateWindow)
     {

-        wxLogDebug("Doing delayed deactivation of %p",s_macDeactivateWindow);
+        wxLogDebug(wxT("Doing delayed deactivation of %p"),s_macDeactivateWindow);

         s_macDeactivateWindow->MacActivate(timestamp, false);
     }
 }
 
 void wxTopLevelWindowMac::MacActivate( long timestamp , bool inIsActivating )
 {
         s_macDeactivateWindow->MacActivate(timestamp, false);
     }
 }
 
 void wxTopLevelWindowMac::MacActivate( long timestamp , bool inIsActivating )
 {

-    wxLogDebug("TopLevel=%p::MacActivate",this);
+    // wxLogDebug(wxT("TopLevel=%p::MacActivate"),this);
+

     if(s_macDeactivateWindow==this)
         s_macDeactivateWindow=NULL;
     MacDelayedDeactivation(timestamp);
     if(s_macDeactivateWindow==this)
         s_macDeactivateWindow=NULL;
     MacDelayedDeactivation(timestamp);


@@ -1043,27 +1109,32 @@ void wxTopLevelWindowMac::DoMoveWindow(int x, int y, int width, int height)
     {
         m_x = actualX ;
         m_y = actualY ;
     {
         m_x = actualX ;
         m_y = actualY ;

-        m_width = actualWidth ;
-        m_height = actualHeight ;

 
         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
 

+        m_width = actualWidth ;
+        m_height = actualHeight ;
+

         if ( doResize )
             ::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 )
             ::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) )
+        if ( doResize && HasFlag(wxFULL_REPAINT_ON_RESIZE) )

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

+#if wxUSE_STATUSBAR

             frame->PositionStatusBar();
             frame->PositionStatusBar();

+#endif            
+#if wxUSE_TOOLBAR

             frame->PositionToolBar();
             frame->PositionToolBar();

+#endif            

         }
         if ( doMove )
             wxWindowMac::MacTopLevelWindowChangedPosition() ; // like this only children will be notified
         }
         if ( doMove )
             wxWindowMac::MacTopLevelWindowChangedPosition() ; // like this only children will be notified