Mercurial > octave-nkf
diff libgui/src/m-editor/file-editor.cc @ 18609:ebd063b7b1c6 gui-release
maint: Periodic merge of stable to gui-release.
| author | John W. Eaton <jwe@octave.org> |
|---|---|
| date | Thu, 20 Mar 2014 12:28:53 -0400 |
| parents | 26d15a57f45b bfb735b70978 |
| children | 086093fbdc1a |
line wrap: on
line diff
--- a/libgui/src/m-editor/file-editor.cc Sat Mar 15 16:29:46 2014 -0700 +++ b/libgui/src/m-editor/file-editor.cc Thu Mar 20 12:28:53 2014 -0400 @@ -965,8 +965,10 @@ // FIXME: what was the intended purpose of this unused variable? // QStyle *editor_style = QApplication::style (); - _menu_bar = new QMenuBar (editor_widget); +#if defined (Q_OS_MAC) + _menu_bar->setNativeMenuBar (false); +#endif _tool_bar = new QToolBar (editor_widget); _tool_bar->setMovable (true); _tab_widget = new QTabWidget (editor_widget);