don't draw borders for bitmap buttons with wxBORDER_NONE style

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

diff --git a/include/wx/textentry.h b/include/wx/textentry.h
index 1194b61f90f0cf0ef00baca474e37f814645c943..cdf6e522a4622b2a321c8d4ab05306d5276d8152 100644 (file)
--- a/include/wx/textentry.h
+++ b/include/wx/textentry.h
@@ -17,6 +17,7 @@ typedef long wxTextPos;
 
 class WXDLLIMPEXP_FWD_BASE wxArrayString;
 class WXDLLIMPEXP_FWD_CORE wxTextEntryHintData;
 
 class WXDLLIMPEXP_FWD_BASE wxArrayString;
 class WXDLLIMPEXP_FWD_CORE wxTextEntryHintData;

+class WXDLLIMPEXP_FWD_CORE wxWindow;

 
 // ----------------------------------------------------------------------------
 // wxTextEntryBase
 
 // ----------------------------------------------------------------------------
 // wxTextEntryBase


@@ -44,7 +45,7 @@ public:
     virtual void WriteText(const wxString& text) = 0;
     virtual void AppendText(const wxString& text);
 
     virtual void WriteText(const wxString& text) = 0;
     virtual void AppendText(const wxString& text);
 

-    virtual wxString GetValue() const = 0;
+    virtual wxString GetValue() const;

     virtual wxString GetRange(long from, long to) const;
     bool IsEmpty() const { return GetLastPosition() <= 0; }
 
     virtual wxString GetRange(long from, long to) const;
     bool IsEmpty() const { return GetLastPosition() <= 0; }
 


@@ -152,6 +153,12 @@ protected:
     };
 
     virtual void DoSetValue(const wxString& value, int flags);
     };
 
     virtual void DoSetValue(const wxString& value, int flags);

+    virtual wxString DoGetValue() const = 0;
+
+    // override this to return the associated window, it will be used for event
+    // generation and also by generic hints implementation
+    virtual wxWindow *GetEditableWindow() = 0;
+

 
     // class which should be used to temporarily disable text change events
     //
 
     // class which should be used to temporarily disable text change events
     //


@@ -184,11 +191,6 @@ protected:
     bool EventsAllowed() const { return m_eventsBlock == 0; }
 
 private:
     bool EventsAllowed() const { return m_eventsBlock == 0; }
 
 private:

-    // override this to return the associated window, it will be used for event
-    // generation and also by generic hints implementation
-    virtual wxWindow *GetEditableWindow() = 0;
-
-

     // suppress or resume the text changed events generation: don't use these
     // functions directly, use EventsSuppressor class above instead
     void SuppressTextChangedEvents()
     // suppress or resume the text changed events generation: don't use these
     // functions directly, use EventsSuppressor class above instead
     void SuppressTextChangedEvents()