[ 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 bc5d527d11abefeefef5b95a87941bbe15a78e9b..b9b793eb19c62941410a4d3056b8f8476445b2cf 100644 (file)
--- a/include/wx/gtk/textctrl.h
+++ b/include/wx/gtk/textctrl.h
@@ -1,31 +1,21 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        textctrl.h
+// Name:        wx/gtk/textctrl.h

 // Purpose:
 // Author:      Robert Roebling
 // Created:     01/02/97
 // Id:          $Id$
 // Purpose:
 // Author:      Robert Roebling
 // Created:     01/02/97
 // Id:          $Id$

-// Copyright:   (c) 1998 Robert Roebling, Julian Smart and Markus Holzem
+// Copyright:   (c) 1998 Robert Roebling

 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef __GTKTEXTCTRLH__
 #define __GTKTEXTCTRLH__
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef __GTKTEXTCTRLH__
 #define __GTKTEXTCTRLH__
 

-#ifdef __GNUG__
-    #pragma interface "textctrl.h"
-#endif
-
-//-----------------------------------------------------------------------------
-// classes
-//-----------------------------------------------------------------------------
-
-class wxTextCtrl;
-

 //-----------------------------------------------------------------------------
 // wxTextCtrl
 //-----------------------------------------------------------------------------
 
 //-----------------------------------------------------------------------------
 // wxTextCtrl
 //-----------------------------------------------------------------------------
 

-class wxTextCtrl: public wxTextCtrlBase
+class WXDLLIMPEXP_CORE wxTextCtrl: public wxTextCtrlBase

 {
 public:
     wxTextCtrl() { Init(); }
 {
 public:
     wxTextCtrl() { Init(); }


@@ -38,6 +28,8 @@ public:
                const wxValidator& validator = wxDefaultValidator,
                const wxString &name = wxTextCtrlNameStr);
 
                const wxValidator& validator = wxDefaultValidator,
                const wxString &name = wxTextCtrlNameStr);
 

+    ~wxTextCtrl();
+

     bool Create(wxWindow *parent,
                 wxWindowID id,
                 const wxString &value = wxEmptyString,
     bool Create(wxWindow *parent,
                 wxWindowID id,
                 const wxString &value = wxEmptyString,


@@ -71,9 +63,12 @@ public:
     virtual void Replace(long from, long to, const wxString& value);
     virtual void Remove(long from, long to);
 
     virtual void Replace(long from, long to, const wxString& value);
     virtual void Remove(long from, long to);
 

-    // clears the dirty flag
+    // sets/clears the dirty flag
+    virtual void MarkDirty();

     virtual void DiscardEdits();
 
     virtual void DiscardEdits();
 

+    virtual void SetMaxLength(unsigned long len);
+

     // writing text inserts it at the current position, appending always
     // inserts it at the end
     virtual void WriteText(const wxString& text);
     // writing text inserts it at the current position, appending always
     // inserts it at the end
     virtual void WriteText(const wxString& text);


@@ -91,6 +86,14 @@ public:
 
     virtual void ShowPosition(long pos);
 
 
     virtual void ShowPosition(long pos);
 

+    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);
+    }
+

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


@@ -107,12 +110,12 @@ public:
     virtual void SetInsertionPoint(long pos);
     virtual void SetInsertionPointEnd();
     virtual long GetInsertionPoint() const;
     virtual void SetInsertionPoint(long pos);
     virtual void SetInsertionPointEnd();
     virtual long GetInsertionPoint() const;

-    virtual long GetLastPosition() const;
+    virtual wxTextPos GetLastPosition() const;

 
     virtual void SetSelection(long from, long to);
     virtual void SetEditable(bool editable);
 
 
     virtual void SetSelection(long from, long to);
     virtual void SetEditable(bool editable);
 

-    virtual bool Enable( bool enable );
+    virtual bool Enable( bool enable = true );

 
     // Implementation from now on
     void OnDropFiles( wxDropFilesEvent &event );
 
     // Implementation from now on
     void OnDropFiles( wxDropFilesEvent &event );


@@ -136,41 +139,78 @@ public:
 
     GtkWidget* GetConnectWidget();
     bool IsOwnGtkWindow( GdkWindow *window );
 
     GtkWidget* GetConnectWidget();
     bool IsOwnGtkWindow( GdkWindow *window );

-    void ApplyWidgetStyle();

     void CalculateScrollbar();
     void OnInternalIdle();
     void CalculateScrollbar();
     void OnInternalIdle();

-    void UpdateFontIfNeeded();

 
 

-    void SetModified() { m_modified = TRUE; }
+    void SetUpdateFont(bool WXUNUSED(update)) { }

 
     // GTK+ textctrl is so dumb that you need to freeze/thaw it manually to
     // avoid horrible flicker/scrolling back and forth
     virtual void Freeze();
     virtual void Thaw();
 
 
     // GTK+ textctrl is so dumb that you need to freeze/thaw it manually to
     // avoid horrible flicker/scrolling back and forth
     virtual void Freeze();
     virtual void Thaw();
 

+    // implementation only from now on
+

     // wxGTK-specific: called recursively by Enable,
     // to give widgets an oppprtunity to correct their colours after they
     // have been changed by Enable
     virtual void OnParentEnable( bool enable ) ;
 
     // wxGTK-specific: called recursively by Enable,
     // to give widgets an oppprtunity to correct their colours after they
     // have been changed by Enable
     virtual void OnParentEnable( bool enable ) ;
 

+    // tell the control to ignore next text changed signal
+    void IgnoreNextTextUpdate() { m_ignoreNextUpdate = true; }
+
+    // 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);
+

 protected:
     virtual wxSize DoGetBestSize() const;
 protected:
     virtual wxSize DoGetBestSize() const;

+    void DoApplyWidgetStyle(GtkRcStyle *style);

 
     // common part of all ctors
     void Init();
 
 
     // common part of all ctors
     void Init();
 

+    // Widgets that use the style->base colour for the BG colour should
+    // override this and return true.
+    virtual bool UseGTKStyleBase() const { return true; }
+
+    // has the control been frozen by Freeze()?
+    bool IsFrozen() const { return m_frozenness > 0; }
+

 private:
     // change the font for everything in this control
     void ChangeFontGlobally();
 
 private:
     // change the font for everything in this control
     void ChangeFontGlobally();
 

-    bool        m_modified;

     GtkWidget  *m_text;
     GtkWidget  *m_text;

-    GtkWidget  *m_vScrollbar;
-    bool        m_vScrollbarVisible;
-    bool        m_updateFont;
+
+    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
+    GtkTextBuffer *m_buffer;
+
+    // number of calls to Freeze() minus number of calls to Thaw()
+    unsigned int m_frozenness;
+
+    // For wxTE_AUTO_URL
+    void OnUrlMouseEvent(wxMouseEvent&);
+    GdkCursor *m_gdkHandCursor;
+    GdkCursor *m_gdkXTermCursor;

 
     DECLARE_EVENT_TABLE()
 
     DECLARE_EVENT_TABLE()

-    DECLARE_DYNAMIC_CLASS(wxTextCtrl);
+    DECLARE_DYNAMIC_CLASS(wxTextCtrl)

 };
 
 #endif // __GTKTEXTCTRLH__
 };
 
 #endif // __GTKTEXTCTRLH__