VirtualBox

Changeset 16469 in vbox for trunk/src


Ignore:
Timestamp:
Feb 2, 2009 5:21:58 PM (16 years ago)
Author:
vboxsync
svn:sync-xref-src-repo-rev:
42355
Message:

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

Location:
trunk/src/VBox/Frontends/VirtualBox
Files:
18 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/VBox/Frontends/VirtualBox/Makefile.kmk

    r16385 r16469  
    151151VirtualBox_DEFS           = VBOX_GUI_SEPARATE_VM_PROCESS
    152152VirtualBox_DEFS.debug     = VBOX_CHECK_STATE # QT_FATAL_ASSERT
    153 VirtualBox_DEFS.darwin    = VBOX_GUI_USE_QUARTZ2D VBOX_GUI_USE_QIMAGE VBOX_WITHOUT_QHTTP
     153VirtualBox_DEFS.darwin    = VBOX_GUI_USE_QIMAGE VBOX_WITHOUT_QHTTP
     154VirtualBox_DEFS.darwin.x86= VBOX_GUI_USE_QUARTZ2D
    154155VirtualBox_DEFS.freebsd   = VBOX_GUI_USE_QIMAGE VBOX_GUI_USE_SDL
    155156VirtualBox_DEFS.linux     = VBOX_GUI_USE_QIMAGE VBOX_GUI_USE_SDL

  • trunk/src/VBox/Frontends/VirtualBox/include/DarwinKeyboard.h

    r8155 r16469  
    2222
    2323
    24 #ifndef __DarwinKeyboard_h__
    25 #define __DarwinKeyboard_h__
     24#ifndef ___DarwinKeyboard_h___
     25#define ___DarwinKeyboard_h___
    2626
    2727#include <iprt/cdefs.h>
    28 #include <Carbon/Carbon.h>
     28#include <CoreFoundation/CFBase.h>
    2929
    3030__BEGIN_DECLS

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

    r11995 r16469  
    2121 */
    2222
    23 #ifndef __QIHotKeyEdit_h__
    24 #define __QIHotKeyEdit_h__
     23#ifndef ___QIHotKeyEdit_h___
     24#define ___QIHotKeyEdit_h___
    2525
    2626#include <QLabel>
    … …  
    2828#include <QMap>
    2929#endif
    30 #if defined (Q_WS_MAC)
    31 #include <Carbon/Carbon.h>
     30#if defined (Q_WS_MAC) && !defined (QT_MAC_USE_COCOA)
     31# include <Carbon/Carbon.h>
    3232#endif
    3333
    … …  
    8282#elif defined (Q_WS_X11)
    8383    bool x11Event (XEvent *event);
    84 #elif defined (Q_WS_MAC)
     84#elif defined (Q_WS_MAC) && !defined (QT_MAC_USE_COCOA)
    8585    static pascal OSStatus darwinEventHandlerProc (EventHandlerCallRef inHandlerCallRef,
    8686                                                   EventRef inEvent, void *inUserData);
    … …  
    106106#endif
    107107
    108 #if defined (Q_WS_MAC)
     108#if defined (Q_WS_MAC) && !defined (QT_MAC_USE_COCOA)
    109109    /** Event handler reference. NULL if the handler isn't installed. */
    110110    EventHandlerRef mDarwinEventHandlerRef;
    … …  
    117117};
    118118
    119 #endif // __QIHotKeyEdit_h__
     119#endif // !___QIHotKeyEdit_h___
    120120

  • trunk/src/VBox/Frontends/VirtualBox/include/VBoxConsoleView.h

    r15804 r16469  
    2121 */
    2222
    23 #ifndef __VBoxConsoleView_h__
    24 #define __VBoxConsoleView_h__
     23#ifndef ___VBoxConsoleView_h___
     24#define ___VBoxConsoleView_h___
    2525
    2626#include "COMDefs.h"
    … …  
    3939
    4040#if defined (Q_WS_MAC)
    41 # include <Carbon/Carbon.h>
     41# ifdef QT_MAC_USE_COCOA
     42/** @todo include something chocolatety... */
     43# else
     44#  include <Carbon/Carbon.h>
     45# endif
    4246#endif
    4347
    … …  
    160164    bool x11Event (XEvent *event);
    161165#elif defined(Q_WS_MAC)
     166# ifndef QT_MAC_USE_COCOA
    162167    bool darwinKeyboardEvent (EventRef inEvent);
     168# endif
    163169    void darwinGrabKeyboardEvents (bool fGrab);
    164170#endif
    … …  
    295301
    296302#if defined(Q_WS_MAC)
    297 # ifndef VBOX_WITH_HACKED_QT
     303# if !defined (VBOX_WITH_HACKED_QT) && !defined (QT_MAC_USE_COCOA)
    298304    /** Event handler reference. NULL if the handler isn't installed. */
    299305    EventHandlerRef mDarwinEventHandlerRef;
    … …  
    313319    static LRESULT CALLBACK lowLevelKeyboardProc (int nCode,
    314320                                                  WPARAM wParam, LPARAM lParam);
    315 #elif defined (Q_WS_MAC)
     321#elif defined (Q_WS_MAC) && !defined (QT_MAC_USE_COCOA)
    316322    EventHandlerRef mDarwinWindowOverlayHandlerRef;
    317323# ifndef VBOX_WITH_HACKED_QT
    … …  
    334340};
    335341
    336 #endif // __VBoxConsoleView_h__
    337 
     342#endif // !___VBoxConsoleView_h___
     343

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

    r16319 r16469  
    4141#endif
    4242#ifdef Q_WS_MAC
    43 # undef PAGE_SIZE
    44 # undef PAGE_SHIFT
    45 # include <Carbon/Carbon.h>
     43# ifdef QT_MAC_USE_COCOA
     44    /** @todo Carbon -> Cocoa */
     45# else
     46#  undef PAGE_SIZE
     47#  undef PAGE_SHIFT
     48#  include <Carbon/Carbon.h>
     49# endif
    4650#endif
    4751
    … …  
    356360#ifdef Q_WS_MAC
    357361    QRegion mCurrRegion;
     362# ifndef QT_MAC_USE_COCOA
     363    /** @todo Carbon -> Cocoa */
     364#else
     365# else
    358366    EventHandlerRef mDarwinRegionEventHandlerRef;
     367# endif
    359368#endif
    360369
    … …  
    386395    QRect mNormalGeometry;
    387396    Qt::WindowFlags mSavedFlags;
     397# ifdef QT_MAC_USE_COCOA
     398    /** @todo Carbon -> Cocoa */
     399# else
    388400    /* For the fade effect if the the window goes fullscreen */
    389401    CGDisplayFadeReservationToken mFadeToken;
     402# endif
    390403#endif
    391404};

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

    r15804 r16469  
    2121 */
    2222
    23 #ifndef __VBoxDockIconPreview_h__
    24 #define __VBoxDockIconPreview_h__
     23#ifndef ___VBoxDockIconPreview_h___
     24#define ___VBoxDockIconPreview_h___
    2525
    26 #include <Carbon/Carbon.h>
     26#include <QObject> /* drag in QT_MAC_USE_COCOA */
     27
     28#ifndef QT_MAC_USE_COCOA
     29/** @todo include chocolatey headers... */
     30#else
     31# include <Carbon/Carbon.h>
     32#endif
    2733
    2834class VBoxConsoleWnd;
    … …  
    3844
    3945    void updateDockOverlay();
     46#ifndef QT_MAC_USE_COCOA
    4047    void updateDockPreview (CGImageRef aVMImage);
     48#endif
    4149    void updateDockPreview (VBoxFrameBuffer *aFrameBuffer);
    4250
    4351private:
     52#ifdef QT_MAC_USE_COCOA
     53    /** @todo Carbon -> Cocoa */
     54#else
    4455    inline void initPreviewImages();
    4556    inline void initOverlayData (int aBitmapByteCount);
    … …  
    5667        return aRect;
    5768    }
     69#endif /* !QT_MAC_USE_COCOA */
    5870
    5971    /* Private member vars */
    6072    VBoxConsoleWnd *mMainWnd;
     73#ifdef QT_MAC_USE_COCOA
     74    /** @todo Carbon -> Cocoa */
     75#else
    6176    const CGRect mDockIconRect;
    6277
    … …  
    7388    CGRect mUpdateRect;
    7489    CGRect mMonitorRect;
     90#endif
    7591};
    7692
    77 #endif /* __VBoxDockIconPreview_h__ */
     93#endif /* !___VBoxDockIconPreview_h___ */
    7894

  • trunk/src/VBox/Frontends/VirtualBox/include/VBoxFrameBuffer.h

    r14056 r16469  
    2121 */
    2222
    23 #ifndef __VBoxFrameBuffer_h__
    24 #define __VBoxFrameBuffer_h__
     23#ifndef ___VBoxFrameBuffer_h___
     24#define ___VBoxFrameBuffer_h___
    2525
    2626#include "COMDefs.h"
    … …  
    472472};
    473473
    474 #endif
    475 
    476 #endif // !__VBoxFrameBuffer_h__
     474#endif /* Q_WS_MAC && VBOX_GUI_USE_QUARTZ2D */
     475
     476#endif // !___VBoxFrameBuffer_h___

  • trunk/src/VBox/Frontends/VirtualBox/include/VBoxIChatTheaterWrapper.h

    r8155 r16469  
    2525#if defined (Q_WS_MAC) && defined (VBOX_WITH_ICHAT_THEATER)
    2626
    27 #include <Carbon/Carbon.h>
     27#ifdef QT_MAC_USE_COCOA
     28/** @todo Carbon -> Cocoa */
     29#else
     30# include <Carbon/Carbon.h>
     31#endif
    2832
    2933__BEGIN_DECLS
    3034
    3135void initSharedAVManager();
     36#ifdef QT_MAC_USE_COCOA
     37/** @todo Carbon -> Cocoa */
     38#else
    3239void setImageRef (CGImageRef aImage);
     40#endif
    3341
    3442__END_DECLS

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

    r11535 r16469  
    2121 */
    2222
    23 #ifndef __VBoxToolBar_h__
    24 #define __VBoxToolBar_h__
     23#ifndef ___VBoxToolBar_h___
     24#define ___VBoxToolBar_h___
    2525
    2626
    2727#ifdef Q_WS_MAC
    28  #include "VBoxUtils.h"
     28# include "VBoxUtils.h"
    2929#endif
    3030
    … …  
    7878        {
    7979            mMainWindow->setUnifiedTitleAndToolBarOnMac (true);
     80# ifdef QT_MAC_USE_COCOA
     81            /** @todo Carbon -> Cocoa */
     82# else  /* !QT_MAC_USE_COCOA */
    8083            WindowRef window = ::darwinToWindowRef (this);
    8184            EventHandlerUPP eventHandler = ::NewEventHandlerUPP (VBoxToolBar::macEventFilter);
    … …  
    8891                                       RT_ELEMENTS (eventTypes), eventTypes,
    8992                                       NULL, NULL);
     93# endif /* !QT_MAC_USE_COCOA */
    9094        }
    9195#endif /* Q_WS_MAC */
    9296    }
    9397
    94 #ifdef Q_WS_MAC
     98#if defined(Q_WS_MAC) && !defined(QT_MAC_USE_COCOA)
    9599    static pascal OSStatus macEventFilter (EventHandlerCallRef aNextHandler,
    96100                                           EventRef aEvent, void * /* aUserData */)
    … …  
    114118        return CallNextEventHandler (aNextHandler, aEvent);
    115119    }
    116 #endif /* Q_WS_MAC */
     120#endif /* Q_WS_MAC && !QT_MAC_USE_COCOA */
    117121
    118122    void setShowToolBarButton (bool aShow)
    … …  
    142146};
    143147
    144 #endif // __VBoxToolBar_h__
     148#endif // !___VBoxToolBar_h___
    145149

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

    r15804 r16469  
    2121 */
    2222
    23 #ifndef __VBoxUtils_h__
    24 #define __VBoxUtils_h__
     23#ifndef ___VBoxUtils_h___
     24#define ___VBoxUtils_h___
    2525
    2626/* Qt includes */
    … …  
    126126
    127127#ifdef Q_WS_MAC
    128 # undef PAGE_SIZE
    129 # undef PAGE_SHIFT
    130 # include <Carbon/Carbon.h>
    131 
    132 /* Asserts if a != noErr and prints the error code */
    133 #define AssertCarbonOSStatus(a) AssertMsg ((a) == noErr, ("Carbon OSStatus: %d\n", static_cast<int> (a)))
    134 
    135128class QImage;
    136129class QPixmap;
    … …  
    138131class VBoxFrameBuffer;
    139132
     133# ifdef QT_MAC_USE_COCOA
     134/** @todo Carbon -> Cocoa */
     135# else /* !QT_MAC_USE_COCOA */
     136#  undef PAGE_SIZE
     137#  undef PAGE_SHIFT
     138#  include <Carbon/Carbon.h>
     139
     140/* Asserts if a != noErr and prints the error code */
     141#  define AssertCarbonOSStatus(a) AssertMsg ((a) == noErr, ("Carbon OSStatus: %d\n", static_cast<int> (a)))
     142
    140143/* Converting stuff */
    141144CGImageRef darwinToCGImageRef (const QImage *aImage);
    … …  
    197200    return CGRectMake (aRect.x(), aRect.y(), aRect.width(), aRect.height());
    198201}
    199 
    200 QString darwinSystemLanguage();
    201 
    202 bool darwinIsMenuOpen();
     202#endif /* !QT_MAC_USE_COCOA */
     203
     204QString darwinSystemLanguage (void);
     205
     206bool darwinIsMenuOpen (void);
    203207
    204208void darwinSetShowToolBarButton (QToolBar *aToolBar, bool aShow);
    … …  
    210214
    211215/* Icons in the menu of an mac application are unusual. */
    212 void darwinDisableIconsInMenus();
    213 
     216void darwinDisableIconsInMenus (void);
     217
     218#ifndef QT_MAC_USE_COCOA
     219/** @todo Carbon -> Cocoa  */
     220#else  /* !QT_MAC_USE_COCOA */
    214221/* Experimental region handler for the seamless mode */
    215222OSStatus darwinRegionHandler (EventHandlerCallRef aInHandlerCallRef, EventRef aInEvent, void *aInUserData);
    … …  
    228235OSStatus darwinOverlayWindowHandler (EventHandlerCallRef aInHandlerCallRef, EventRef aInEvent, void *aInUserData);
    229236
    230 # ifdef DEBUG
     237#  ifdef DEBUG
    231238void darwinDebugPrintEvent (const char *aPrefix, EventRef aEvent);
    232 # endif
     239#  endif
     240# endif /* !QT_MAC_USE_COCOA*/
    233241#endif /* Q_WS_MAC */
    234242
    235 #endif // __VBoxUtils_h__
    236 
     243#endif // !___VBoxUtils_h___
     244

  • trunk/src/VBox/Frontends/VirtualBox/src/QIDialog.cpp

    r16176 r16469  
    4747        setFixedSize (size());
    4848#ifdef Q_WS_MAC
     49# ifdef QT_MAC_USE_COCOA
     50        /** @todo Carbon -> Cocoa */
     51# else
    4952        ChangeWindowAttributes (::darwinToWindowRef (this), kWindowNoAttributes, kWindowResizableAttribute);
     53# endif
    5054#endif /* Q_WS_MAC */
    5155    }

  • trunk/src/VBox/Frontends/VirtualBox/src/VBoxConsoleView.cpp

    r16176 r16469  
    106106#endif
    107107
    108 #if defined (Q_WS_MAC)
     108#if defined (Q_WS_MAC) && !defined (QT_MAC_USE_COCOA)
    109109
    110110# ifndef VBOX_WITH_HACKED_QT
    … …  
    184184# endif /* VBOX_WITH_HACKED_QT */
    185185
    186 #endif /* Q_WS_MAC */
     186#endif /* Q_WS_MAC && !QT_MAC_USE_COCOA */
    187187
    188188/** Guest mouse pointer shape change event. */
    … …  
    666666#endif
    667667#if defined(Q_WS_MAC)
    668 # ifndef VBOX_WITH_HACKED_QT
     668# if !defined (VBOX_WITH_HACKED_QT) && !defined (QT_MAC_USE_COCOA)
    669669    , mDarwinEventHandlerRef (NULL)
    670670# endif
    … …  
    687687    mDockIconPreview = new VBoxDockIconPreview (mMainWnd, vboxGlobal().vmGuestOSTypeIcon (osTypeId));
    688688
     689# ifdef QT_MAC_USE_COCOA
     690    /** @todo Carbon -> Cocoa */
     691# else /* !QT_MAC_USE_COCOA */
    689692    /* Install the event handler which will proceed external window handling */
    690693    EventHandlerUPP eventHandler = ::NewEventHandlerUPP (::darwinOverlayWindowHandler);
    … …  
    701704                                      this, &mDarwinWindowOverlayHandlerRef);
    702705    ::DisposeEventHandlerUPP (eventHandler);
    703 #endif
     706# endif /* !QT_MAC_USE_COCOA */
     707#endif /* QT_WS_MAC */
    704708
    705709    /* No frame around the view */
    … …  
    881885    mConsole.UnregisterCallback (mCallback);
    882886
    883 #ifdef Q_WS_MAC
     887#if defined (Q_WS_MAC) && !defined (QT_MAC_USE_COCOA)
    884888    if (mDarwinWindowOverlayHandlerRef)
    885889    {
    … …  
    21202124#elif defined (Q_WS_MAC)
    21212125
     2126# ifndef QT_MAC_USE_COCOA
    21222127/**
    21232128 *  Invoked by VBoxConsoleView::darwinEventHandlerProc / VBoxConsoleView::macEventFilter when
    … …  
    22112216    return ret;
    22122217}
     2218# endif /* !QT_MAC_USE_COCOA */
    22132219
    22142220
    … …  
    22232229    if (fGrab)
    22242230    {
     2231# ifdef QT_MAC_USE_COCOA
     2232        /** @todo Carbon -> Cocoa */
     2233# else  /* !QT_MAC_USE_COCOA */
    22252234        /* Disable mouse event compression to get *really* all mouse events in
    22262235           the VM. */
    … …  
    22282237        ::CGSetLocalEventsSuppressionInterval (0.0);
    22292238
    2230 #ifndef VBOX_WITH_HACKED_QT
     2239#  ifndef VBOX_WITH_HACKED_QT
    22312240
    22322241        EventTypeSpec eventTypes[6];
    … …  
    22532262        ::DisposeEventHandlerUPP (eventHandler);
    22542263
    2255 #else /* VBOX_WITH_HACKED_QT */
     2264#  else /* VBOX_WITH_HACKED_QT */
    22562265        ((QIApplication *)qApp)->setEventFilter (VBoxConsoleView::macEventFilter, this);
    2257 #endif /* VBOX_WITH_HACKED_QT */
     2266#  endif /* VBOX_WITH_HACKED_QT */
     2267# endif /* !QT_MAC_USE_COCOA */
    22582268
    22592269        ::DarwinGrabKeyboard (false);
    … …  
    22622272    {
    22632273        ::DarwinReleaseKeyboard();
    2264 #ifndef VBOX_WITH_HACKED_QT
     2274# ifdef QT_MAC_USE_COCOA
     2275        /** @todo Carbon -> Cocoa */
     2276# else  /* !QT_MAC_USE_COCOA */
     2277#  ifndef VBOX_WITH_HACKED_QT
    22652278        if (mDarwinEventHandlerRef)
    22662279        {
    … …  
    22682281            mDarwinEventHandlerRef = NULL;
    22692282        }
    2270 #else
     2283#  else
    22712284        ((QIApplication *)qApp)->setEventFilter (NULL, NULL);
    2272 #endif
    2273     }
    2274 }
    2275 
    2276 #endif // defined (Q_WS_WIN)
     2285#  endif
     2286# endif /* !QT_MAC_USE_COCOA*/
     2287    }
     2288}
     2289
     2290#endif // defined (Q_WS_MAC)
    22772291
    22782292//
    … …  
    23842398    }
    23852399
    2386 #elif defined(Q_WS_MAC)
     2400#elif defined (Q_WS_MAC) && !defined (QT_MAC_USE_COCOA)
    23872401
    23882402    /* if (muNumLockAdaptionCnt) ... - NumLock isn't implemented by Mac OS X so ignore it. */
    … …  
    23932407        codes[(*count)++] = 0x3a | 0x80;
    23942408    }
     2409
     2410#elif defined (Q_WS_MAC) && !defined (QT_MAC_USE_COCOA)
     2411
     2412    /** @todo Carbon -> Cocoa */
    23952413
    23962414#else
    … …  
    39093927
    39103928#if defined(Q_WS_MAC)
     3929
    39113930void VBoxConsoleView::updateDockIcon()
    39123931{
    … …  
    39153934        if (!mPausedShot.isNull())
    39163935        {
     3936# ifdef QT_MAC_USE_COCOA
     3937            /** @todo Carbon -> Cocoa */
     3938# else
    39173939            CGImageRef pauseImg = ::darwinToCGImageRef (&mPausedShot);
    39183940            /* Use the pause image as background */
    39193941            mDockIconPreview->updateDockPreview (pauseImg);
    39203942            CGImageRelease (pauseImg);
     3943# endif
    39213944        }
    39223945        else
    … …  
    39553978void VBoxConsoleView::setMouseCoalescingEnabled (bool aOn)
    39563979{
    3957 
     3980#ifdef QT_MAC_USE_COCOA
     3981    /** @todo Carbon -> Cocoa */
     3982#else
    39583983    if (aOn)
    39593984        /* Enable mouse event compression if we leave the VM view. This
    … …  
    39703995            ::SetMouseCoalescingEnabled (false, NULL);
    39713996    }
    3972 }
    3973 
    3974 #endif
    3975 
     3997#endif
     3998}
     3999
     4000#endif /* Q_WS_MAC */
     4001

  • trunk/src/VBox/Frontends/VirtualBox/src/VBoxConsoleWnd.cpp

    r16386 r16469  
    5858
    5959#ifdef Q_WS_MAC
    60 #include "VBoxUtils.h"
    61 #include "VBoxIChatTheaterWrapper.h"
    62 //#include <Carbon/Carbon.h>
    63 /* Qt includes */
    64 #include <QPainter>
     60# include "VBoxUtils.h"
     61# include "VBoxIChatTheaterWrapper.h"
     62  /* Qt includes */
     63# include <QPainter>
    6564#endif
    6665
    … …  
    11611160    {
    11621161        /* Fade back to the normal gamma */
     1162# ifdef QT_MAC_USE_COCOA
     1163        /** @todo Carbon -> Cocoa */
     1164# else
    11631165        CGDisplayFade (mFadeToken, 0.5, kCGDisplayBlendSolidColor, kCGDisplayBlendNormal, 0.0, 0.0, 0.0, false);
    11641166        CGReleaseDisplayFadeReservation (mFadeToken);
     1167# endif
    11651168    }
    11661169    console->setMouseCoalescingEnabled (true);
    … …  
    12561259            {
    12571260                /* Clear the background */
     1261# ifdef QT_MAC_USE_COCOA
     1262                /** @todo Carbon -> Cocoa */
     1263# else
    12581264                HIRect viewRect;
    12591265                HIViewGetBounds (::darwinToHIViewRef (this), &viewRect);
    12601266                CGContextClearRect (::darwinToCGContextRef (this), viewRect);
     1267# endif
    12611268            }
    12621269            break;
    … …  
    22042211    {
    22052212        /* Fade to black */
     2213# ifdef QT_MAC_USE_COCOA
     2214        /** @todo Carbon -> Cocoa */
     2215# else
    22062216        CGAcquireDisplayFadeReservation (kCGMaxDisplayReservationInterval, &mFadeToken);
    22072217        CGDisplayFade (mFadeToken, 0.3, kCGDisplayBlendNormal, kCGDisplayBlendSolidColor, 0.0, 0.0, 0.0, true);
     2218# endif
    22082219    }
    22092220#endif
    … …  
    23312342             * calls. */
    23322343            /* Undo all mac specific installations */
     2344# ifdef QT_MAC_USE_COCOA
     2345            /** @todo Carbon -> Cocoa */
     2346# else  /* !QT_MAC_USE_COCOA */
    23332347            OSStatus status;
    23342348            WindowRef windowRef = ::darwinToWindowRef (this);
    … …  
    23422356            status = SetWindowAlpha (windowRef, 1.0);
    23432357            AssertCarbonOSStatus (status);
     2358# endif /* !QT_MAC_USE_COCOA */
    23442359        }
    23452360#endif
    … …  
    23742389         * switch and make this stuff useless with the old winId. So please be
    23752390         * careful on rearrangement of the method calls. */
     2391# ifdef QT_MAC_USE_COCOA
     2392        /** @todo Carbon -> Cocoa */
     2393# else  /* !QT_MAC_USE_COCOA */
    23762394        OSStatus status;
    23772395        HIViewRef viewRef = ::darwinToHIViewRef (console->viewport());
    … …  
    24102428        status = ChangeWindowAttributes (windowRef, kWindowNoShadowAttribute, 0);
    24112429        AssertCarbonOSStatus (status);
     2430# endif /* !QT_MAC_USE_COCOA */
    24122431    }
    24132432#endif
    … …  
    24552474{
    24562475#ifdef Q_WS_MAC
     2476# ifdef QT_MAC_USE_COCOA
     2477    /** @todo Carbon -> Cocoa */
     2478# else  /* !QT_MAC_USE_COCOA */
    24572479    /* setWindowState removes the window group connection somehow. So save it
    24582480     * temporary. */
    … …  
    24802502    /* Reassign the correct window group. */
    24812503    SetWindowGroup (::darwinToWindowRef (this), g);
     2504# endif /* !QT_MAC_USE_COCOA */
    24822505#else
    24832506    NOREF (aOn);

  • trunk/src/VBox/Frontends/VirtualBox/src/VBoxGlobal.cpp

    r16374 r16469  
    6262
    6363#if defined (Q_WS_MAC)
    64 #include "VBoxUtils.h"
    65 #include <Carbon/Carbon.h> // for HIToolbox/InternetConfig
     64# include "VBoxUtils.h"
     65# ifdef QT_MAC_USE_COCOA
     66/** @todo Carbon -> Cocoa */
     67# else
     68#  include <Carbon/Carbon.h> // for HIToolbox/InternetConfig
     69# endif
    6670#endif
    6771
    … …  
    51615165
    51625166#elif defined (Q_WS_MAC)
     5167# ifdef QT_MAC_USE_COCOA
     5168    /** @todo Carbon -> Cocoa */
     5169# else /* !QT_MAC_USE_COCOA */
    51635170
    51645171    /* The code below is taken from Psi 0.10 sources
    … …  
    51885195        return true;
    51895196    }
     5197# endif /* !QT_MAC_USE_COCOA */
    51905198
    51915199#else

  • trunk/src/VBox/Frontends/VirtualBox/src/VBoxVMListView.cpp

    r14355 r16469  
    3030
    3131#if defined (Q_WS_MAC)
    32 # include <Carbon/Carbon.h>
     32# ifdef QT_MAC_USE_COCOA
     33/** @todo Carbon -> Cocoa */
     34# else
     35#  include <Carbon/Carbon.h>
     36# endif
    3337#endif
    3438

  • trunk/src/VBox/Frontends/VirtualBox/src/darwin/DarwinKeyboard.cpp

    r8155 r16469  
    4949# include <CoreFoundation/CoreFoundation.h>
    5050#endif
     51#include <ApplicationServices/ApplicationServices.h>
    5152#include <Carbon/Carbon.h>
    5253
    … …  
    8182/* Found the definition of the fn-key in:
    8283 * http://stuff.mit.edu/afs/sipb/project/darwin/src/modules/IOHIDFamily/IOHIDSystem/IOHIKeyboardMapper.cpp &
    83  * http://stuff.mit.edu/afs/sipb/project/darwin/src/modules/AppleADBKeyboard/AppleADBKeyboard.cpp 
     84 * http://stuff.mit.edu/afs/sipb/project/darwin/src/modules/AppleADBKeyboard/AppleADBKeyboard.cpp
    8485 * Maybe we need this in the future.*/
    8586#define QZ_FN           0x3F
    … …  
    9899#define MY_CHECK_CREFS(cRefs)   do { AssertMsg(cRefs < 25, ("%ld\n", cRefs)); NOREF(cRefs); } while (0)
    99100
    100 #endif 
     101#endif
    101102
    102103/*******************************************************************************
    … …  
    431432    }
    432433
    433     /* 
    434      * Get the current mode. 
     434    /*
     435     * Get the current mode.
    435436     */
    436437    CGSGlobalHotKeyOperatingMode enmMode = kCGSGlobalHotKeyInvalid;
    437438    CGSGetGlobalHotKeyOperatingMode(g_CGSConnection, &enmMode);
    438     if (    enmMode != kCGSGlobalHotKeyEnable 
     439    if (    enmMode != kCGSGlobalHotKeyEnable
    439440        &&  enmMode != kCGSGlobalHotKeyDisable)
    440441    {
    … …  
    442443        if (s_cComplaints++ < 32)
    443444            LogRel(("DarwinDisableGlobalHotKeys: Unexpected enmMode=%d\n", enmMode));
    444         return;                   
    445     }
    446 
    447     /* 
    448      * Calc the new mode. 
     445        return;
     446    }
     447
     448    /*
     449     * Calc the new mode.
    449450     */
    450451    if (fDisable)
    … …  
    461462    }
    462463
    463     /* 
    464      * Try set it and check the actual result. 
     464    /*
     465     * Try set it and check the actual result.
    465466     */
    466467    CGSSetGlobalHotKeyOperatingMode(g_CGSConnection, enmMode);
    … …  
    831832
    832833
    833 /** 
     834/**
    834835 * Zap the keyboard cache.
    835836 */

  • trunk/src/VBox/Frontends/VirtualBox/src/darwin/VBoxDockIconPreview.cpp

    r15804 r16469  
    2828
    2929#include <QPixmap>
    30 
     30#ifndef Q_WS_MAC
     31# error "Q_WS_MAC isn't defined"
     32#endif
     33
     34#ifndef QT_MAC_USE_COCOA
    3135/* Import private function to capture the window content of any given window. */
    3236CG_EXTERN_C_BEGIN
    … …  
    3741CG_EXTERN void CGContextCopyWindowCaptureContentsToRect(CGContextRef c, CGRect dstRect, CGSConnectionID connection, CGSWindowID window, int zero);
    3842CG_EXTERN_C_END
     43#endif /* !QT_MAC_USE_COCOA */
    3944
    4045VBoxDockIconPreview::VBoxDockIconPreview (VBoxConsoleWnd *aMainWnd, const QPixmap& aOverlayImage)
    4146    :  mMainWnd (aMainWnd)
     47#ifdef QT_MAC_USE_COCOA
     48#else
    4249     , mDockIconRect (CGRectMake (0, 0, 128, 128))
    4350     , mDockMonitor (NULL)
    … …  
    4653     , mUpdateRect (CGRectMake (0, 0, 0, 0))
    4754     , mMonitorRect (CGRectMake (0, 0, 0, 0))
    48 {
     55#endif
     56{
     57#ifdef QT_MAC_USE_COCOA
     58#else  /* !QT_MAC_USE_COCOA */
    4959    mOverlayImage   = ::darwinToCGImageRef (&aOverlayImage);
    5060    Assert (mOverlayImage);
    … …  
    5666    mStateRestoring = ::darwinToCGImageRef ("state_restoring_16px.png");
    5767    Assert (mStateRestoring);
     68#endif /* !QT_MAC_USE_COCOA */
    5869}
    5970
    6071VBoxDockIconPreview::~VBoxDockIconPreview()
    6172{
     73#ifdef QT_MAC_USE_COCOA
     74#else  /* !QT_MAC_USE_COCOA */
    6275    CGImageRelease (mOverlayImage);
    6376    if (mDockMonitor)
    … …  
    7285    CGImageRelease (mStateSaving);
    7386    CGImageRelease (mStateRestoring);
    74 }
     87#endif /* !QT_MAC_USE_COCOA */
     88}
     89
     90#ifndef QT_MAC_USE_COCOA
    7591
    7692void VBoxDockIconPreview::initPreviewImages()
    … …  
    142158}
    143159
     160#endif /* !QT_MAC_USE_COCOA */
     161
    144162void VBoxDockIconPreview::updateDockOverlay()
    145163{
     164#ifdef QT_MAC_USE_COCOA
     165#else  /* !QT_MAC_USE_COCOA */
     166
    146167    /* Remove all previously set tile images */
    147168    RestoreApplicationDockTileImage();
    … …  
    184205    CGImageRelease (overlayImage);
    185206    CGColorSpaceRelease (cs);
    186 }
    187 
     207#endif /* !QT_MAC_USE_COCOA */
     208}
     209
     210#ifndef QT_MAC_USE_COCOA
    188211void VBoxDockIconPreview::updateDockPreview (CGImageRef aVMImage)
    189212{
    … …  
    283306    CGColorSpaceRelease (cs);
    284307}
     308#endif /* !QT_MAC_USE_COCOA */
    285309
    286310void VBoxDockIconPreview::updateDockPreview (VBoxFrameBuffer *aFrameBuffer)
    287311{
     312#ifdef QT_MAC_USE_COCOA
     313#else  /* !QT_MAC_USE_COCOA */
    288314    CGColorSpaceRef cs = CGColorSpaceCreateDeviceRGB();
    289315    Assert (cs);
    … …  
    303329    CGDataProviderRelease (dp);
    304330    CGColorSpaceRelease (cs);
    305 }
    306 
     331#endif /* !QT_MAC_USE_COCOA */
     332}
     333

  • trunk/src/VBox/Frontends/VirtualBox/src/darwin/VBoxUtils-darwin.cpp

    r15804 r16469  
    2828#include <iprt/assert.h>
    2929#include <iprt/mem.h>
     30
     31#include <CoreFoundation/CFBundle.h>
    3032
    3133/* Qt includes */
    … …  
    4244#endif /* QT_VERSION < 0x040400 */
    4345
     46#ifndef QT_MAC_USE_COCOA
     47
    4448/**
    4549 * Callback for deleting the QImage object when CGImageCreate is done
    … …  
    106110}
    107111
     112#endif /* !QT_MAC_USE_COCOA */
     113
    108114void darwinSetShowToolBarButton (QToolBar *aToolBar, bool aShow)
    109115{
    … …  
    111117    if (parent)
    112118    {
     119#ifdef QT_MAC_USE_COCOA
     120        /** @todo Carbon -> Cocoa */
     121#else
    113122        int err = ChangeWindowAttributes (::darwinToWindowRef (parent), aShow ? kWindowToolbarButtonAttribute:kWindowNoAttributes,
    114123                                                                        aShow ? kWindowNoAttributes:kWindowToolbarButtonAttribute);
    115124        AssertCarbonOSStatus (err);
     125#endif
    116126    }
    117127}
    … …  
    119129void darwinWindowAnimateResize (QWidget *aWidget, const QRect &aTarget)
    120130{
     131#ifdef QT_MAC_USE_COCOA
     132    /** @todo Carbon -> Cocoa */
     133#else
    121134    HIRect r = ::darwinToHIRect (aTarget);
    122135    TransitionWindowWithOptions (::darwinToWindowRef (aWidget), kWindowSlideTransitionEffect, kWindowResizeTransitionAction, &r, false, NULL);
     136#endif
    123137}
    124138
    … …  
    142156}
    143157
    144 QString darwinSystemLanguage()
     158QString darwinSystemLanguage (void)
    145159{
    146160    /* Get the locales supported by our bundle */
    … …  
    164178}
    165179
    166 bool darwinIsMenuOpen()
    167 {
     180bool darwinIsMenuOpen (void)
     181{
     182#ifdef QT_MAC_USE_COCOA
     183    /** @todo Carbon -> Cocoa */
     184    return false;
     185#else
    168186    MenuTrackingData outData;
    169187    return (GetMenuTrackingData (NULL, &outData) != menuNotFoundErr);
    170 }
    171 
    172 void darwinDisableIconsInMenus()
     188#endif
     189}
     190
     191void darwinDisableIconsInMenus (void)
    173192{
    174193    /* No icons in the menu of a mac application. */
    … …  
    180199#endif /* QT_VERSION >= 0x040400 */
    181200}
     201
     202#ifndef QT_MAC_USE_COCOA
    182203
    183204/* Currently not used! */
    … …  
    304325}
    305326
     327#endif /* !QT_MAC_USE_COCOA */
    306328
    307329
    308330/* Event debugging stuff. Borrowed from Knuts Qt patch. */
    309 #ifdef DEBUG
     331#if defined (DEBUG) && !defined(QT_MAC_USE_COCOA)
    310332
    311333# define MY_CASE(a) case a: return #a
    … …  
    464486}
    465487
    466 #endif /* DEBUG */
     488#endif /* DEBUG && !QT_MAC_USE_COCOA */
Note: See TracChangeset for help on using the changeset viewer.

© 2025 Oracle Support Privacy / Do Not Sell My Info Terms of Use Trademark Policy Automated Access Etiquette