reverted Julian's r44600, it broke help window behavior so that it prevented apps...

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

diff --git a/include/wx/x11/textctrl.h b/include/wx/x11/textctrl.h
index 01571cd0c3d523748c0035be4b3acf4e102219d3..ed385d7fe53f5ed2edca3d5996a3b5db60903ae7 100644 (file)
--- a/include/wx/x11/textctrl.h
+++ b/include/wx/x11/textctrl.h
@@ -19,19 +19,14 @@
 #include "wx/univ/textctrl.h"
 #else
 
 #include "wx/univ/textctrl.h"
 #else
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma interface "textctrl.h"
-#endif
-

 #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


@@ -120,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;


@@ -133,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; }
 


@@ -214,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);


@@ -275,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;