Changeset 62261 in vbox

Timestamp:

Jul 14, 2016 3:44:02 PM (9 years ago)

Author:

vboxsync

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

108776

Message:

Reverting r108771 as it's not good enough.

File:

• trunk/src/VBox/Frontends/VirtualBox/src/runtime/normal/UIMachineWindowNormal.cpp (modified) (2 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/runtime/normal/UIMachineWindowNormal.cpp

@@ -130 +130 @@
 void UIMachineWindowNormal::sltHandleMenuBarConfigurationChange(const QString &strMachineID)
 {
-# ifdef VBOX_WS_X11
-    /* We should skip that stuff on Unity (Compiz) to avoid duplicated menu-bar: */
-    if (vboxGlobal().typeOfWindowManager() == X11WMType_Compiz)
-        return;
-# endif /* VBOX_WS_X11 */
-
     /* Skip unrelated machine IDs: */
     if (vboxGlobal().managedVMUuid() != strMachineID)
@@ -354 +348 @@
     /* Load GUI customizations: */
     {
-#if   defined(VBOX_WS_MAC)
-        /* Nothing for Mac OS X. */
-#elif defined(VBOX_WS_WIN)
+#ifndef VBOX_WS_MAC
         /* Update menu-bar visibility: */
         menuBar()->setVisible(actionPool()->action(UIActionIndexRT_M_View_M_MenuBar_T_Visibility)->isChecked());
-#elif defined(VBOX_WS_X11)
-        /* We should skip that stuff on Unity (Compiz) to avoid duplicated menu-bar: */
-        if (vboxGlobal().typeOfWindowManager() != X11WMType_Compiz)
-        {
-            /* Update menu-bar visibility: */
-            menuBar()->setVisible(actionPool()->action(UIActionIndexRT_M_View_M_MenuBar_T_Visibility)->isChecked());
-        }
-#else
-# warning "port me!"
-#endif
+#endif /* !VBOX_WS_MAC */
         /* Update status-bar visibility: */
         statusBar()->setVisible(actionPool()->action(UIActionIndexRT_M_View_M_StatusBar_T_Visibility)->isChecked());