Implement wxTextCtrl::SearchText() in wxQt

Closes wxWidgets#24899.
KingDEV95 · Jan 8, 2025 · 5319941 · 5319941
1 parent d8ba9ce
commit 5319941
Show file tree

Hide file tree

Showing 3 changed files with 52 additions and 1 deletion.
diff --git a/include/wx/qt/textctrl.h b/include/wx/qt/textctrl.h
@@ -85,6 +85,8 @@ class WXDLLIMPEXP_CORE wxTextCtrl : public wxTextCtrlBase
 
     virtual void SetMaxLength(unsigned long len) override;
 
+    virtual wxTextSearchResult SearchText(const wxTextSearch& search) const override;
+
 protected:
     virtual wxSize DoGetBestSize() const override;
 

diff --git a/src/qt/textctrl.cpp b/src/qt/textctrl.cpp
@@ -48,6 +48,7 @@ class wxQtEdit
     virtual wxTextCtrlHitTestResult HitTest(const wxPoint& pt, long *pos) const = 0;
     virtual void WriteText( const wxString &text ) = 0;
     virtual void SetMaxLength(unsigned long len) = 0;
+    virtual wxTextSearchResult SearchText(const wxTextSearch& search) const = 0;
     virtual void MarkDirty() = 0;
     virtual void DiscardEdits() = 0;
     virtual void blockSignals(bool block) = 0;
@@ -291,6 +292,44 @@ class wxQtMultiLineEdit : public wxQtEdit
         wxMISSING_IMPLEMENTATION("not implemented for multiline control");
     }
 
+    virtual wxTextSearchResult SearchText(const wxTextSearch& search) const override
+    {
+        // set up the flags
+        QTextDocument::FindFlags options;
+
+        if ( search.m_direction == wxTextSearch::Direction::Up )
+        {
+            options |= QTextDocument::FindBackward;
+        }
+        if ( search.m_wholeWord )
+        {
+            options |= QTextDocument::FindWholeWords;
+        }
+        if ( search.m_matchCase )
+        {
+            options |= QTextDocument::FindCaseSensitively;
+        }
+
+        const auto searchValue = wxQtConvertString(search.m_searchValue);
+        const auto startPos = search.m_startingPosition != -1
+                            ? search.m_startingPosition // user-provided start
+                            : (search.m_direction == wxTextSearch::Direction::Down) ?
+                                // if going down, then start from 0; otherwise, start from end
+                                0 : m_edit->document()->characterCount()-1;
+
+        const auto cursor = m_edit->document()->find(searchValue, startPos, options);
+
+        wxTextSearchResult result;
+
+        if ( !cursor.isNull() )
+        {
+            result.m_start = cursor.selectionStart();
+            result.m_end = cursor.selectionEnd();
+        }
+
+        return result;
+    }
+
     virtual void MarkDirty() override
     {
         return m_edit->setWindowModified( true );
@@ -475,6 +514,11 @@ class wxQtSingleLineEdit : public wxQtEdit
         m_edit->setMaxLength(len);
     }
 
+    virtual wxTextSearchResult SearchText(const wxTextSearch& WXUNUSED(search)) const override
+    {
+        return {};
+    }
+
     virtual void MarkDirty() override
     {
         return m_edit->setModified( true );
@@ -903,4 +947,9 @@ void wxTextCtrl::DoSetValue( const wxString &text, int flags )
     }
 }
 
+wxTextSearchResult wxTextCtrl::SearchText(const wxTextSearch& search) const
+{
+    return m_qtEdit->SearchText(search);
+}
+
 #endif // wxUSE_TEXTCTRL
diff --git a/tests/controls/textctrltest.cpp b/tests/controls/textctrltest.cpp
@@ -1487,7 +1487,7 @@ TEST_CASE("wxTextCtrl::Get/SetRTFValue", "[wxTextCtrl][rtf]")
 }
 #endif
 
-#if defined(__WXMSW__) || defined(__WXGTK3__)
+#if defined(__WXMSW__) || defined(__WXGTK3__) || defined(__WXQT__)
 TEST_CASE("wxTextCtrl::SearchText", "[wxTextCtrl][search]")
 {
     wxWindow* const parent = wxTheApp->GetTopWindow();