No real changes, just add wxSizerItem::AddBorderToSize() helper.

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

diff --git a/include/wx/gtk/textentry.h b/include/wx/gtk/textentry.h
index eb329722cd28ea830fa853abf296fe41a5b969c9..a2ec262c84db87f88673bf89d5819e90c81352b3 100644 (file)
--- 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;
 #define _WX_GTK_TEXTENTRY_H_
 
 typedef struct _GtkEditable GtkEditable;

+typedef struct _GtkEntry GtkEntry;

 
 // ----------------------------------------------------------------------------
 // wxTextEntry: roughly corresponds to GtkEditable
 
 // ----------------------------------------------------------------------------
 // wxTextEntry: roughly corresponds to GtkEditable


@@ -24,7 +25,6 @@ public:
 
     // implement wxTextEntryBase pure virtual methods
     virtual void WriteText(const wxString& text);
 
     // 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();
     virtual void Remove(long from, long to);
 
     virtual void Copy();


@@ -43,8 +43,6 @@ public:
     virtual void SetSelection(long from, long to);
     virtual void GetSelection(long *from, long *to) const;
 
     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);
 
     virtual bool IsEditable() const;
     virtual void SetEditable(bool editable);
 


@@ -53,14 +51,27 @@ public:
     // implementation only from now on
     void SendMaxLenEvent();
 
     // 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:
+    // 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);
+
+    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);
+
+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 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_
 };
 
 #endif // _WX_GTK_TEXTENTRY_H_