Mercurial > hg > octave-lyh

comparison libgui/src/m-editor/find-dialog.cc @ 15257:7ee62f559a73

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix compilation under Windows with GUI and LLVM enabled. * configure.ac (OCTGUI_DLL_DEFS): New substituted variabled. Define it to -DOCTGUI_DLL under MinGW and MSVC platforms. (QT_INCDIR, QT_LIBDIR): Replace backslash with forward slash characters. (OCTGUI_API): New config.h macro. * src/Makefile.am (MOC_CPPFLAGS): New variable. Define it to -DWIN32 when compiling Win32 terminal implementation. (moc-%.cc rule): Use it. (libqterminal_la_CPPFLAGS): New variable defined to -DWIN32 when compiling the win32 terminal implementation. (liboctgui_la_CPPFLAGS): Add @OCTGUI_DLL_DEFS@. * libgui/src/m-editor/file-editor-tab.cc (QApplication, QFileDialog, QTextStream): New includes. * libgui/src/m-editor/find-dialog.cc (find_dialog::search_next): Temporary fix for compilation with QScintilla < 2.6. * libgui/src/main-window.cc (QApplication, QLabel): New includes. * libgui/src/octave-gui.h (octave_start_gui): Decorate with OCTGUI_API.
author Michael Goffioul <michael.goffioul@gmail.com>
date Thu, 30 Aug 2012 15:52:44 +0100
parents 017f0b2e6933
children ae9079bbc627
comparison
equal deleted inserted replaced
15256:79baa37fde7a 15257:7ee62f559a73
143 _case_check_box->isChecked (), 143 _case_check_box->isChecked (),
144 _whole_words_check_box->isChecked (), 144 _whole_words_check_box->isChecked (),
145 _wrap_check_box->isChecked (), 145 _wrap_check_box->isChecked (),
146 !_backward_check_box->isChecked (), 146 !_backward_check_box->isChecked (),
147 line,col, 147 line,col,
148 true,
149 true 148 true
149 // FIXME: write a proper configure test (is it worth?)
150 #if QSCINTILLA_VERSION >= 0x020600
151 , true
152 #endif
150 ); 153 );
151 } 154 }
152 } 155 }
153 156
154 157