Changeset 16469 in vbox for trunk/src/VBox/Frontends/VirtualBox/include/VBoxConsoleWnd.h

Timestamp:

Feb 2, 2009 5:21:58 PM (16 years ago)

Author:

vboxsync

Message:

Qt4Gui: Carbon -> Coca; make it build. (darwin/amd64)

File:

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

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

@@ -41 +41 @@
 #endif
 #ifdef Q_WS_MAC
-# undef PAGE_SIZE
-# undef PAGE_SHIFT
-# include <Carbon/Carbon.h>
+# ifdef QT_MAC_USE_COCOA
+    /** @todo Carbon -> Cocoa */
+# else
+#  undef PAGE_SIZE
+#  undef PAGE_SHIFT
+#  include <Carbon/Carbon.h>
+# endif
 #endif
 
@@ -356 +360 @@
 #ifdef Q_WS_MAC
     QRegion mCurrRegion;
+# ifndef QT_MAC_USE_COCOA
+    /** @todo Carbon -> Cocoa */
+#else
+# else
     EventHandlerRef mDarwinRegionEventHandlerRef;
+# endif
 #endif
 
@@ -386 +395 @@
     QRect mNormalGeometry;
     Qt::WindowFlags mSavedFlags;
+# ifdef QT_MAC_USE_COCOA
+    /** @todo Carbon -> Cocoa */
+# else
     /* For the fade effect if the the window goes fullscreen */
     CGDisplayFadeReservationToken mFadeToken;
+# endif
 #endif
 };