X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8ef94bfc25eb21f1d3fa93b3d55c5a1ca18d8e62..9869c26285dc51d13607cddaa04f65ce983653a5:/include/wx/gtk1/textctrl.h

diff --git a/include/wx/gtk1/textctrl.h b/include/wx/gtk1/textctrl.h
index 29158f1e42..ebb07ea642 100644
--- a/include/wx/gtk1/textctrl.h
+++ b/include/wx/gtk1/textctrl.h
@@ -3,7 +3,6 @@
 // Purpose:
 // Author:      Robert Roebling
 // Created:     01/02/97
-// Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -28,7 +27,7 @@ public:
                const wxValidator& validator = wxDefaultValidator,
                const wxString &name = wxTextCtrlNameStr);
 
-    ~wxTextCtrl();
+    virtual ~wxTextCtrl();
 
     bool Create(wxWindow *parent,
                 wxWindowID id,
@@ -42,9 +41,6 @@ public:
     // implement base class pure virtuals
     // ----------------------------------
 
-    virtual wxString GetValue() const;
-    virtual void SetValue(const wxString& value);
-
     virtual int GetLineLength(long lineNo) const;
     virtual wxString GetLineText(long lineNo) const;
     virtual int GetNumberOfLines() const;
@@ -107,7 +103,7 @@ public:
     virtual void SetSelection(long from, long to);
     virtual void SetEditable(bool editable);
 
-    virtual bool Enable( bool enable = true );
+    virtual void DoEnable( bool enable );
 
     // Implementation from now on
     void OnDropFiles( wxDropFilesEvent &event );
@@ -140,22 +136,12 @@ public:
 
     void SetModified() { m_modified = true; }
 
-    // GTK+ textctrl is so dumb that you need to freeze/thaw it manually to
-    // avoid horrible flicker/scrolling back and forth
-    virtual void Freeze();
-    virtual void Thaw();
-
     // textctrl specific scrolling
     virtual bool ScrollLines(int lines);
     virtual bool ScrollPages(int pages);
 
     // implementation only from now on
 
-    // wxGTK-specific: called recursively by Enable,
-    // to give widgets an oppprtunity to correct their colours after they
-    // have been changed by Enable
-    virtual void OnParentEnable( bool enable ) ;
-
     // tell the control to ignore next text changed signal
     void IgnoreNextTextUpdate();
 
@@ -171,6 +157,10 @@ protected:
     // common part of all ctors
     void Init();
 
+    // overridden wxWindow methods
+    virtual void DoFreeze();
+    virtual void DoThaw();
+
     // get the vertical adjustment, if any, NULL otherwise
     GtkAdjustment *GetVAdj() const;
 
@@ -182,6 +172,9 @@ protected:
     // override this and return true.
     virtual bool UseGTKStyleBase() const { return true; }
 
+    virtual void DoSetValue(const wxString &value, int flags = 0);
+    virtual wxString DoGetValue() const;
+
 private:
     // change the font for everything in this control
     void ChangeFontGlobally();