X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/0ec1179b86dac6c87ad9f2cd126f87e92642c62c..03773e400b6ff2692f2a9ba045d652c3b7b7109d:/include/wx/gtk/textentry.h

diff --git a/include/wx/gtk/textentry.h b/include/wx/gtk/textentry.h
index 51cd3bd918..0af6c9a652 100644
--- a/include/wx/gtk/textentry.h
+++ b/include/wx/gtk/textentry.h
@@ -12,6 +12,7 @@
 #define _WX_GTK_TEXTENTRY_H_
 
 typedef struct _GtkEditable GtkEditable;
+typedef struct _GtkEntry GtkEntry;
 
 // ----------------------------------------------------------------------------
 // wxTextEntry: roughly corresponds to GtkEditable
@@ -24,7 +25,6 @@ public:
 
     // implement wxTextEntryBase pure virtual methods
     virtual void WriteText(const wxString& text);
-    virtual wxString GetValue() const;
     virtual void Remove(long from, long to);
 
     virtual void Copy();
@@ -43,26 +43,30 @@ public:
     virtual void SetSelection(long from, long to);
     virtual void GetSelection(long *from, long *to) const;
 
-    // status
+    virtual bool AutoComplete(const wxArrayString& choices);
+
     virtual bool IsEditable() const;
     virtual void SetEditable(bool editable);
 
-    // set the max number of characters which may be entered in a single line
-    // text control
     virtual void SetMaxLength(unsigned long len);
 
-
     // implementation only from now on
     void SendMaxLenEvent();
 
-private:
-    // implement this to return the associated window, it will be used for
-    // event generation
-    virtual const wxWindow *GetEditableWindow() const = 0;
+protected:
+    virtual wxString DoGetValue() const;
 
+    // margins functions
+    virtual bool DoSetMargins(const wxPoint& pt);
+    virtual wxPoint DoGetMargins() const;
+
+private:
     // implement this to return the associated GtkEntry or another widget
     // implementing GtkEditable
     virtual GtkEditable *GetEditable() const = 0;
+
+    // implement this to return the associated GtkEntry
+    virtual GtkEntry *GetEntry() const = 0;
 };
 
 #endif // _WX_GTK_TEXTENTRY_H_