detect and report errors in XRC specification of grid sizers

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

diff --git a/include/wx/x11/textctrl.h b/include/wx/x11/textctrl.h
index 01571cd0c3d523748c0035be4b3acf4e102219d3..b076e0ec7288b3800bd23f9c418dd189fe3e8eac 100644 (file)
--- a/include/wx/x11/textctrl.h
+++ b/include/wx/x11/textctrl.h
@@ -19,19 +19,14 @@
 #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/datetime.h"
 
 //-----------------------------------------------------------------------------
 // classes
 //-----------------------------------------------------------------------------
 
-class WXDLLIMPEXP_CORE wxTextCtrl;
+class WXDLLIMPEXP_FWD_CORE wxTextCtrl;
 
 //-----------------------------------------------------------------------------
 // helpers
@@ -120,8 +115,7 @@ public:
     // 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;
@@ -133,10 +127,6 @@ public:
     // 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; }
 
@@ -214,9 +204,6 @@ public:
 
     void SetModified() { m_modified = true; }
 
-    virtual void Freeze();
-    virtual void Thaw();
-
     // textctrl specific scrolling
     virtual bool ScrollLines(int lines);
     virtual bool ScrollPages(int pages);
@@ -275,6 +262,8 @@ protected:
 
     virtual wxSize DoGetBestSize() const;
 
+    virtual void DoSetValue(const wxString& value, int flags = 0);
+
     friend class wxSourceUndoStep;
 
     wxSourceLineArray  m_lines;
@@ -370,7 +359,7 @@ private:
 // wxTextCtrl types
 // ----------------------------------------------------------------------------
 
-class WXDLLEXPORT wxStdTextCtrlInputHandler : public wxStdInputHandler
+class WXDLLIMPEXP_CORE wxStdTextCtrlInputHandler : public wxStdInputHandler
 {
 public:
     wxStdTextCtrlInputHandler(wxInputHandler *inphand) : wxStdInputHandler(inphand) {}