don't return HTCLIENT for static bitmaps, this breaks mouse (leave) event generation

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

diff --git a/include/wx/gtk/textctrl.h b/include/wx/gtk/textctrl.h
index e27cb9f9a4fa71f24b77b3f5a8bb04c8ee2ef678..2024575d7ddbb4e078e976a3b06857b99ef88275 100644 (file)
--- a/include/wx/gtk/textctrl.h
+++ b/include/wx/gtk/textctrl.h
@@ -90,6 +90,12 @@ public:
 
 #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
@@ -154,7 +160,7 @@ public:
     // avoid horrible flicker/scrolling back and forth
     virtual void Freeze();
     virtual void Thaw();
-
+    
     // textctrl specific scrolling
     virtual bool ScrollLines(int lines);
     virtual bool ScrollPages(int pages);
@@ -192,6 +198,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();
@@ -206,6 +217,15 @@ private:
 #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;
+#endif  
+
     DECLARE_EVENT_TABLE()
     DECLARE_DYNAMIC_CLASS(wxTextCtrl);
 };