Kaydet (Commit) db18cec8 authored tarafından Tor Lillqvist's avatar Tor Lillqvist

Bin ancient AQUA_NATIVE_MENUS=FALSE crack

Using the system ("native") menubar works fine since a long time
surely. No reason to keep a fallback possibility.

Change-Id: I0d9ed86c28b0d832c8123b18980740dbf895ec1c
Reviewed-on: https://gerrit.libreoffice.org/54775Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarTor Lillqvist <tml@collabora.com>
üst 158da868
...@@ -56,8 +56,6 @@ public: ...@@ -56,8 +56,6 @@ public:
virtual ~AquaSalMenu() override; virtual ~AquaSalMenu() override;
virtual bool VisibleMenuBar() override; virtual bool VisibleMenuBar() override;
// must return true to actually display native menu bars
// otherwise only menu messages are processed (eg, OLE on Windows)
virtual void InsertItem( SalMenuItem* pSalMenuItem, unsigned nPos ) override; virtual void InsertItem( SalMenuItem* pSalMenuItem, unsigned nPos ) override;
virtual void RemoveItem( unsigned nPos ) override; virtual void RemoveItem( unsigned nPos ) override;
......
...@@ -317,11 +317,6 @@ AquaSalMenu::~AquaSalMenu() ...@@ -317,11 +317,6 @@ AquaSalMenu::~AquaSalMenu()
bool AquaSalMenu::ShowNativePopupMenu(FloatingWindow * pWin, const tools::Rectangle& rRect, FloatWinPopupFlags nFlags) bool AquaSalMenu::ShowNativePopupMenu(FloatingWindow * pWin, const tools::Rectangle& rRect, FloatWinPopupFlags nFlags)
{ {
// do not use native popup menu when AQUA_NATIVE_MENUS is set to false
if( ! VisibleMenuBar() ) {
return false;
}
// set offsets for positioning // set offsets for positioning
const float offset = 9.0; const float offset = 9.0;
...@@ -488,17 +483,6 @@ void AquaSalMenu::removeFallbackMenuItem( NSMenuItem* pOldItem ) ...@@ -488,17 +483,6 @@ void AquaSalMenu::removeFallbackMenuItem( NSMenuItem* pOldItem )
bool AquaSalMenu::VisibleMenuBar() bool AquaSalMenu::VisibleMenuBar()
{ {
// Enable/disable experimental native menus code?
// To disable native menus, set the environment variable AQUA_NATIVE_MENUS to FALSE
static const char *pExperimental = getenv ("AQUA_NATIVE_MENUS");
if ( pExperimental && !strcasecmp(pExperimental, "FALSE") )
return false;
// End of experimental code enable/disable part
return true; return true;
} }
...@@ -811,7 +795,7 @@ void AquaSalMenu::statusLayout() ...@@ -811,7 +795,7 @@ void AquaSalMenu::statusLayout()
bool AquaSalMenu::AddMenuBarButton( const SalMenuButtonItem& i_rNewItem ) bool AquaSalMenu::AddMenuBarButton( const SalMenuButtonItem& i_rNewItem )
{ {
if( ! mbMenuBar || ! VisibleMenuBar() ) if( ! mbMenuBar )
return false; return false;
MenuBarButtonEntry* pEntry = findButtonItem( i_rNewItem.mnId ); MenuBarButtonEntry* pEntry = findButtonItem( i_rNewItem.mnId );
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment