added WX_FORWARD_STD_METHODS_TO_SUBWINDOWS macro

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

diff --git a/include/wx/gtk1/textctrl.h b/include/wx/gtk1/textctrl.h
index f0a19349403538dfc528127afe6c34be12e9a7fa..2024575d7ddbb4e078e976a3b06857b99ef88275 100644 (file)
--- a/include/wx/gtk1/textctrl.h
+++ b/include/wx/gtk1/textctrl.h
@@ -160,7 +160,7 @@ public:
     // avoid horrible flicker/scrolling back and forth
     virtual void Freeze();
     virtual void Thaw();
     // 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);
     // textctrl specific scrolling
     virtual bool ScrollLines(int lines);
     virtual bool ScrollPages(int pages);


@@ -198,6 +198,11 @@ protected:
     // override this and return true.
     virtual bool UseGTKStyleBase() const { return true; }
 
     // override this and return true.
     virtual bool UseGTKStyleBase() const { return true; }
 

+#ifdef __WXGTK20__
+    // has the control been frozen by Freeze()?
+    bool IsFrozen() const { return m_frozenness > 0; }
+#endif
+ 

 private:
     // change the font for everything in this control
     void ChangeFontGlobally();
 private:
     // change the font for everything in this control
     void ChangeFontGlobally();


@@ -212,6 +217,15 @@ private:
 #endif // !__WXGTK20__
     bool        m_ignoreNextUpdate:1;
 
 #endif // !__WXGTK20__
     bool        m_ignoreNextUpdate:1;
 

+#ifdef __WXGTK20__
+    // Our text buffer. Convenient, and holds the buffer while using
+    // a dummy one when m_frozenness > 0
+    GtkTextBuffer *m_buffer;
+
+    // number of calls to Freeze() minus number of calls to Thaw()
+    unsigned int m_frozenness;
+#endif  
+

     DECLARE_EVENT_TABLE()
     DECLARE_DYNAMIC_CLASS(wxTextCtrl);
 };
     DECLARE_EVENT_TABLE()
     DECLARE_DYNAMIC_CLASS(wxTextCtrl);
 };