Changeset 16610 in vbox for trunk/src/VBox/Frontends/VirtualBox/include

Timestamp:

Feb 10, 2009 12:32:12 AM (16 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

42576

Message:

Qt/Cocoa: Subclass NSApplication to catch keyboard events passing thru -[NSApplication sendEvent:(NSEvent *)theEvent]. Adopted QIHotKeyEdit to make use of this.

File:

• trunk/src/VBox/Frontends/VirtualBox/include/QIHotKeyEdit.h (modified) (3 diffs)

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

@@ -28 +28 @@
 #include <QMap>
 #endif
-#if defined (Q_WS_MAC) && !defined (QT_MAC_USE_COCOA)
+#if defined (Q_WS_MAC)
 # include <Carbon/Carbon.h>
 #endif
@@ -82 +82 @@
 #elif defined (Q_WS_X11)
     bool x11Event (XEvent *event);
-#elif defined (Q_WS_MAC) && !defined (QT_MAC_USE_COCOA)
-    static pascal OSStatus darwinEventHandlerProc (EventHandlerCallRef inHandlerCallRef,
-                                                   EventRef inEvent, void *inUserData);
+#elif defined (Q_WS_MAC)
+# ifdef QT_MAC_USE_COCOA
+    static bool darwinEventHandlerProc (const void *pvCocoaEvent, const void *pvCarbonEvent, void *pvUser);
+# else
+    static pascal OSStatus darwinEventHandlerProc (EventHandlerCallRef inHandlerCallRef, EventRef inEvent, void *inUserData);
+# endif
     bool darwinKeyboardEvent (EventRef inEvent);
 #endif
@@ -106 +109 @@
 #endif
 
-#if defined (Q_WS_MAC) && !defined (QT_MAC_USE_COCOA)
+#if defined (Q_WS_MAC)
+# ifndef QT_MAC_USE_COCOA
     /** Event handler reference. NULL if the handler isn't installed. */
     EventHandlerRef mDarwinEventHandlerRef;
+# endif
     /** The current modifier key mask. Used to figure out which modifier
      *  key was pressed when we get a kEventRawKeyModifiersChanged event. */