Warning fix.

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

diff --git a/src/mac/carbon/toplevel.cpp b/src/mac/carbon/toplevel.cpp
index 12f31a9e932e6ce1de88ff895ee3c75ef3745224..c4cd59574e1a60448f864b90916b226643c7ea43 100644 (file)
--- a/src/mac/carbon/toplevel.cpp
+++ b/src/mac/carbon/toplevel.cpp
@@ -87,8 +87,6 @@ static const EventTypeSpec eventList[] =
 {
     // TODO: remove control related event like key and mouse (except for WindowLeave events)
 #if 1
-    { kEventClassTextInput, kEventTextInputUnicodeForKeyEvent } ,
-
     { kEventClassKeyboard, kEventRawKeyDown } ,
     { kEventClassKeyboard, kEventRawKeyRepeat } ,
     { kEventClassKeyboard, kEventRawKeyUp } ,
@@ -112,62 +110,6 @@ static const EventTypeSpec eventList[] =
     { kEventClassMouse , kEventMouseDragged } ,
 } ;
 
-static pascal OSStatus TextInputEventHandler( EventHandlerCallRef handler , EventRef event , void *data )
-{
-    OSStatus result = eventNotHandledErr ;
-    wxWindow* focus ;
-    UInt32 keyCode, modifiers ;
-    Point point ;
-    EventRef rawEvent ;
-    unsigned char charCode ;
-
-    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 );
-
-    focus = wxWindow::FindFocus() ;
-
-    switch ( GetEventKind( event ) )
-    {
-        case kEventTextInputUnicodeForKeyEvent :
-            {
-                // this is only called when no default handler has jumped in, e.g. a wxControl on a floater window does not
-                // get its own kEventTextInputUnicodeForKeyEvent, so we reroute the event back to the control
-                wxControl* control = wxDynamicCast( focus , wxControl ) ;
-                if ( control )
-                {
-                    ControlRef macControl = (ControlRef) control->GetHandle() ;
-                    if ( macControl )
-                    {
-                        ::HandleControlKey( macControl , keyCode , charCode , modifiers ) ;
-                        result = noErr ;
-                    }
-                }
-
-#if 0
-                // 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 ;
-                }
-#endif
-            }
-            break ;
-
-        default:
-            break ;
-    }
-
-    return result ;
-}
-
 static pascal OSStatus KeyboardEventHandler( EventHandlerCallRef handler , EventRef event , void *data )
 {
     OSStatus result = eventNotHandledErr ;
@@ -555,6 +497,10 @@ pascal OSStatus wxMacTopLevelMouseEventHandler( EventHandlerCallRef handler , Ev
 #endif
                 }
             }
+
+            // disabled windows must not get any input messages
+            if ( currentMouseWindow && !currentMouseWindow->MacIsReallyEnabled() )
+                currentMouseWindow = NULL;
         }
     }
 
@@ -619,9 +565,7 @@ pascal OSStatus wxMacTopLevelMouseEventHandler( EventHandlerCallRef handler , Ev
         // make tooltips current
 
 #if wxUSE_TOOLTIPS
-        if ( wxevent.GetEventType() == wxEVT_MOTION
-            || wxevent.GetEventType() == wxEVT_ENTER_WINDOW
-            || wxevent.GetEventType() == wxEVT_LEAVE_WINDOW )
+        if ( wxevent.GetEventType() == wxEVT_MOTION )
             wxToolTip::RelayEvent( currentMouseWindow , wxevent );
 #endif
 
@@ -696,8 +640,8 @@ pascal OSStatus wxMacTopLevelMouseEventHandler( EventHandlerCallRef handler , Ev
                 cursorPoint += cursorTarget->GetPosition();
         }
 
-    } // else if ( currentMouseWindow )
-    else
+    }
+    else // currentMouseWindow == NULL
     {
         // don't mess with controls we don't know about
         // for some reason returning eventNotHandledErr does not lead to the correct behaviour
@@ -706,17 +650,17 @@ pascal OSStatus wxMacTopLevelMouseEventHandler( EventHandlerCallRef handler , Ev
         {
             EventModifiers modifiers = cEvent.GetParameter<EventModifiers>(kEventParamKeyModifiers, typeUInt32) ;
             Point clickLocation = windowMouseLocation ;
+#if TARGET_API_MAC_OSX
             if ( toplevelWindow->MacUsesCompositing() )
             {
-#ifdef __WXMAC_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
             }
+#endif // TARGET_API_MAC_OSX
 
             HandleControlClick( control , clickLocation , modifiers , (ControlActionUPP ) -1 ) ;
             result = noErr ;
@@ -781,12 +725,7 @@ static pascal OSStatus wxMacTopLevelWindowEventHandler( EventHandlerCallRef hand
                 wxFrame *frame = wxDynamicCast( toplevelWindow , wxFrame ) ;
                 if ( frame )
                 {
-#if wxUSE_STATUSBAR
-                    frame->PositionStatusBar();
-#endif
-#if wxUSE_TOOLBAR
-                    frame->PositionToolBar();
-#endif
+                    frame->PositionBars();
                 }
 
                 wxSizeEvent event( r.GetSize() , toplevelWindow->GetId() ) ;
@@ -866,10 +805,6 @@ pascal OSStatus wxMacTopLevelEventHandler( EventHandlerCallRef handler , EventRe
             result = KeyboardEventHandler( handler, event , data ) ;
             break ;
 
-        case kEventClassTextInput :
-            result = TextInputEventHandler( handler, event , data ) ;
-            break ;
-
         case kEventClassWindow :
             result = wxMacTopLevelWindowEventHandler( handler, event , data ) ;
             break ;
@@ -1446,14 +1381,14 @@ bool wxTopLevelWindowMac::ShowFullScreen(bool show, long style)
         }
 
         SetSize( x , y , w, h ) ;
-        if( data->m_wasResizable )
+        if ( data->m_wasResizable )
             MacChangeWindowAttributes( kWindowNoAttributes , kWindowResizableAttribute ) ;
     }
     else
     {
         ShowMenuBar() ;
         FullScreenData *data = (FullScreenData *) m_macFullScreenData ;
-        if( data->m_wasResizable )
+        if ( data->m_wasResizable )
             MacChangeWindowAttributes( kWindowResizableAttribute ,  kWindowNoAttributes ) ;
         SetPosition( data->m_position ) ;
         SetSize( data->m_size ) ;