X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8907154c1a8a6882c6797d1f16393ddfb23e7f3a..ee6dd41a508c2bf598c178696a43bb665e0d4c01:/include/wx/gtk/textctrl.h?ds=sidebyside

diff --git a/include/wx/gtk/textctrl.h b/include/wx/gtk/textctrl.h
index 7e54c5f218..29add9c07a 100644
--- a/include/wx/gtk/textctrl.h
+++ b/include/wx/gtk/textctrl.h
@@ -86,7 +86,6 @@ 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,
@@ -94,7 +93,6 @@ public:
     {
         return wxTextCtrlBase::HitTest(pt, col, row);
     }
-#endif // __WXGTK20__
 
     // Clipboard operations
     virtual void Copy();
@@ -145,12 +143,7 @@ public:
     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; }
 
@@ -196,10 +189,8 @@ 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
@@ -210,12 +201,8 @@ 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;
@@ -227,7 +214,6 @@ private:
     void OnUrlMouseEvent(wxMouseEvent&);
     GdkCursor *m_gdkHandCursor;
     GdkCursor *m_gdkXTermCursor;
-#endif
 
     DECLARE_EVENT_TABLE()
     DECLARE_DYNAMIC_CLASS(wxTextCtrl)