Renamed HasChildren() to IsContainer(), added GetParent() to wxDataViewModel

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

diff --git a/include/wx/gtk/textctrl.h b/include/wx/gtk/textctrl.h
index 7e54c5f218466b2d1f1582cae9a3110dd5abcd8e..0d5c1189347824915fc3d4c6400906b56517ac8b 100644 (file)
--- a/include/wx/gtk/textctrl.h
+++ b/include/wx/gtk/textctrl.h
@@ -8,8 +8,10 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#ifndef __GTKTEXTCTRLH__
-#define __GTKTEXTCTRLH__
+#ifndef _WX_GTK_TEXTCTRL_H_
+#define _WX_GTK_TEXTCTRL_H_
+
+typedef struct _GtkTextMark GtkTextMark;

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


@@ -28,7 +30,7 @@ public:
                const wxValidator& validator = wxDefaultValidator,
                const wxString &name = wxTextCtrlNameStr);
 
                const wxValidator& validator = wxDefaultValidator,
                const wxString &name = wxTextCtrlNameStr);
 

-    ~wxTextCtrl();
+    virtual ~wxTextCtrl();

 
     bool Create(wxWindow *parent,
                 wxWindowID id,
 
     bool Create(wxWindow *parent,
                 wxWindowID id,


@@ -43,7 +45,7 @@ public:
     // ----------------------------------
 
     virtual wxString GetValue() const;
     // ----------------------------------
 
     virtual wxString GetValue() const;

-    virtual void SetValue(const wxString& value);
+    virtual bool IsEmpty() const;

 
     virtual int GetLineLength(long lineNo) const;
     virtual wxString GetLineText(long lineNo) const;
 
     virtual int GetLineLength(long lineNo) const;
     virtual wxString GetLineText(long lineNo) const;


@@ -86,7 +88,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 +95,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();


@@ -117,6 +117,8 @@ public:
     virtual void SetSelection(long from, long to);
     virtual void SetEditable(bool editable);
 
     virtual void SetSelection(long from, long to);
     virtual void SetEditable(bool editable);
 

+    // Overridden wxWindow methods
+    virtual void SetWindowStyleFlag( long style );

     virtual bool Enable( bool enable = true );
 
     // Implementation from now on
     virtual bool Enable( bool enable = true );
 
     // Implementation from now on


@@ -140,98 +142,99 @@ public:
     bool SetBackgroundColour(const wxColour& colour);
 
     GtkWidget* GetConnectWidget();
     bool SetBackgroundColour(const wxColour& colour);
 
     GtkWidget* GetConnectWidget();

-    bool IsOwnGtkWindow( GdkWindow *window );
-    void DoApplyWidgetStyle(GtkRcStyle *style);
-    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; }

 
     // 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();
 

-    // textctrl specific scrolling
-    virtual bool ScrollLines(int lines);
-    virtual bool ScrollPages(int pages);
-

     // 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
     // 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 ) ;
+    virtual void OnEnabled( bool enable ) ;

 
     // tell the control to ignore next text changed signal
 
     // tell the control to ignore next text changed signal

-    void IgnoreNextTextUpdate();
+    void IgnoreNextTextUpdate(int n = 1) { m_countUpdatesToIgnore = n; }

 
     // 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();
+
+    // always let GTK have mouse release events for multiline controls
+    virtual bool GTKProcessEvent(wxEvent& event) const;
+
+

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

+    // has the control been frozen by Freeze()?
+    bool IsFrozen() const { return m_freezeCount > 0; }
+

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

+    virtual void DoApplyWidgetStyle(GtkRcStyle *style);
+    virtual GdkWindow *GTKGetWindow(wxArrayGdkWindows& windows) const;

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

-    // get the vertical adjustment, if any, NULL otherwise
-    GtkAdjustment *GetVAdj() const;
-
-    // scroll the control by the given number of pixels, return true if the
-    // scroll position changed
-    bool DoScroll(GtkAdjustment *adj, int diff);
-

     // Widgets that use the style->base colour for the BG colour should
     // override this and return true.
     virtual bool UseGTKStyleBase() const { return true; }
 
     // Widgets that use the style->base colour for the BG colour should
     // 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
+    virtual void DoSetValue(const wxString &value, int flags = 0);
+
+    // wrappers hiding the differences between functions doing the same thing
+    // for GtkTextView and GtkEntry (all of them use current window style to
+    // set the given characteristic)
+    void GTKSetEditable();
+    void GTKSetVisibility();
+    void GTKSetWrapMode();
+    void GTKSetJustification();

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

+    // get the encoding which is used in this control: this looks at our font
+    // and default style but not the current style (i.e. the style for the
+    // current position); returns wxFONTENCODING_SYSTEM if we have no specific
+    // encoding
+    wxFontEncoding GetTextEncoding() const;
+
+

     GtkWidget  *m_text;
     GtkWidget  *m_text;

-    GtkWidget  *m_vScrollbar;

 
     bool        m_modified:1;
 
     bool        m_modified:1;

-    bool        m_vScrollbarVisible:1;
-#ifndef __WXGTK20__
-    bool        m_updateFont:1;
-#endif // !__WXGTK20__
-    bool        m_ignoreNextUpdate:1;
+    bool        m_dontMarkDirty:1;
+
+    int         m_countUpdatesToIgnore;

 
 

-#ifdef __WXGTK20__

     // Our text buffer. Convenient, and holds the buffer while using
     // Our text buffer. Convenient, and holds the buffer while using

-    // a dummy one when m_frozenness > 0
+    // a dummy one when frozen

     GtkTextBuffer *m_buffer;
 
     // number of calls to Freeze() minus number of calls to Thaw()
     GtkTextBuffer *m_buffer;
 
     // number of calls to Freeze() minus number of calls to Thaw()

-    unsigned int m_frozenness;
+    unsigned m_freezeCount;
+    GtkTextMark* m_showPositionOnThaw;

 
     // For wxTE_AUTO_URL
     void OnUrlMouseEvent(wxMouseEvent&);
     GdkCursor *m_gdkHandCursor;
     GdkCursor *m_gdkXTermCursor;
 
     // For wxTE_AUTO_URL
     void OnUrlMouseEvent(wxMouseEvent&);
     GdkCursor *m_gdkHandCursor;
     GdkCursor *m_gdkXTermCursor;

-#endif

 
     DECLARE_EVENT_TABLE()
     DECLARE_DYNAMIC_CLASS(wxTextCtrl)
 };
 
 
     DECLARE_EVENT_TABLE()
     DECLARE_DYNAMIC_CLASS(wxTextCtrl)
 };
 

-#endif // __GTKTEXTCTRLH__
-
+#endif // _WX_GTK_TEXTCTRL_H_