Mercurial > octave-nkf
changeset 20311:396e9cd6cd98
Avoid using HAVE_ macros in header file.
* find-dialog.h, find-dialog.cc
(find_dialog::handle_sel_search_changed,
find_dialog::handle_selection_changed): Unconditionally define.
| author | John W. Eaton <jwe@octave.org> |
|---|---|
| date | Wed, 24 Jun 2015 11:51:06 -0400 |
| parents | 92c0fead20da |
| children | 48d9001bdee3 |
| files | libgui/src/m-editor/find-dialog.cc libgui/src/m-editor/find-dialog.h |
| diffstat | 2 files changed, 5 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/libgui/src/m-editor/find-dialog.cc Wed Jun 24 11:47:14 2015 -0400 +++ b/libgui/src/m-editor/find-dialog.cc Wed Jun 24 11:51:06 2015 -0400 @@ -203,17 +203,19 @@ _find_result_available = false; } -#ifdef HAVE_QSCI_FINDSELECTION void find_dialog::handle_sel_search_changed (int selected) { +#ifdef HAVE_QSCI_FINDSELECTION _from_start_check_box->setEnabled (! selected); _find_result_available = false; +#endif } void find_dialog::handle_selection_changed (bool has_selected) { +#ifdef HAVE_QSCI_FINDSELECTION if (_rep_active) return; @@ -221,8 +223,8 @@ _find_result_available = false; if (! has_selected) _search_selection_check_box->setChecked (false); +#endif } -#endif // initialize search text with selected text if this is in one single line void
--- a/libgui/src/m-editor/find-dialog.h Wed Jun 24 11:47:14 2015 -0400 +++ b/libgui/src/m-editor/find-dialog.h Wed Jun 24 11:51:06 2015 -0400 @@ -79,10 +79,9 @@ void init_search_text (); private slots: -#ifdef HAVE_QSCI_FINDSELECTION void handle_sel_search_changed (int); void handle_selection_changed (bool has_selected); -#endif + void handle_backward_search_changed (int); void handle_search_text_changed (QString new_search_text);