removed GTKConvertMnemonics() which is not used in GTK1 (which doesn't support mnemonics)

[wxWidgets.git] / include / wx / gtk / textctrl.h

diff --git a/include/wx/gtk/textctrl.h b/include/wx/gtk/textctrl.h
index 7e54c5f218466b2d1f1582cae9a3110dd5abcd8e..29add9c07ab4b268d1ef0c9c09bc6bfa79bb5fda 100644 (file)
--- a/include/wx/gtk/textctrl.h
+++ b/include/wx/gtk/textctrl.h
@@ -86,7 +86,6 @@ public:
 
     virtual void ShowPosition(long pos);
 
 
     virtual void ShowPosition(long pos);
 

-#ifdef __WXGTK20__

     virtual wxTextCtrlHitTestResult HitTest(const wxPoint& pt, long *pos) const;
     virtual wxTextCtrlHitTestResult HitTest(const wxPoint& pt,
                                             wxTextCoord *col,
     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);
     }
     {
         return wxTextCtrlBase::HitTest(pt, col, row);
     }

-#endif // __WXGTK20__

 
     // Clipboard operations
     virtual void Copy();
 
     // Clipboard operations
     virtual void Copy();


@@ -145,12 +143,7 @@ public:
     void CalculateScrollbar();
     void OnInternalIdle();
 
     void CalculateScrollbar();
     void OnInternalIdle();
 

-#ifdef __WXGTK20__

     void SetUpdateFont(bool WXUNUSED(update)) { }
     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; }
 


@@ -196,10 +189,8 @@ protected:
     // override this and return true.
     virtual bool UseGTKStyleBase() const { return true; }
 
     // 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; }
     // has the control been frozen by Freeze()?
     bool IsFrozen() const { return m_frozenness > 0; }

-#endif

 
 private:
     // change the font for everything in this control
 
 private:
     // change the font for everything in this control


@@ -210,12 +201,8 @@ private:
 
     bool        m_modified:1;
     bool        m_vScrollbarVisible:1;
 
     bool        m_modified:1;
     bool        m_vScrollbarVisible:1;

-#ifndef __WXGTK20__
-    bool        m_updateFont:1;
-#endif // !__WXGTK20__

     bool        m_ignoreNextUpdate:1;
 
     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;
     // 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;
     void OnUrlMouseEvent(wxMouseEvent&);
     GdkCursor *m_gdkHandCursor;
     GdkCursor *m_gdkXTermCursor;

-#endif

 
     DECLARE_EVENT_TABLE()
     DECLARE_DYNAMIC_CLASS(wxTextCtrl)
 
     DECLARE_EVENT_TABLE()
     DECLARE_DYNAMIC_CLASS(wxTextCtrl)