Applied patch which allows you to detach a stream

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

diff --git a/include/wx/gtk/textctrl.h b/include/wx/gtk/textctrl.h
index 7e54c5f218466b2d1f1582cae9a3110dd5abcd8e..17c7006d41aa442c8d402a93d46cf3a9ee6d064e 100644 (file)
--- a/include/wx/gtk/textctrl.h
+++ b/include/wx/gtk/textctrl.h
@@ -28,7 +28,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,


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


@@ -140,29 +138,15 @@ 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 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,
     // implementation only from now on
 
     // wxGTK-specific: called recursively by Enable,


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

     static wxVisualAttributes
     GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL);
 
 protected:
     virtual wxSize DoGetBestSize() const;
     static wxVisualAttributes
     GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL);
 
 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; }
     // 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();
 
 
 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_ignoreNextUpdate:1;

+    bool        m_dontMarkDirty: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 +217,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)