[ 1522987 ] wxComboCtrl crashes if TAB is pressed while popup is open

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

diff --git a/include/wx/gtk/textctrl.h b/include/wx/gtk/textctrl.h
index b801780273b6a167a977a876addde03c342c1a44..b9b793eb19c62941410a4d3056b8f8476445b2cf 100644 (file)
--- a/include/wx/gtk/textctrl.h
+++ b/include/wx/gtk/textctrl.h
@@ -144,8 +144,6 @@ public:
 
     void SetUpdateFont(bool WXUNUSED(update)) { }
 
 
     void SetUpdateFont(bool WXUNUSED(update)) { }
 

-    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
     virtual void Freeze();
     // GTK+ textctrl is so dumb that you need to freeze/thaw it manually to
     // avoid horrible flicker/scrolling back and forth
     virtual void Freeze();


@@ -159,11 +157,19 @@ public:
     virtual void OnParentEnable( bool enable ) ;
 
     // tell the control to ignore next text changed signal
     virtual void OnParentEnable( bool enable ) ;
 
     // tell the control to ignore next text changed signal

-    void IgnoreNextTextUpdate();
+    void IgnoreNextTextUpdate() { m_ignoreNextUpdate = true; }

 
     // should we ignore the changed signal? always resets the flag
     bool IgnoreTextUpdate();
 
 
     // should we ignore the changed signal? always resets the flag
     bool IgnoreTextUpdate();
 

+    // call this to indicate that the control is about to be changed
+    // programmatically and so m_modified flag shouldn't be set
+    void DontMarkDirtyOnNextChange() { m_dontMarkDirty = true; }
+
+    // should we mark the control as dirty? always resets the flag
+    bool MarkDirtyOnChange();
+
+

     static wxVisualAttributes
     GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL);
 
     static wxVisualAttributes
     GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL);
 


@@ -189,6 +195,7 @@ private:
 
     bool        m_modified:1;
     bool        m_ignoreNextUpdate:1;
 
     bool        m_modified:1;
     bool        m_ignoreNextUpdate:1;

+    bool        m_dontMarkDirty:1;

 
     // Our text buffer. Convenient, and holds the buffer while using
     // a dummy one when m_frozenness > 0
 
     // Our text buffer. Convenient, and holds the buffer while using
     // a dummy one when m_frozenness > 0