INTEGRATION: CWS aquavcl07 (1.7.34); FILE MERGED

2008/05/19 11:33:04 pl 1.7.34.8: switch off native menus for testtool
2008/05/14 13:55:55 pl 1.7.34.7: #i78832# work on a copy of menu
2008/05/13 14:39:42 fne 1.7.34.6: #i78832# remove leading separator
2008/05/08 12:24:32 fne 1.7.34.5: #i78832# implementation of native context menus for aqua
2008/04/17 05:40:09 pl 1.7.34.4: RESYNC: (1.7-1.8); FILE MERGED
2008/04/10 11:44:06 pl 1.7.34.3: #i87004# menu translations on mac
2008/04/07 16:10:09 pl 1.7.34.2: #i86435# remap Command to MOD1 and Ctrl to MOD3
2008/04/04 12:33:44 pl 1.7.34.1: #i87044# localized menu entries

vcl/aqua/source/window/salmenu.cxx

@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: salmenu.cxx,v $
- * $Revision: 1.9 $
+ * $Revision: 1.10 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -35,6 +35,8 @@
 #include "salframe.h"
 #include "vcl/svids.hrc"
 #include "vcl/cmdevt.hxx"
+#include "vcl/floatwin.hxx"
+#include "vcl/window.h"
 #include "vcl/window.hxx"
 #include "vcl/svapp.hxx"
 #include "rtl/ustrbuf.hxx"
@@ -273,6 +275,88 @@ AquaSalMenu::~AquaSalMenu()
     }
 }
 
+sal_Int32 removeUnusedItemsRunner(NSMenu * pMenu)
+{
+    NSArray * elements = [pMenu itemArray];
+    NSEnumerator * it = [elements objectEnumerator];
+    id elem;
+    NSMenuItem * lastDisplayedMenuItem = nil;
+    sal_Int32 drawnItems = 0;
+    bool firstEnabledItemIsNoSeparator = false;
+    while((elem=[it nextObject]) != nil) {
+        NSMenuItem * item = static_cast<NSMenuItem *>(elem);
+        if( (![item isEnabled] && ![item isSeparatorItem]) || ([item isSeparatorItem] && (lastDisplayedMenuItem != nil && [lastDisplayedMenuItem isSeparatorItem])) ) {
+            [[item menu]removeItem:item];
+        } else {
+            if( ! firstEnabledItemIsNoSeparator && [item isSeparatorItem] ) {
+                [[item menu]removeItem:item];
+            } else {
+                firstEnabledItemIsNoSeparator = true;
+                lastDisplayedMenuItem = item;
+                drawnItems++;
+                if( [item hasSubmenu] ) {
+                    removeUnusedItemsRunner( [item submenu] );
+                }
+            }
+        }
+    }
+    if( lastDisplayedMenuItem != nil && [lastDisplayedMenuItem isSeparatorItem]) {
+        [[lastDisplayedMenuItem menu]removeItem:lastDisplayedMenuItem];
+    }
+    return drawnItems;
+}
+
+BOOL AquaSalMenu::ShowNativePopupMenu(FloatingWindow * pWin, const Rectangle& rRect, ULONG nFlags)
+{
+    // do not use native popup menu when AQUA_NATIVE_MENUS is set to FALSE
+    if( ! VisibleMenuBar() ) {
+        return FALSE;
+    }
+
+    // set offsets for positioning
+    const float offset = 9.0;
+    const float lineHeight = 17.0;
+
+    // get the pointers
+    AquaSalFrame * pParentAquaSalFrame = (AquaSalFrame *) pWin->ImplGetWindowImpl()->mpRealParent->ImplGetFrame();
+    NSWindow * pParentNSWindow = pParentAquaSalFrame->mpWindow;
+    NSView * pParentNSView = [pParentNSWindow contentView];
+    NSView * pPopupNSView = ((AquaSalFrame *) pWin->ImplGetWindow()->ImplGetFrame())->mpView;
+    NSRect popupFrame = [pPopupNSView frame];
+
+    // since we manipulate the menu below (removing entries)
+    // let's rather make a copy here and work with that
+    NSMenu* pCopyMenu = [mpMenu copy];
+
+    // filter disabled elements
+    sal_Int32 drawnItems = removeUnusedItemsRunner( pCopyMenu );
+
+    // create frame rect
+    NSRect displayPopupFrame = NSMakeRect( rRect.nLeft+(offset-1), rRect.nTop+(offset+1), popupFrame.size.width, 0 );
+    pParentAquaSalFrame->VCLToCocoa(displayPopupFrame, false);
+
+    // adjust frame rect when necessary
+    USHORT nArrangeIndex;
+    Point position = pWin->ImplCalcPos( pWin, rRect, nFlags, nArrangeIndex );
+    if( position.nB < rRect.nTop ) {
+        displayPopupFrame.origin.y += ( lineHeight*drawnItems );
+    }
+    if( position.nA < rRect.nLeft ) {
+        displayPopupFrame.origin.x -= popupFrame.size.width;
+    }
+
+    // open popup menu
+    NSPopUpButtonCell * pPopUpButtonCell = [[NSPopUpButtonCell alloc] initTextCell:@"" pullsDown:NO];
+    [pPopUpButtonCell setMenu: pCopyMenu];
+    [pPopUpButtonCell selectItem:nil];
+    [pPopUpButtonCell performClickWithFrame:displayPopupFrame inView:pParentNSView];
+    [pPopUpButtonCell release];
+
+    // clean up the copy
+    [pCopyMenu release];
+    return TRUE;
+}
+
 int AquaSalMenu::getItemIndexByPos( USHORT nPos ) const
 {
     int nIndex = 0;
@@ -409,7 +493,7 @@ BOOL AquaSalMenu::VisibleMenuBar()
 
     static const char *pExperimental = getenv ("AQUA_NATIVE_MENUS");
 
-    if ( pExperimental && !strcasecmp(pExperimental, "FALSE") )
+    if ( GetSalData()->mbIsTestTool || (pExperimental && !strcasecmp(pExperimental, "FALSE")) )
         return FALSE;
 
     // End of experimental code enable/disable part