Changeset 16471 in vbox

Timestamp:

Feb 2, 2009 5:32:06 PM (16 years ago)

Author:

vboxsync

Message:

QIHotKeyEdit: darwin/amd64 fixes.

File:

• trunk/src/VBox/Frontends/VirtualBox/src/QIHotKeyEdit.cpp (modified) (6 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/QIHotKeyEdit.cpp

@@ -69 +69 @@
 
 #ifdef Q_WS_MAC
-#include "DarwinKeyboard.h"
+# include "DarwinKeyboard.h"
+# include <Carbon/Carbon.h>
 #endif
 
@@ -132 +133 @@
 
 #ifdef Q_WS_MAC
+# ifdef QT_MAC_USE_COCOA
+/** @todo Carbon -> Cocoa */
+# else  /* !QT_MAC_USE_COCOA */
     mDarwinKeyModifiers = GetCurrentEventKeyModifiers();
 
@@ -150 +154 @@
                                       this, &mDarwinEventHandlerRef);
     ::DisposeEventHandlerUPP (eventHandler);
+# endif /* !QT_MAC_USE_COCOA */
     ::DarwinGrabKeyboard (false /* just modifiers */);
 #endif
@@ -158 +163 @@
 #ifdef Q_WS_MAC
     ::DarwinReleaseKeyboard();
+# ifdef QT_MAC_USE_COCOA
+    /** @todo Carbon -> Cocoa */
+# else
     ::RemoveEventHandler (mDarwinEventHandlerRef);
     mDarwinEventHandlerRef = NULL;
+# endif
 #endif
 }
@@ -657 +666 @@
 
 #elif defined (Q_WS_MAC)
+# ifdef QT_MAC_USE_COCOA
+/** @todo Carbon -> Cocoa */
+# else /* !QT_MAC_USE_COCOA */
 
 /* static */
@@ -713 +725 @@
     return false;
 }
+# endif /* !QT_MAC_USE_COCOA */
 
 #else