Applied rowspan patch #15276 (dghart)

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

diff --git a/include/wx/gtk1/textctrl.h b/include/wx/gtk1/textctrl.h
index 5abad1b57b692c125d95c7d205d0f1e4fb90f7d2..de6a4034f1c68ff8112ee3318d637c05fb795b1c 100644 (file)
--- a/include/wx/gtk1/textctrl.h
+++ b/include/wx/gtk1/textctrl.h
@@ -42,8 +42,6 @@ public:
     // implement base class pure virtuals
     // ----------------------------------
 
-    virtual wxString GetValue() const;
-
     virtual int GetLineLength(long lineNo) const;
     virtual wxString GetLineText(long lineNo) const;
     virtual int GetNumberOfLines() const;
@@ -139,22 +137,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 OnEnabled( bool enabled ) ;
-
     // tell the control to ignore next text changed signal
     void IgnoreNextTextUpdate();
 
@@ -170,6 +158,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 +174,7 @@ protected:
     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