X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f40fdaa339e19bbdf60c9c065c82daae4ca77b36..0b11099dd69b60d2fa5240df8e4137d21d97f21d:/include/wx/gtk/textctrl.h diff --git a/include/wx/gtk/textctrl.h b/include/wx/gtk/textctrl.h index 3832c956dc..f0a1934940 100644 --- a/include/wx/gtk/textctrl.h +++ b/include/wx/gtk/textctrl.h @@ -88,6 +88,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(); @@ -136,7 +146,13 @@ 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; } @@ -191,7 +207,9 @@ private: bool m_modified:1; bool m_vScrollbarVisible:1; +#ifndef __WXGTK20__ bool m_updateFont:1; +#endif // !__WXGTK20__ bool m_ignoreNextUpdate:1; DECLARE_EVENT_TABLE()