Mercurial > hg > svapp

diff framework/MainWindowBase.h @ 364:8b631ce73b1c tony_integration
Merge from default branch
author: Chris Cannam
date: Tue, 17 Jun 2014 13:16:38 +0100
parents: 4969e7921931
children: 337cdb5e5b06 0876ea394902
--- a/framework/MainWindowBase.h	Thu May 08 15:04:42 2014 +0100
+++ b/framework/MainWindowBase.h	Tue Jun 17 13:16:38 2014 +0100
@@ -284,6 +284,8 @@
 
     virtual void newerVersionAvailable(QString) { }
 
+    virtual void menuActionMapperInvoked(QObject *);
+
 protected:
     QString                  m_sessionFile;
     QString                  m_audioFile;
@@ -412,6 +414,11 @@
     virtual void updateVisibleRangeDisplay(Pane *p) const = 0;
     virtual void updatePositionStatusDisplays() const = 0;
 
+    // Call this after setting up the menu bar, to fix up single-key
+    // shortcuts on OS/X
+    virtual void finaliseMenus();
+    virtual void finaliseMenu(QMenu *);
+
     virtual bool shouldCreateNewSessionForRDFAudio(bool *) { return true; }
 
     virtual void connectLayerEditDialog(ModelDataTableDialog *dialog);