Changeset 16691 in vbox for trunk/src/VBox/Frontends/VirtualBox/include/VBoxConsoleView.h

Timestamp:

Feb 11, 2009 7:33:19 PM (16 years ago)

Author:

vboxsync

Message:

Qt: keyboard input in the console.

File:

• trunk/src/VBox/Frontends/VirtualBox/include/VBoxConsoleView.h (modified) (2 diffs)

trunk/src/VBox/Frontends/VirtualBox/include/VBoxConsoleView.h

@@ -164 +164 @@
     bool x11Event (XEvent *event);
 #elif defined(Q_WS_MAC)
-# ifndef QT_MAC_USE_COCOA
     bool darwinKeyboardEvent (EventRef inEvent);
-# endif
     void darwinGrabKeyboardEvents (bool fGrab);
 #endif
@@ -319 +317 @@
     static LRESULT CALLBACK lowLevelKeyboardProc (int nCode,
                                                   WPARAM wParam, LPARAM lParam);
-#elif defined (Q_WS_MAC) && !defined (QT_MAC_USE_COCOA)
+#elif defined (Q_WS_MAC)
+# if defined (QT_MAC_USE_COCOA)
+    static bool darwinEventHandlerProc (const void *pvCocoaEvent, const
+                                        void *pvCarbonEvent, void *pvUser);
+# elif !defined (VBOX_WITH_HACKED_QT)
     EventHandlerRef mDarwinWindowOverlayHandlerRef;
-# ifndef VBOX_WITH_HACKED_QT
     static pascal OSStatus darwinEventHandlerProc (EventHandlerCallRef inHandlerCallRef,
                                                    EventRef inEvent, void *inUserData);