don't draw borders for bitmap buttons with wxBORDER_NONE style

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

diff --git a/include/wx/gtk/textentry.h b/include/wx/gtk/textentry.h
index ec565facee242c1f293fc7429459ebd4960bb51e..deab5219c41ef59b79dad2251a4701d3788c1762 100644 (file)
--- a/include/wx/gtk/textentry.h
+++ b/include/wx/gtk/textentry.h
@@ -24,7 +24,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,7 +42,7 @@ 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 void AutoComplete(const wxArrayString& choices);
+    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,11 +52,10 @@ 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:
+    virtual wxString DoGetValue() 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 or another widget
     // implementing GtkEditable
     virtual GtkEditable *GetEditable() const = 0;