X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ff805cac748d91edbf55d82a7f1b567d5d4d3cc0..1ddb6d28576c3ab21f80d8a3815fcccb1545961c:/include/wx/gtk/textctrl.h?ds=sidebyside diff --git a/include/wx/gtk/textctrl.h b/include/wx/gtk/textctrl.h index 28554b1f96..a06a8a6345 100644 --- a/include/wx/gtk/textctrl.h +++ b/include/wx/gtk/textctrl.h @@ -121,11 +121,6 @@ public: 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 @@ -148,9 +143,6 @@ public: 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 @@ -162,6 +154,9 @@ protected: virtual void DoApplyWidgetStyle(GtkRcStyle *style); virtual GdkWindow *GTKGetWindow(wxArrayGdkWindows& windows) const; + virtual void DoFreeze(); + virtual void DoThaw(); + // common part of all ctors void Init(); @@ -200,8 +195,8 @@ private: // both void *GetTextObject() const { - return IsMultiLine() ? wx_static_cast(void *, m_buffer) - : wx_static_cast(void *, m_text); + return IsMultiLine() ? static_cast(m_buffer) + : static_cast(m_text); } @@ -217,8 +212,6 @@ private: // 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