Changeset 769 for trunk/src/gui/widgets/qmenu_mac.mm

Timestamp:

Aug 2, 2010, 9:27:30 PM (15 years ago)

Author:

Dmitry A. Kuminov

Message:

trunk: Merged in qt 4.6.3 sources from branches/vendor/nokia/qt.

Location:

trunk

Files:

• . (modified) (1 prop)
• src/gui/widgets/qmenu_mac.mm (modified) (3 diffs)

trunk/src/gui/widgets/qmenu_mac.mm

@@ -176 +176 @@
 }
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 static bool actualMenuItemVisibility(const QMenuBarPrivate::QMacMenuBarPrivate *mbp,
                                      const QMacMenuAction *action)
@@ -1831 +1847 @@
 
     if (qt_mac_current_menubar.qmenubar == q) {
+
+
+
+
+
+
         extern void qt_event_request_menubarupdate(); //qapplication_mac.cpp
         qt_event_request_menubarupdate();
@@ -1932 +1954 @@
     // if the menu bar belongs to an ancestor of modalWidget:
     return qt_mac_is_ancestor(menuBar->parentWidget(), modalWidget);
-}
-
-static void cancelAllMenuTracking()
-{
-#ifdef QT_MAC_USE_COCOA
-    QMacCocoaAutoReleasePool pool;
-    NSMenu *mainMenu = [NSApp mainMenu];
-    [mainMenu cancelTracking];
-    for (NSMenuItem *item in [mainMenu itemArray]) {
-        if ([item submenu]) {
-            [[item submenu] cancelTracking];
-        }
-    }
-#endif
 }