Refactor wxTextEntry::AutoComplete() to simply call DoAutoCompleteXXX().

No real changes, just make the public AutoComplete() non-virtual and add
virtual DoAutoCompleteXXX() methods to make it easier to add new public
AutoComplete() overloads in the upcoming commits.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67509 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/gtk/textentry.h b/include/wx/gtk/textentry.h
index 0af6c9a652a59de86ac24794b4b359372969f181..cc69686650eaf52b40dc5a26a5e699a6badae415 100644 (file)
--- a/include/wx/gtk/textentry.h
+++ b/include/wx/gtk/textentry.h
@@ -43,8 +43,6 @@ public:
     virtual void SetSelection(long from, long to);
     virtual void GetSelection(long *from, long *to) const;
 
-    virtual bool AutoComplete(const wxArrayString& choices);
-
     virtual bool IsEditable() const;
     virtual void SetEditable(bool editable);
 
@@ -60,6 +58,8 @@ protected:
     virtual bool DoSetMargins(const wxPoint& pt);
     virtual wxPoint DoGetMargins() const;
 
+    virtual bool DoAutoCompleteStrings(const wxArrayString& choices);
+
 private:
     // implement this to return the associated GtkEntry or another widget
     // implementing GtkEditable

diff --git a/include/wx/msw/textentry.h b/include/wx/msw/textentry.h
index ade77243f2ce06ed6f2f70c460fc150007f81654..aa23df118cda02e55802531bde699fbc5b00f971 100644 (file)
--- a/include/wx/msw/textentry.h
+++ b/include/wx/msw/textentry.h
@@ -46,13 +46,6 @@ public:
         { DoSetSelection(from, to); }
     virtual void GetSelection(long *from, long *to) const;
 
-    // auto-completion uses COM under Windows so they won't work without
-    // wxUSE_OLE as OleInitialize() is not called then
-#if wxUSE_OLE
-    virtual bool AutoComplete(const wxArrayString& choices);
-    virtual bool AutoCompleteFileNames();
-#endif // wxUSE_OLE
-
     virtual bool IsEditable() const;
     virtual void SetEditable(bool editable);
 
@@ -80,6 +73,13 @@ protected:
     virtual bool DoSetMargins(const wxPoint& pt);
     virtual wxPoint DoGetMargins() const;
 
+    // auto-completion uses COM under Windows so they won't work without
+    // wxUSE_OLE as OleInitialize() is not called then
+#if wxUSE_OLE
+    virtual bool DoAutoCompleteStrings(const wxArrayString& choices);
+    virtual bool DoAutoCompleteFileNames();
+#endif // wxUSE_OLE
+
 private:
     // implement this to return the HWND of the EDIT control
     virtual WXHWND GetEditHWND() const = 0;

diff --git a/include/wx/textentry.h b/include/wx/textentry.h
index 3fadbd0322e93e4050310e5bb3c94aba7d1cb9d2..f72828925158674875df75ccdb59f621d2b396f7 100644 (file)
--- a/include/wx/textentry.h
+++ b/include/wx/textentry.h
@@ -112,12 +112,11 @@ public:
     // commonly meaning that this functionality is not available under the
     // current platform)
 
-    virtual bool AutoComplete(const wxArrayString& WXUNUSED(choices))
-    {
-        return false;
-    }
+    bool AutoComplete(const wxArrayString& choices)
+        { return DoAutoCompleteStrings(choices); }
 
-    virtual bool AutoCompleteFileNames() { return false; }
+    bool AutoCompleteFileNames()
+        { return DoAutoCompleteFileNames(); }
 
 
     // status
@@ -218,6 +217,14 @@ protected:
     virtual bool DoSetMargins(const wxPoint& pt);
     virtual wxPoint DoGetMargins() const;
 
+    // the derived classes should override these virtual methods to implement
+    // auto-completion, they do the same thing as their public counterparts but
+    // have different names to allow overriding just one of them without hiding
+    // the other one(s)
+    virtual bool DoAutoCompleteStrings(const wxArrayString& WXUNUSED(choices))
+        { return false; }
+    virtual bool DoAutoCompleteFileNames() { return false; }
+
 
     // class which should be used to temporarily disable text change events
     //

diff --git a/interface/wx/textentry.h b/interface/wx/textentry.h
index 74d7a88dc8cf99109cf832a50446026fe8a32c18..f29cc17239b335414ef234166794f47c84238245 100644 (file)
--- a/interface/wx/textentry.h
+++ b/interface/wx/textentry.h
@@ -58,7 +58,7 @@ public:
 
         @see AutoCompleteFileNames()
     */
-    virtual bool AutoComplete(const wxArrayString& choices);
+    bool AutoComplete(const wxArrayString& choices);
 
     /**
         Call this function to enable auto-completion of the text typed in a
@@ -76,7 +76,7 @@ public:
 
         @see AutoComplete()
     */
-    virtual bool AutoCompleteFileNames();
+    bool AutoCompleteFileNames();
 
     /**
         Returns @true if the selection can be copied to the clipboard.

diff --git a/src/gtk/textentry.cpp b/src/gtk/textentry.cpp
index 60ddcda95fbcdad3861c6c686c24db7549fd8e11..ef3a08bd278419763871f6deeada1414ffa3a34e 100644 (file)
--- a/src/gtk/textentry.cpp
+++ b/src/gtk/textentry.cpp
@@ -237,7 +237,7 @@ void wxTextEntry::GetSelection(long *from, long *to) const
 // auto completion
 // ----------------------------------------------------------------------------
 
-bool wxTextEntry::AutoComplete(const wxArrayString& choices)
+bool wxTextEntry::DoAutoCompleteStrings(const wxArrayString& choices)
 {
     GtkEntry * const entry = GTK_ENTRY(GetEditable());
     wxCHECK_MSG(entry, false, "auto completion doesn't work with this control");

diff --git a/src/msw/textentry.cpp b/src/msw/textentry.cpp
index b52704883d7ca4a009c41b195d4149e323f2b44c..654a82007be83269176c7f0b10393627108c2aad 100644 (file)
--- a/src/msw/textentry.cpp
+++ b/src/msw/textentry.cpp
@@ -303,7 +303,7 @@ void wxTextEntry::GetSelection(long *from, long *to) const
 // ----------------------------------------------------------------------------
 
 #if wxUSE_OLE
-bool wxTextEntry::AutoCompleteFileNames()
+bool wxTextEntry::DoAutoCompleteFileNames()
 {
 #ifdef HAS_AUTOCOMPLETE
     typedef HRESULT (WINAPI *SHAutoComplete_t)(HWND, DWORD);
@@ -337,7 +337,7 @@ bool wxTextEntry::AutoCompleteFileNames()
 #endif // HAS_AUTOCOMPLETE/!HAS_AUTOCOMPLETE
 }
 
-bool wxTextEntry::AutoComplete(const wxArrayString& choices)
+bool wxTextEntry::DoAutoCompleteStrings(const wxArrayString& choices)
 {
 #ifdef HAS_AUTOCOMPLETE
     // if we had an old enumerator we must reuse it as IAutoComplete doesn't