X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/fa2f57be4db838388659fe48dbf5546daf5364f8..55ca41b1ea89c0e6ccf84973091bea8b936eee06:/include/wx/textentry.h

diff --git a/include/wx/textentry.h b/include/wx/textentry.h
index 3050074282..28bffe9913 100644
--- 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
 // ----------------------------------------------------------------------------
@@ -43,7 +45,7 @@ public:
 
     virtual wxString GetValue() const = 0;
     virtual wxString GetRange(long from, long to) const;
-    bool IsEmpty() const { return GetValue().empty(); }
+    bool IsEmpty() const { return GetLastPosition() <= 0; }
 
 
     // editing operations
@@ -52,6 +54,7 @@ public:
     virtual void Replace(long from, long to, const wxString& value);
     virtual void Remove(long from, long to) = 0;
     virtual void Clear() { SetValue(wxString()); }
+    void RemoveSelection();
 
 
     // clipboard operations
@@ -89,14 +92,34 @@ public:
     // ---------
 
     virtual void SetSelection(long from, long to) = 0;
-    virtual void SelectAll() { SetSelection(0, GetLastPosition()); }
+    virtual void SelectAll() { SetSelection(-1, -1); }
     virtual void GetSelection(long *from, long *to) const = 0;
     bool HasSelection() const;
     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;
 
@@ -125,13 +148,11 @@ protected:
     {
     public:
         EventsSuppressor(wxTextEntryBase *text, bool suppress = true)
+            : m_text(text),
+              m_suppress(suppress)
         {
-            m_suppress = suppress;
             if ( m_suppress )
-            {
-                m_text = text;
                 m_text->SuppressTextChangedEvents();
-            }
         }
 
         ~EventsSuppressor()
@@ -145,6 +166,8 @@ protected:
         bool m_suppress;
     };
 
+    friend class EventsSuppressor;
+
     // return true if the events are currently not suppressed
     bool EventsAllowed() const { return m_eventsBlock == 0; }
 
@@ -171,17 +194,24 @@ private:
     // initially the generation of the events is enabled
     virtual void EnableTextChangedEvents(bool WXUNUSED(enable)) { }
 
-
-    friend class EventsSuppressor;
-
     // if this counter is non-null, events are blocked
     unsigned m_eventsBlock;
 };
 
-#ifdef __WXGTK20__
+#ifdef __WXUNIVERSAL__
+    // TODO: we need to use wxTextEntryDelegate here, but for now just prevent
+    //       the GTK/MSW classes from being used in wxUniv build
+    class WXDLLIMPEXP_CORE wxTextEntry : public wxTextEntryBase
+    {
+    };
+#elif defined(__WXGTK20__)
     #include "wx/gtk/textentry.h"
 #elif defined(__WXMSW__)
     #include "wx/msw/textentry.h"
+#elif defined(__WXMOTIF__)
+    #include "wx/motif/textentry.h"
+#elif defined(__WXPM__)
+    #include "wx/os2/textentry.h"
 #else
     // no platform-specific implementation of wxTextEntry yet
     class WXDLLIMPEXP_CORE wxTextEntry : public wxTextEntryBase