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 d7ba22c10b506f4116eadd92e40852ccabf89425..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;
 
 // and should probably be replaced with int anyhow)
 typedef long wxTextPos;
 

+class WXDLLIMPEXP_FWD_BASE wxArrayString;
+

 // ----------------------------------------------------------------------------
 // wxTextEntryBase
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // wxTextEntryBase
 // ----------------------------------------------------------------------------


@@ -95,8 +97,28 @@ public:
     virtual wxString GetStringSelection() 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
     // ------
     // status
     // ------

+

     virtual bool IsEditable() const = 0;
     virtual void SetEditable(bool editable) = 0;
 
     virtual bool IsEditable() const = 0;
     virtual void SetEditable(bool editable) = 0;
 


@@ -125,13 +147,11 @@ protected:
     {
     public:
         EventsSuppressor(wxTextEntryBase *text, bool suppress = true)
     {
     public:
         EventsSuppressor(wxTextEntryBase *text, bool suppress = true)

+            : m_text(text),
+              m_suppress(suppress)

         {
         {

-            m_suppress = suppress;

             if ( m_suppress )
             if ( m_suppress )

-            {
-                m_text = text;

                 m_text->SuppressTextChangedEvents();
                 m_text->SuppressTextChangedEvents();

-            }

         }
 
         ~EventsSuppressor()
         }
 
         ~EventsSuppressor()


@@ -145,6 +165,8 @@ protected:
         bool m_suppress;
     };
 
         bool m_suppress;
     };
 

+    friend class EventsSuppressor;
+

     // return true if the events are currently not suppressed
     bool EventsAllowed() const { return m_eventsBlock == 0; }
 
     // return true if the events are currently not suppressed
     bool EventsAllowed() const { return m_eventsBlock == 0; }
 


@@ -171,15 +193,22 @@ private:
     // initially the generation of the events is enabled
     virtual void EnableTextChangedEvents(bool WXUNUSED(enable)) { }
 
     // 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;
 };
 
     // 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"
     #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
 #else
     // no platform-specific implementation of wxTextEntry yet
     class WXDLLIMPEXP_CORE wxTextEntry : public wxTextEntryBase