Compile fix for the version of VC8 included in the 2003 PSDK.

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

diff --git a/include/wx/gtk/textctrl.h b/include/wx/gtk/textctrl.h
index 29add9c07ab4b268d1ef0c9c09bc6bfa79bb5fda..6d73a76004ecabb36ed44924bfb0c85eb5003dee 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,


@@ -43,7 +43,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;


@@ -138,24 +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();

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


@@ -164,44 +155,59 @@ 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(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_frozenness > 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; }
 

-    // has the control been frozen by Freeze()?
-    bool IsFrozen() const { return m_frozenness > 0; }
+    virtual void DoSetValue(const wxString &value, int flags = 0);

 
 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;
-    bool        m_ignoreNextUpdate:1;
+    bool        m_dontMarkDirty:1;
+
+    int         m_countUpdatesToIgnore;

 
     // 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