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

Timestamp:

Feb 25, 2009 1:03:29 PM (16 years ago)

Author:

vboxsync

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

43374

Message:

FE/Qt-OSX: Make the handling of Darwin tasks more generic for Carbon & Cocoa. Disable settings window animation on Cocoa.

Location:

trunk/src/VBox/Frontends/VirtualBox/include

Files:

• VBoxToolBar.h (modified) (2 diffs)
• VBoxUtils-darwin.h (added)
• VBoxUtils.h (modified) (1 diff)

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

@@ -81 +81 @@
             /** @todo Carbon -> Cocoa */
 # else  /* !QT_MAC_USE_COCOA */
-            WindowRef window = ::darwinToWindowRef (this);
+            WindowRef window = ::darwinToNativeWindow (this);
             EventHandlerUPP eventHandler = ::NewEventHandlerUPP (VBoxToolBar::macEventFilter);
             EventTypeSpec eventTypes[2];
@@ -123 +123 @@
     {
 #ifdef Q_WS_MAC
-        ::darwinSetShowToolBarButton (this, aShow);
+        ::darwinSetShowsToolbarButton (this, aShow);
 #else  /* Q_WS_MAC */
         NOREF (aShow);

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

@@ -128 +128 @@
 
 #ifdef Q_WS_MAC
-class QImage;
-class QPixmap;
-class QToolBar;
-class VBoxFrameBuffer;
-
-# ifdef QT_MAC_USE_COCOA
-/** @todo Carbon -> Cocoa */
-# else /* !QT_MAC_USE_COCOA */
-#  undef PAGE_SIZE
-#  undef PAGE_SHIFT
-#  include <Carbon/Carbon.h>
-
-/* 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);
-CGImageRef darwinToCGImageRef (const QPixmap *aPixmap);
-CGImageRef darwinToCGImageRef (const char *aSource);
-
-/**
- * Returns a reference to the HIView of the QWidget.
- *
- * @returns HIViewRef of the QWidget.
- * @param   aWidget   Pointer to the QWidget
- */
-DECLINLINE(HIViewRef) darwinToHIViewRef (QWidget *aWidget)
-{
-    return HIViewRef(aWidget->winId());
-}
-
-/**
- * Returns a reference to the Window of the HIView.
- *
- * @returns WindowRef of the HIView.
- * @param   aViewRef  Reference to the HIView
- */
-DECLINLINE(WindowRef) darwinToWindowRef (HIViewRef aViewRef)
-{
-    return reinterpret_cast<WindowRef> (HIViewGetWindow(aViewRef));
-}
-
-/**
- * Returns a reference to the Window of the QWidget.
- *
- * @returns WindowRef of the QWidget.
- * @param   aWidget   Pointer to the QWidget
- */
-DECLINLINE(WindowRef) darwinToWindowRef (QWidget *aWidget)
-{
-    return ::darwinToWindowRef (::darwinToHIViewRef (aWidget));
-}
-
-/**
- * Returns a reference to the CGContext of the QWidget.
- *
- * @returns CGContextRef of the QWidget.
- * @param   aWidget      Pointer to the QWidget
- */
-DECLINLINE(CGContextRef) darwinToCGContextRef (QWidget *aWidget)
-{
-    return static_cast<CGContext *> (aWidget->macCGHandle());
-}
-
-/**
- * Converts a QRect to a HIRect.
- *
- * @returns HIRect for the converted QRect.
- * @param   aRect  the QRect to convert
- */
-DECLINLINE(HIRect) darwinToHIRect (const QRect &aRect)
-{
-    return CGRectMake (aRect.x(), aRect.y(), aRect.width(), aRect.height());
-}
-#endif /* !QT_MAC_USE_COCOA */
-
-QString darwinSystemLanguage (void);
-
-bool darwinIsMenuOpen (void);
-
-void darwinSetShowToolBarButton (QToolBar *aToolBar, bool aShow);
-
-void darwinWindowAnimateResize (QWidget *aWidget, const QRect &aTarget);
-
-/* Proxy icon creation */
-QPixmap darwinCreateDragPixmap (const QPixmap& aPixmap, const QString &aText);
-
-/* Icons in the menu of an mac application are unusual. */
-void darwinDisableIconsInMenus (void);
-
-# ifdef DEBUG
-void darwinDebugPrintEvent (const char *aPrefix, EventRef aEvent);
-# endif
-
-# ifdef QT_MAC_USE_COCOA
-/** @todo Carbon -> Cocoa  */
-# else  /* !QT_MAC_USE_COCOA */
-/* Experimental region handler for the seamless mode */
-OSStatus darwinRegionHandler (EventHandlerCallRef aInHandlerCallRef, EventRef aInEvent, void *aInUserData);
-
-/* Handler for the OpenGL overlay window stuff & the possible messages. */
-enum
-{
-    /* Event classes */
-    kEventClassVBox        = 'vbox',
-    /* Event kinds */
-    kEventVBoxShowWindow   = 'swin',
-    kEventVBoxMoveWindow   = 'mwin',
-    kEventVBoxResizeWindow = 'rwin',
-    kEventVBoxUpdateDock   = 'udck'
-};
-OSStatus darwinOverlayWindowHandler (EventHandlerCallRef aInHandlerCallRef, EventRef aInEvent, void *aInUserData);
-# endif /* !QT_MAC_USE_COCOA*/
+# include "VBoxUtils-darwin.h"
 #endif /* Q_WS_MAC */