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

Timestamp:

Feb 26, 2009 4:09:24 PM (16 years ago)

Author:

vboxsync

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

43448

Message:

FE/Qt4: Quartz2D should be available for 64bit & Cocoa also. See what the 64bit build machine thinks about that.

Location:

trunk/src/VBox/Frontends/VirtualBox/include

Files:

• VBoxDockIconPreview.h (modified) (4 diffs)
• VBoxUtils-darwin.h (modified) (2 diffs)

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

@@ -27 +27 @@
 
 #ifdef QT_MAC_USE_COCOA
+# include <ApplicationServices/ApplicationServices.h>
 /** @todo include chocolatey headers... */
 #else
@@ -44 +45 @@
 
     void updateDockOverlay();
-#ifndef QT_MAC_USE_COCOA
+//#ifndef QT_MAC_USE_COCOA
     void updateDockPreview (CGImageRef aVMImage);
-#endif
+//#endif
     void updateDockPreview (VBoxFrameBuffer *aFrameBuffer);
 
 private:
-#ifdef QT_MAC_USE_COCOA
+//#ifdef QT_MAC_USE_COCOA
     /** @todo Carbon -> Cocoa */
-#else
+//#else
     inline void initPreviewImages();
     inline void initOverlayData (int aBitmapByteCount);
@@ -67 +68 @@
         return aRect;
     }
-#endif /* !QT_MAC_USE_COCOA */
+//#endif /* !QT_MAC_USE_COCOA */
 
     /* Private member vars */
     VBoxConsoleWnd *mMainWnd;
-#ifdef QT_MAC_USE_COCOA
+//#ifdef QT_MAC_USE_COCOA
     /** @todo Carbon -> Cocoa */
-#else
+//#else
     const CGRect mDockIconRect;
 
@@ -88 +89 @@
     CGRect mUpdateRect;
     CGRect mMonitorRect;
-#endif
+//#endif
 };
 

trunk/src/VBox/Frontends/VirtualBox/include/VBoxUtils-darwin.h

@@ -151 +151 @@
 class QImage;
 
-# ifndef QT_MAC_USE_COCOA
-
-/* Asserts if a != noErr and prints the error code */
-#  define AssertCarbonOSStatus(a) AssertMsg ((a) == noErr, ("Carbon OSStatus: %d\n", static_cast<int> (a)))
-
 /* Converting stuff */
 CGImageRef darwinToCGImageRef (const QImage *aImage);
@@ -171 +166 @@
     return static_cast<CGContext *> (aWidget->macCGHandle());
 }
+
+# ifndef QT_MAC_USE_COCOA
+
+/* Asserts if a != noErr and prints the error code */
+#  define AssertCarbonOSStatus(a) AssertMsg ((a) == noErr, ("Carbon OSStatus: %d\n", static_cast<int> (a)))
+
 
 /**