Mercurial > hg > octave-nkf
changeset 19786:4fe86a372f10 gui-release
Fix compilation error when building without QScintilla
* main-window.cc (main_window::confirm_exit_octave,
main_window::connect_visibility_changed, main_window::focus_changed):
Add #ifdef HAVE_QSCINTILLA around editor_window.
author | Mike Miller <mtmiller@ieee.org> |
---|---|
date | Sun, 18 Jan 2015 18:33:43 -0500 |
parents | 722ff3e45bea |
children | 6d75f1683ce8 |
files | libgui/src/main-window.cc |
diffstat | 1 files changed, 6 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/libgui/src/main-window.cc +++ b/libgui/src/main-window.cc @@ -174,11 +174,13 @@ if (dock) break; // it is a QDockWidget ==> exit loop +#ifdef HAVE_QSCINTILLA if (qobject_cast <octave_qscintilla *> (w_new)) { dock = static_cast <octave_dock_widget *> (editor_window); break; // it is the editor window ==> exit loop } +#endif w_new = qobject_cast <QWidget *> (w_new->previousInFocusChain ()); if (w_new == start) @@ -1082,7 +1084,9 @@ foreach (octave_dock_widget *widget, dock_widget_list ()) widget->connect_visibility_changed (); +#ifdef HAVE_QSCINTILLA editor_window->enable_menu_shortcuts (false); +#endif } void @@ -2353,7 +2357,9 @@ } +#ifdef HAVE_QSCINTILLA closenow = editor_window->check_closing (1); // 1: exit request from gui +#endif return closenow; }