cleaning up problems after string changes

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

diff --git a/include/wx/univ/textctrl.h b/include/wx/univ/textctrl.h
index 2ec12ca172a505c7ae8e04f986291fe7fd872bb9..f126757e991fc3e8df58428ef693f69713baf2dd 100644 (file)
--- a/include/wx/univ/textctrl.h
+++ b/include/wx/univ/textctrl.h
@@ -105,9 +105,6 @@ public:
     // ----------------------------------
 
     virtual wxString GetValue() const;
     // ----------------------------------
 
     virtual wxString GetValue() const;

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

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


@@ -237,9 +234,8 @@ public:
     virtual bool Enable(bool enable = true);
 
     // more readable flag testing methods
     virtual bool Enable(bool enable = true);
 
     // more readable flag testing methods

-    bool IsPassword() const { return (GetWindowStyle() & wxTE_PASSWORD) != 0; }
-    bool WrapLines() const
-        { return !IsSingleLine() && !(GetWindowStyle() & wxHSCROLL); }
+    bool IsPassword() const { return HasFlag(wxTE_PASSWORD); }
+    bool WrapLines() const { return m_wrapLines; }

 
     // only for wxStdTextCtrlInputHandler
     void RefreshSelection();
 
     // only for wxStdTextCtrlInputHandler
     void RefreshSelection();


@@ -262,6 +258,9 @@ protected:
     // calc the size from the text extent
     virtual wxSize DoGetBestClientSize() const;
 
     // calc the size from the text extent
     virtual wxSize DoGetBestClientSize() const;
 

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

     // common part of all ctors
     void Init();
 
     // common part of all ctors
     void Init();
 


@@ -500,7 +499,8 @@ private:
     // flags
     bool m_isModified:1,
          m_isEditable:1,
     // flags
     bool m_isModified:1,
          m_isEditable:1,

-         m_hasCaret:1;
+         m_hasCaret:1,
+         m_wrapLines:1; // can't be changed after creation

 
     // the rectangle (in client coordinates) to draw text inside
     wxRect m_rectText;
 
     // the rectangle (in client coordinates) to draw text inside
     wxRect m_rectText;