Changeset 31284 in vbox for trunk

Timestamp:

Aug 2, 2010 11:40:32 AM (15 years ago)

Author:

vboxsync

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

64311

Message:

FE/Qt: New running VM core: Explicit cleanup of mini-toolbar.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/runtime

Files:

• fullscreen/UIMachineWindowFullscreen.cpp (modified) (2 diffs)
• fullscreen/UIMachineWindowFullscreen.h (modified) (1 diff)
• seamless/UIMachineWindowSeamless.cpp (modified) (3 diffs)
• seamless/UIMachineWindowSeamless.h (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/runtime/fullscreen/UIMachineWindowFullscreen.cpp

@@ -98 +98 @@
     /* Save window settings: */
     saveWindowSettings();
+
+    /* Cleanup mini tool-bar: */
+    cleanupMiniToolBar();
 
     /* Prepare handlers: */
@@ -259 +262 @@
 }
 
+void UIMachineWindowFullscreen::cleanupMiniToolBar()
+{
+    if (m_pMiniToolBar)
+    {
+        delete m_pMiniToolBar;
+        m_pMiniToolBar = 0;
+    }
+}
+
 void UIMachineWindowFullscreen::cleanupMenu()
 {

trunk/src/VBox/Frontends/VirtualBox/src/runtime/fullscreen/UIMachineWindowFullscreen.h

@@ -75 +75 @@
     void saveWindowSettings();
     void cleanupMachineView();
-    //void cleanupMiniToolBar() {}
+    void cleanupMiniToolBar();
     void cleanupMenu();
 

trunk/src/VBox/Frontends/VirtualBox/src/runtime/seamless/UIMachineWindowSeamless.cpp

@@ -77 +77 @@
     prepareHandlers();
 
+#ifndef Q_WS_MAC
     /* Prepare mini tool-bar: */
-#ifndef Q_WS_MAC
     prepareMiniToolBar();
 #endif /* Q_WS_MAC */
@@ -101 +101 @@
     /* Save window settings: */
     saveWindowSettings();
+
+#ifndef Q_WS_MAC
+    /* Cleanup mini tool-bar: */
+    cleanupMiniToolBar();
+#endif /* Q_WS_MAC */
 
     /* Prepare handlers: */
@@ -319 +324 @@
 }
 
+#ifndef Q_WS_MAC
+void UIMachineWindowSeamless::cleanupMiniToolBar()
+{
+    if (m_pMiniToolBar)
+    {
+        delete m_pMiniToolBar;
+        m_pMiniToolBar = 0;
+    }
+}
+#endif /* Q_WS_MAC */
+
 void UIMachineWindowSeamless::cleanupMenu()
 {

trunk/src/VBox/Frontends/VirtualBox/src/runtime/seamless/UIMachineWindowSeamless.h

@@ -89 +89 @@
     void cleanupMachineView();
 #ifndef Q_WS_MAC
-    //void cleanupMiniToolBar() {}
+    void cleanupMiniToolBar();
 #endif /* Q_WS_MAC */
     void cleanupMenu();