Mercurial > octave-nkf

comparison libgui/src/m-editor/file-editor.cc @ 15873:7d300b85ee25

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
allow build to proceed if either Qt or QScintilla is missing * configure.ac: Instead of aborting the configure script, set build_gui to "no" if Qt is missing. Don't abort configure script if QScintilla is missing. If QScintilla is available, define HAVE_QSCINTILLA. * file-editor-tab.cc, file-editor.cc, find-dialog.cc, lexer-octave-gui.cc: Surround file contents with #ifdef HAVE_QSCINTILLA. * main-window.cc (main_window::~main_window): Skip deletion of _file_editor if HAVE_QSCINTILLA is not defined. (main_window::new_file, main_window::open_file, main_window::focus_editor): Do nothing if HAVE_QSCINTILLA is not defined. (main_window::handle_entered_debug_mode, main_window::handle_quit_debug_mode): Skip operation on _file_editor if HAVE_QSCINTILLA is not defined. (main_window::construct): Skip creation of _file_editor and operations on it if HAVE_QSCINTILLA is not defined. * main-window.h (main_window::_file_editor): Omit data member from class if HAVE_QSCINTILLA is not defined.
author John W. Eaton <jwe@octave.org>
date Wed, 02 Jan 2013 14:29:50 -0500
parents f425e680925e
children 9cd14e53e906
comparison
equal deleted inserted replaced
15872:1733bd181cb6 15873:7d300b85ee25
21 */ 21 */
22 22
23 #ifdef HAVE_CONFIG_H 23 #ifdef HAVE_CONFIG_H
24 #include <config.h> 24 #include <config.h>
25 #endif 25 #endif
26
27 #ifdef HAVE_QSCINTILLA
26 28
27 #include "file-editor.h" 29 #include "file-editor.h"
28 #include "resource-manager.h" 30 #include "resource-manager.h"
29 #include <QVBoxLayout> 31 #include <QVBoxLayout>
30 #include <QApplication> 32 #include <QApplication>
815 connect (this, SIGNAL (fetab_find (const QWidget*)), 817 connect (this, SIGNAL (fetab_find (const QWidget*)),
816 f, SLOT (find (const QWidget*))); 818 f, SLOT (find (const QWidget*)));
817 819
818 _tab_widget->setCurrentWidget (f); 820 _tab_widget->setCurrentWidget (f);
819 } 821 }
822
823 #endif