Mercurial > octave-libgccjit
view libinterp/octave.h @ 18944:b2c4d6d461f0 gui-release
fix conflict between main and editor menus when using alt keys (bug #42659)
* file-editor.cc (enable_menu_shortcuts): new function enabling/disabling the
alt-key accelerators;
(m_add_menu): new function adding a menu and storing menu title with and
without the char & indicating the accelerator in a hash;
(construct): use m_add_menu for adding a new menu to the menu bar
* file-editor-interface.h: new virtual function enable_menu_shortcuts
* file-editor.h: new functions enable_menu_shortcuts amd m_add_menu, new hash
for storing the menu titles
* main-window.cc (connect_visibility_changed): disable editors menu shortcuts;
(enable_menu_shortcuts): new function enabling/disabling the
alt-key accelerators;
(m_add_menu): new function adding a menu and storing menu title with and
without the char & indicating the accelerator in a hash;
(construct_file_menu, construct_edit_menu, construct_debug_menu,
construct_window_menu, construct_help_menu, construct_news_menu):
use m_add_menu for adding a new menu to the menu bar;
(set_global_edit_shortcuts): enable/disable the main and the editors
menu shortcuts
author | Torsten <ttl@justmail.de> |
---|---|
date | Sun, 20 Jul 2014 20:44:30 +0200 |
parents | d63878346099 |
children |
line wrap: on
line source
/* Copyright (C) 2002-2013 John W. Eaton This file is part of Octave. Octave is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 3 of the License, or (at your option) any later version. Octave is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with Octave; see the file COPYING. If not, see <http://www.gnu.org/licenses/>. */ #if !defined (octave_octave_h) #define octave_octave_h 1 #ifdef __cplusplus extern "C" { #endif extern OCTINTERP_API int octave_main (int argc, char **argv, int embedded); extern OCTINTERP_API void octave_process_command_line (int argc, char **argv); extern OCTINTERP_API void octave_initialize_interpreter (int argc, char **argv, int embedded); extern OCTINTERP_API int octave_execute_interpreter (void); extern OCTINTERP_API int octave_cmdline_argc; extern OCTINTERP_API char **octave_cmdline_argv; extern OCTINTERP_API int octave_embedded; extern OCTINTERP_API int octave_starting_gui (void); extern OCTINTERP_API int octave_fork_gui (void); #ifdef __cplusplus } #endif #endif