Changeset 29921 in vbox for trunk/src

Timestamp:

May 31, 2010 4:49:37 PM (15 years ago)

Author:

vboxsync

Message:

FE/Qt4-OSX: more cleanup

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• extensions/QIHotKeyEdit.cpp (modified) (3 diffs)
• settings/global/VBoxGLSettingsGeneral.cpp (modified) (1 diff)
• widgets/VBoxToolBar.h (modified) (2 diffs)

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

@@ -69 +69 @@
 # include "DarwinKeyboard.h"
 # include <Carbon/Carbon.h>
-# ifdef QT_MAC_USE_COCOA
-#  include "darwin/VBoxCocoaApplication.h"
-#  include "VBoxUtils.h"
-# endif
+# include "darwin/VBoxCocoaApplication.h"
+# include "VBoxUtils.h"
 #endif
 
@@ -653 +651 @@
 
 #elif defined (Q_WS_MAC)
-# ifdef QT_MAC_USE_COCOA
 /* static */
 bool QIHotKeyEdit::darwinEventHandlerProc (const void *pvCocoaEvent, const void *pvCarbonEvent, void *pvUser)
@@ -665 +662 @@
 }
 
-# else  /* !QT_MAC_USE_COCOA */
-/* static */
-pascal OSStatus QIHotKeyEdit::darwinEventHandlerProc (EventHandlerCallRef inHandlerCallRef,
-                                                      EventRef inEvent, void *inUserData)
-{
-    QIHotKeyEdit *edit = (QIHotKeyEdit *) inUserData;
-    UInt32 EventClass = ::GetEventClass (inEvent);
-    if (EventClass == kEventClassKeyboard)
-    {
-        if (edit->darwinKeyboardEvent (NULL, inEvent))
-            return 0;
-    }
-    return CallNextEventHandler (inHandlerCallRef, inEvent);
-}
-# endif /* !QT_MAC_USE_COCOA */
 
 bool QIHotKeyEdit::darwinKeyboardEvent (const void *pvCocoaEvent, EventRef inEvent)

trunk/src/VBox/Frontends/VirtualBox/src/settings/global/VBoxGLSettingsGeneral.cpp

@@ -31 +31 @@
     mCbCheckTrayIcon->hide();
 #endif /* VBOX_GUI_WITH_SYSTRAY */
-#ifndef QT_MAC_USE_COCOA
-    mCbCheckPresentationMode->hide();
-#endif /* QT_MAC_USE_COCOA */
     if (   mCbCheckTrayIcon->isHidden()
         && mCbCheckPresentationMode->isHidden())

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

@@ -22 +22 @@
 #include <QGlobalStatic> /* for Q_WS_MAC */
 #ifdef Q_WS_MAC
-#include "VBoxUtils.h"
+# include "VBoxUtils.h"
 #endif
 
@@ -66 +66 @@
     {
         if (mMainWindow)
-        {
             mMainWindow->setUnifiedTitleAndToolBarOnMac (true);
-#ifndef QT_MAC_USE_COCOA
-            WindowRef window = ::darwinToNativeWindow (this);
-            EventHandlerUPP eventHandler = ::NewEventHandlerUPP (VBoxToolBar::macEventFilter);
-            EventTypeSpec eventTypes[2];
-            eventTypes[0].eventClass = kEventClassMouse;
-            eventTypes[0].eventKind  = kEventMouseDown;
-            eventTypes[1].eventClass = kEventClassMouse;
-            eventTypes[1].eventKind  = kEventMouseUp;
-            InstallWindowEventHandler (window, eventHandler,
-                                       RT_ELEMENTS (eventTypes), eventTypes,
-                                       NULL, NULL);
-#endif /* !QT_MAC_USE_COCOA */
-        }
     }
-
-#ifndef QT_MAC_USE_COCOA
-    static pascal OSStatus macEventFilter (EventHandlerCallRef aNextHandler,
-                                           EventRef aEvent, void * /* aUserData */)
-    {
-        UInt32 eclass = GetEventClass (aEvent);
-        if (eclass == kEventClassMouse)
-        {
-            WindowPartCode partCode;
-            GetEventParameter (aEvent, kEventParamWindowPartCode, typeWindowPartCode, NULL, sizeof (WindowPartCode), NULL, &partCode);
-            UInt32 ekind = GetEventKind (aEvent);
-            if (partCode == 15 ||
-                partCode == 4)
-                if(ekind == kEventMouseDown || ekind == kEventMouseUp)
-                {
-                    EventMouseButton button = 0;
-                    GetEventParameter (aEvent, kEventParamMouseButton, typeMouseButton, NULL, sizeof (button), NULL, &button);
-                    if (button != kEventMouseButtonPrimary)
-                        return noErr;
-                }
-        }
-        return CallNextEventHandler (aNextHandler, aEvent);
-    }
-#endif /* !QT_MAC_USE_COCOA */
 
     void setShowToolBarButton (bool aShow)