X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f40fdaa339e19bbdf60c9c065c82daae4ca77b36..32c19f25fce3a38f9e4cf1497761fd7364d7bc62:/include/wx/gtk/textctrl.h diff --git a/include/wx/gtk/textctrl.h b/include/wx/gtk/textctrl.h index 3832c956dc..6a52dba4f3 100644 --- a/include/wx/gtk/textctrl.h +++ b/include/wx/gtk/textctrl.h @@ -32,6 +32,8 @@ public: const wxValidator& validator = wxDefaultValidator, const wxString &name = wxTextCtrlNameStr); + ~wxTextCtrl(); + bool Create(wxWindow *parent, wxWindowID id, const wxString &value = wxEmptyString, @@ -88,6 +90,16 @@ public: virtual void ShowPosition(long pos); +#ifdef __WXGTK20__ + virtual wxTextCtrlHitTestResult HitTest(const wxPoint& pt, long *pos) const; + virtual wxTextCtrlHitTestResult HitTest(const wxPoint& pt, + wxTextCoord *col, + wxTextCoord *row) const + { + return wxTextCtrlBase::HitTest(pt, col, row); + } +#endif // __WXGTK20__ + // Clipboard operations virtual void Copy(); virtual void Cut(); @@ -104,12 +116,12 @@ public: virtual void SetInsertionPoint(long pos); virtual void SetInsertionPointEnd(); virtual long GetInsertionPoint() const; - virtual long GetLastPosition() const; + virtual wxTextPos GetLastPosition() const; virtual void SetSelection(long from, long to); virtual void SetEditable(bool editable); - virtual bool Enable( bool enable = TRUE ); + virtual bool Enable( bool enable = true ); // Implementation from now on void OnDropFiles( wxDropFilesEvent &event ); @@ -136,9 +148,15 @@ public: void DoApplyWidgetStyle(GtkRcStyle *style); void CalculateScrollbar(); void OnInternalIdle(); + +#ifdef __WXGTK20__ + void SetUpdateFont(bool WXUNUSED(update)) { } +#else // !__WXGTK20__ + void SetUpdateFont(bool update) { m_updateFont = update; } void UpdateFontIfNeeded(); +#endif // __WXGTK20__/!__WXGTK20__ - void SetModified() { m_modified = TRUE; } + 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 @@ -164,7 +182,7 @@ public: static wxVisualAttributes GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL); - + protected: virtual wxSize DoGetBestSize() const; @@ -182,6 +200,11 @@ protected: // 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(); @@ -191,11 +214,27 @@ private: bool m_modified:1; bool m_vScrollbarVisible:1; +#ifndef __WXGTK20__ bool m_updateFont: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; + + // For wxTE_AUTO_URL + void OnUrlMouseEvent(wxMouseEvent&); + GdkCursor *m_gdkHandCursor; + GdkCursor *m_gdkXTermCursor; +#endif + DECLARE_EVENT_TABLE() - DECLARE_DYNAMIC_CLASS(wxTextCtrl); + DECLARE_DYNAMIC_CLASS(wxTextCtrl) }; #endif // __GTKTEXTCTRLH__