Applied rowspan patch #15276 (dghart)

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

diff --git a/include/wx/gtk/textentry.h b/include/wx/gtk/textentry.h
index 0af6c9a652a59de86ac24794b4b359372969f181..c146e6ba69d71765855c4adb5efa320a75e85dc3 100644 (file)
--- a/include/wx/gtk/textentry.h
+++ b/include/wx/gtk/textentry.h
@@ -11,6 +11,7 @@
 #ifndef _WX_GTK_TEXTENTRY_H_
 #define _WX_GTK_TEXTENTRY_H_
 
+typedef struct _GdkEventKey GdkEventKey;
 typedef struct _GtkEditable GtkEditable;
 typedef struct _GtkEntry GtkEntry;
 
@@ -43,8 +44,6 @@ public:
     virtual void SetSelection(long from, long to);
     virtual void GetSelection(long *from, long *to) const;
 
-    virtual bool AutoComplete(const wxArrayString& choices);
-
     virtual bool IsEditable() const;
     virtual void SetEditable(bool editable);
 
@@ -52,14 +51,29 @@ public:
 
     // implementation only from now on
     void SendMaxLenEvent();
+    bool GTKEntryOnInsertText(const char* text);
 
 protected:
+    // This method must be called from the derived class Create() to connect
+    // the handlers for the clipboard (cut/copy/paste) events.
+    void GTKConnectClipboardSignals(GtkWidget* entry);
+
+    // And this one to connect "insert-text" signal.
+    void GTKConnectInsertTextSignal(GtkEntry* entry);
+
+
+    virtual void DoSetValue(const wxString& value, int flags);
     virtual wxString DoGetValue() const;
 
     // margins functions
     virtual bool DoSetMargins(const wxPoint& pt);
     virtual wxPoint DoGetMargins() const;
 
+    virtual bool DoAutoCompleteStrings(const wxArrayString& choices);
+
+    // Override the base class method to use GtkEntry IM context.
+    virtual int GTKIMFilterKeypress(GdkEventKey* event) const;
+
 private:
     // implement this to return the associated GtkEntry or another widget
     // implementing GtkEditable