Mercurial > hg > octave-lyh

comparison libgui/src/m-editor/find-dialog.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 36ececf69385
children 38348a6c3db0
comparison
equal deleted inserted replaced
15872:1733bd181cb6 15873:7d300b85ee25
40 ****************************************************************************/ 40 ****************************************************************************/
41 41
42 #ifdef HAVE_CONFIG_H 42 #ifdef HAVE_CONFIG_H
43 #include <config.h> 43 #include <config.h>
44 #endif 44 #endif
45
46 #ifdef HAVE_QSCINTILLA
45 47
46 #include <QtGui> 48 #include <QtGui>
47 #include <QIcon> 49 #include <QIcon>
48 #include "find-dialog.h" 50 #include "find-dialog.h"
49 51
197 _find_result_available = _edit_area->findNext(); // and find next 199 _find_result_available = _edit_area->findNext(); // and find next
198 } 200 }
199 } 201 }
200 // TODO: Show number of replaced strings 202 // TODO: Show number of replaced strings
201 } 203 }
204
205 #endif