# HG changeset patch # User Mike Miller # Date 1421624023 18000 # Node ID 4fe86a372f10c3143a326bcae0f5c4bac63a4dd7 # Parent 722ff3e45bea16b2cfbe15398709543a0fb81ed7 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. diff -r 722ff3e45bea -r 4fe86a372f10 libgui/src/main-window.cc --- a/libgui/src/main-window.cc Sun Jan 18 17:53:41 2015 -0500 +++ b/libgui/src/main-window.cc Sun Jan 18 18:33:43 2015 -0500 @@ -174,11 +174,13 @@ if (dock) break; // it is a QDockWidget ==> exit loop +#ifdef HAVE_QSCINTILLA if (qobject_cast (w_new)) { dock = static_cast (editor_window); break; // it is the editor window ==> exit loop } +#endif w_new = qobject_cast (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; }