X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ff805cac748d91edbf55d82a7f1b567d5d4d3cc0..616c0d1f3ac084bb92f0a75dc48812e8647f1b22:/include/wx/gtk/textctrl.h?ds=sidebyside diff --git a/include/wx/gtk/textctrl.h b/include/wx/gtk/textctrl.h index 28554b1f96..336a5cfa2e 100644 --- a/include/wx/gtk/textctrl.h +++ b/include/wx/gtk/textctrl.h @@ -63,6 +63,7 @@ public: virtual void DiscardEdits(); virtual bool SetStyle(long start, long end, const wxTextAttr& style); + virtual bool GetStyle(long position, wxTextAttr& style); // translate between the position (which is just an index in the text ctrl // considering all its contents as a single strings) and (x, y) coordinates @@ -121,11 +122,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 +144,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 +155,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(); @@ -171,6 +167,8 @@ protected: virtual void DoSetValue(const wxString &value, int flags = 0); + virtual wxPoint DoPositionToCoords(long pos) const; + // wrappers hiding the differences between functions doing the same thing // for GtkTextView and GtkEntry (all of them use current window style to // set the given characteristic) @@ -182,8 +180,8 @@ protected: private: // overridden wxTextEntry virtual methods - virtual const wxWindow *GetEditableWindow() const { return this; } virtual GtkEditable *GetEditable() const; + virtual GtkEntry *GetEntry() const; virtual void EnableTextChangedEvents(bool enable); // change the font for everything in this control @@ -200,8 +198,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,14 +215,11 @@ 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; + GSList* m_anonymousMarkList; // For wxTE_AUTO_URL void OnUrlMouseEvent(wxMouseEvent&); - GdkCursor *m_gdkHandCursor; - GdkCursor *m_gdkXTermCursor; DECLARE_EVENT_TABLE() DECLARE_DYNAMIC_CLASS(wxTextCtrl)