Mercurial > octave-nkf

comparison libgui/src/main-window.cc @ 19623:4fe86a372f10 gui-release

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 f9a944b9e1cb
children 37d37297acf8 4e85ca0b4887
comparison
equal deleted inserted replaced
19622:722ff3e45bea 19623:4fe86a372f10
172 { 172 {
173 dock = qobject_cast <octave_dock_widget *> (w_new); 173 dock = qobject_cast <octave_dock_widget *> (w_new);
174 if (dock) 174 if (dock)
175 break; // it is a QDockWidget ==> exit loop 175 break; // it is a QDockWidget ==> exit loop
176 176
177 #ifdef HAVE_QSCINTILLA
177 if (qobject_cast <octave_qscintilla *> (w_new)) 178 if (qobject_cast <octave_qscintilla *> (w_new))
178 { 179 {
179 dock = static_cast <octave_dock_widget *> (editor_window); 180 dock = static_cast <octave_dock_widget *> (editor_window);
180 break; // it is the editor window ==> exit loop 181 break; // it is the editor window ==> exit loop
181 } 182 }
183 #endif
182 184
183 w_new = qobject_cast <QWidget *> (w_new->previousInFocusChain ()); 185 w_new = qobject_cast <QWidget *> (w_new->previousInFocusChain ());
184 if (w_new == start) 186 if (w_new == start)
185 break; // we have arrived where we began ==> exit loop 187 break; // we have arrived where we began ==> exit loop
186 188
1080 main_window::connect_visibility_changed (void) 1082 main_window::connect_visibility_changed (void)
1081 { 1083 {
1082 foreach (octave_dock_widget *widget, dock_widget_list ()) 1084 foreach (octave_dock_widget *widget, dock_widget_list ())
1083 widget->connect_visibility_changed (); 1085 widget->connect_visibility_changed ();
1084 1086
1087 #ifdef HAVE_QSCINTILLA
1085 editor_window->enable_menu_shortcuts (false); 1088 editor_window->enable_menu_shortcuts (false);
1089 #endif
1086 } 1090 }
1087 1091
1088 void 1092 void
1089 main_window::copyClipboard (void) 1093 main_window::copyClipboard (void)
1090 { 1094 {
2351 if (ans != QMessageBox::Ok) 2355 if (ans != QMessageBox::Ok)
2352 return false; 2356 return false;
2353 2357
2354 } 2358 }
2355 2359
2360 #ifdef HAVE_QSCINTILLA
2356 closenow = editor_window->check_closing (1); // 1: exit request from gui 2361 closenow = editor_window->check_closing (1); // 1: exit request from gui
2362 #endif
2357 2363
2358 return closenow; 2364 return closenow;
2359 } 2365 }
2360 2366
2361 2367