don't draw borders for bitmap buttons with wxBORDER_NONE style

[wxWidgets.git] / include / wx / x11 / textctrl.h

diff --git a/include/wx/x11/textctrl.h b/include/wx/x11/textctrl.h
index 197acb64b560372dc9cfdafe2f246d9a27766f06..b076e0ec7288b3800bd23f9c418dd189fe3e8eac 100644 (file)
--- a/include/wx/x11/textctrl.h
+++ b/include/wx/x11/textctrl.h
@@ -21,13 +21,12 @@
 
 #include "wx/scrolwin.h"
 #include "wx/arrstr.h"
 
 #include "wx/scrolwin.h"
 #include "wx/arrstr.h"

-#include "wx/datetime.h"

 
 //-----------------------------------------------------------------------------
 // classes
 //-----------------------------------------------------------------------------
 
 
 //-----------------------------------------------------------------------------
 // classes
 //-----------------------------------------------------------------------------
 

-class WXDLLIMPEXP_CORE wxTextCtrl;
+class WXDLLIMPEXP_FWD_CORE wxTextCtrl;

 
 //-----------------------------------------------------------------------------
 // helpers
 
 //-----------------------------------------------------------------------------
 // helpers


@@ -116,8 +115,7 @@ public:
     // implement base class pure virtuals
     // ----------------------------------
 
     // implement base class pure virtuals
     // ----------------------------------
 

-    virtual wxString GetValue() const;
-    virtual void SetValue(const wxString& value);
+    virtual void ChangeValue(const wxString &value);

 
     virtual int GetLineLength(long lineNo) const;
     virtual wxString GetLineText(long lineNo) const;
 
     virtual int GetLineLength(long lineNo) const;
     virtual wxString GetLineText(long lineNo) const;


@@ -129,10 +127,6 @@ public:
     // more readable flag testing methods
     // ----------------------------------
 
     // more readable flag testing methods
     // ----------------------------------
 

-#if 0
-    // it seems now in wxTextCtrlBase
-    bool IsSingleLine() const { return !(GetWindowStyle() & wxTE_MULTILINE); }
-#endif

     bool IsPassword() const { return (GetWindowStyle() & wxTE_PASSWORD) != 0; }
     bool WrapLines() const { return false; }
 
     bool IsPassword() const { return (GetWindowStyle() & wxTE_PASSWORD) != 0; }
     bool WrapLines() const { return false; }
 


@@ -210,9 +204,6 @@ public:
 
     void SetModified() { m_modified = true; }
 
 
     void SetModified() { m_modified = true; }
 

-    virtual void Freeze();
-    virtual void Thaw();
-

     // textctrl specific scrolling
     virtual bool ScrollLines(int lines);
     virtual bool ScrollPages(int pages);
     // textctrl specific scrolling
     virtual bool ScrollLines(int lines);
     virtual bool ScrollPages(int pages);


@@ -271,6 +262,8 @@ protected:
 
     virtual wxSize DoGetBestSize() const;
 
 
     virtual wxSize DoGetBestSize() const;
 

+    virtual void DoSetValue(const wxString& value, int flags = 0);
+

     friend class wxSourceUndoStep;
 
     wxSourceLineArray  m_lines;
     friend class wxSourceUndoStep;
 
     wxSourceLineArray  m_lines;


@@ -366,7 +359,7 @@ private:
 // wxTextCtrl types
 // ----------------------------------------------------------------------------
 
 // wxTextCtrl types
 // ----------------------------------------------------------------------------
 

-class WXDLLEXPORT wxStdTextCtrlInputHandler : public wxStdInputHandler
+class WXDLLIMPEXP_CORE wxStdTextCtrlInputHandler : public wxStdInputHandler

 {
 public:
     wxStdTextCtrlInputHandler(wxInputHandler *inphand) : wxStdInputHandler(inphand) {}
 {
 public:
     wxStdTextCtrlInputHandler(wxInputHandler *inphand) : wxStdInputHandler(inphand) {}