Fix recursion problems when loading pages from a virtual file system using the WebKit...

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

diff --git a/include/wx/osx/textentry.h b/include/wx/osx/textentry.h
index c55523830b7a956d4260dd96783b248c7adb24bb..b51e97bbd560da781b6172b4ddb793b140719a11 100644 (file)
--- a/include/wx/osx/textentry.h
+++ b/include/wx/osx/textentry.h
@@ -4,7 +4,7 @@
 // Author:      Stefan Csomor
 // Modified by: Kevin Ollivier
 // Created:     1998-01-01
 // Author:      Stefan Csomor
 // Modified by: Kevin Ollivier
 // Created:     1998-01-01

-// RCS-ID:      $Id: textctrl.h 62531 2009-11-01 00:58:04Z KO $
+// RCS-ID:      $Id$

 // Copyright:   (c) Stefan Csomor
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) Stefan Csomor
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////


@@ -32,12 +32,8 @@ class WXDLLIMPEXP_CORE wxTextEntry: public wxTextEntryBase
 {
 
 public:
 {
 
 public:

-    wxTextEntry() 
-        : m_editable(true),
-          m_maxLength(0)
-    { }
-    
-    virtual ~wxTextEntry() {};
+    wxTextEntry();
+    virtual ~wxTextEntry();

 
     virtual bool IsEditable() const;
 
 
     virtual bool IsEditable() const;
 


@@ -88,10 +84,18 @@ public:
     // --------------
 
     virtual wxTextWidgetImpl * GetTextPeer() const;
     // --------------
 
     virtual wxTextWidgetImpl * GetTextPeer() const;

+    wxTextCompleter *OSXGetCompleter() const { return m_completer; }
+

 protected:
 
     virtual wxString DoGetValue() const;
 protected:
 
     virtual wxString DoGetValue() const;

-    
+
+    virtual bool DoAutoCompleteStrings(const wxArrayString& choices);
+    virtual bool DoAutoCompleteCustom(wxTextCompleter *completer);
+
+    // The object providing auto-completions or NULL if none.
+    wxTextCompleter *m_completer;
+

     bool  m_editable;
 
   // need to make this public because of the current implementation via callbacks
     bool  m_editable;
 
   // need to make this public because of the current implementation via callbacks