added wxTLS_TYPE() macro

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

diff --git a/include/wx/gtk/textctrl.h b/include/wx/gtk/textctrl.h
index 28554b1f9661ddafd79754108ad3aec337471b26..19d716fcab6ed241425754fa539eb4d0c9eb44c9 100644 (file)
--- a/include/wx/gtk/textctrl.h
+++ b/include/wx/gtk/textctrl.h
@@ -121,11 +121,6 @@ public:
 
     void SetUpdateFont(bool WXUNUSED(update)) { }
 
 
     void SetUpdateFont(bool WXUNUSED(update)) { }
 

-    // 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();
-

     // implementation only from now on
 
     // tell the control to ignore next text changed signal
     // implementation only from now on
 
     // tell the control to ignore next text changed signal


@@ -148,9 +143,6 @@ public:
     static wxVisualAttributes
     GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL);
 
     static wxVisualAttributes
     GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL);
 

-    // has the control been frozen by Freeze()?
-    bool IsFrozen() const { return m_freezeCount > 0; }
-

 protected:
     // wxGTK-specific: called recursively by Enable,
     // to give widgets an oppprtunity to correct their colours after they
 protected:
     // wxGTK-specific: called recursively by Enable,
     // to give widgets an oppprtunity to correct their colours after they


@@ -162,6 +154,9 @@ protected:
     virtual void DoApplyWidgetStyle(GtkRcStyle *style);
     virtual GdkWindow *GTKGetWindow(wxArrayGdkWindows& windows) const;
 
     virtual void DoApplyWidgetStyle(GtkRcStyle *style);
     virtual GdkWindow *GTKGetWindow(wxArrayGdkWindows& windows) const;
 

+    virtual void DoFreeze();
+    virtual void DoThaw();
+

     // common part of all ctors
     void Init();
 
     // common part of all ctors
     void Init();
 


@@ -217,8 +212,6 @@ private:
     // a dummy one when frozen
     GtkTextBuffer *m_buffer;
 
     // a dummy one when frozen
     GtkTextBuffer *m_buffer;
 

-    // number of calls to Freeze() minus number of calls to Thaw()
-    unsigned m_freezeCount;

     GtkTextMark* m_showPositionOnThaw;
 
     // For wxTE_AUTO_URL
     GtkTextMark* m_showPositionOnThaw;
 
     // For wxTE_AUTO_URL