correct access for virtuals, other minor corrections

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

diff --git a/include/wx/gtk/textctrl.h b/include/wx/gtk/textctrl.h
index b9129095636e51d39078d4897b00fbead6c4d2b9..b9b793eb19c62941410a4d3056b8f8476445b2cf 100644 (file)
--- a/include/wx/gtk/textctrl.h
+++ b/include/wx/gtk/textctrl.h
@@ -144,17 +144,11 @@ public:
 
     void SetUpdateFont(bool WXUNUSED(update)) { }
 
-    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,
@@ -163,11 +157,19 @@ public:
     virtual void OnParentEnable( bool enable ) ;
 
     // tell the control to ignore next text changed signal
-    void IgnoreNextTextUpdate();
+    void IgnoreNextTextUpdate() { m_ignoreNextUpdate = true; }
 
     // should we ignore the changed signal? always resets the flag
     bool IgnoreTextUpdate();
 
+    // call this to indicate that the control is about to be changed
+    // programmatically and so m_modified flag shouldn't be set
+    void DontMarkDirtyOnNextChange() { m_dontMarkDirty = true; }
+
+    // should we mark the control as dirty? always resets the flag
+    bool MarkDirtyOnChange();
+
+
     static wxVisualAttributes
     GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL);
 
@@ -178,13 +180,6 @@ protected:
     // common part of all ctors
     void Init();
 
-    // get the vertical adjustment, if any, NULL otherwise
-    GtkAdjustment *GetVAdj() const;
-
-    // scroll the control by the given number of pixels, return true if the
-    // scroll position changed
-    bool DoScroll(GtkAdjustment *adj, int diff);
-
     // Widgets that use the style->base colour for the BG colour should
     // override this and return true.
     virtual bool UseGTKStyleBase() const { return true; }
@@ -197,11 +192,10 @@ private:
     void ChangeFontGlobally();
 
     GtkWidget  *m_text;
-    GtkWidget  *m_vScrollbar;
 
     bool        m_modified:1;
-    bool        m_vScrollbarVisible:1;
     bool        m_ignoreNextUpdate:1;
+    bool        m_dontMarkDirty:1;
 
     // Our text buffer. Convenient, and holds the buffer while using
     // a dummy one when m_frozenness > 0