Don't suppress accelerators that include Enter just because a tree control is focused

[wxWidgets.git] / include / wx / textentry.h

diff --git a/include/wx/textentry.h b/include/wx/textentry.h
index d8482d42f066db3c6f981406b3ca4f7c90a48984..415eb8b188638a774e451843190c88edfeff8fae 100644 (file)
--- a/include/wx/textentry.h
+++ b/include/wx/textentry.h
@@ -15,6 +15,8 @@
 // and should probably be replaced with int anyhow)
 typedef long wxTextPos;
 
+class WXDLLIMPEXP_FWD_BASE wxArrayString;
+
 // ----------------------------------------------------------------------------
 // wxTextEntryBase
 // ----------------------------------------------------------------------------
@@ -95,8 +97,28 @@ public:
     virtual wxString GetStringSelection() const;
 
 
+    // auto-completion
+    // ---------------
+
+    // these functions allow to auto-complete the text already entered into the
+    // control using either the given fixed list of strings, the paths from the
+    // file system or, in the future, an arbitrary user-defined completer
+    //
+    // they all return true if completion was enabled or false on error (most
+    // commonly meaning that this functionality is not available under the
+    // current platform)
+
+    virtual bool AutoComplete(const wxArrayString& WXUNUSED(choices))
+    {
+        return false;
+    }
+
+    virtual bool AutoCompleteFileNames() { return false; }
+
+
     // status
     // ------
+
     virtual bool IsEditable() const = 0;
     virtual void SetEditable(bool editable) = 0;
 
@@ -185,6 +207,8 @@ private:
     #include "wx/gtk/textentry.h"
 #elif defined(__WXMSW__)
     #include "wx/msw/textentry.h"
+#elif defined(__WXMOTIF__)
+    #include "wx/motif/textentry.h"
 #else
     // no platform-specific implementation of wxTextEntry yet
     class WXDLLIMPEXP_CORE wxTextEntry : public wxTextEntryBase