Applied rowspan patch #15276 (dghart)

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

diff --git a/include/wx/gtk1/textctrl.h b/include/wx/gtk1/textctrl.h
index 2024575d7ddbb4e078e976a3b06857b99ef88275..de6a4034f1c68ff8112ee3318d637c05fb795b1c 100644 (file)
--- a/include/wx/gtk1/textctrl.h
+++ b/include/wx/gtk1/textctrl.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

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

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


@@ -11,15 +11,11 @@
 #ifndef __GTKTEXTCTRLH__
 #define __GTKTEXTCTRLH__
 
 #ifndef __GTKTEXTCTRLH__
 #define __GTKTEXTCTRLH__
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma interface "textctrl.h"
-#endif
-

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

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

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


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

+    virtual ~wxTextCtrl();
+

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


@@ -44,9 +42,6 @@ public:
     // implement base class pure virtuals
     // ----------------------------------
 
     // implement base class pure virtuals
     // ----------------------------------
 

-    virtual wxString GetValue() const;
-    virtual void SetValue(const wxString& value);
-

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


@@ -88,16 +83,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,
-                                            wxTextCoord *row) const
-    {
-        return wxTextCtrlBase::HitTest(pt, col, row);
-    }
-#endif // __WXGTK20__
-

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


@@ -114,12 +99,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 = TRUE );
+    virtual void DoEnable( bool enable );

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


@@ -147,31 +132,17 @@ public:
     void CalculateScrollbar();
     void OnInternalIdle();
 
     void CalculateScrollbar();
     void OnInternalIdle();
 

-#ifdef __WXGTK20__
-    void SetUpdateFont(bool WXUNUSED(update)) { }
-#else // !__WXGTK20__

     void SetUpdateFont(bool update) { m_updateFont = update; }
     void UpdateFontIfNeeded();
     void SetUpdateFont(bool update) { m_updateFont = update; }
     void UpdateFontIfNeeded();

-#endif // __WXGTK20__/!__WXGTK20__

 
 

-    void SetModified() { m_modified = TRUE; }
+    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();
-    

     // textctrl specific scrolling
     virtual bool ScrollLines(int lines);
     virtual bool ScrollPages(int pages);
 
     // implementation only from now on
 
     // 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
-    virtual void OnParentEnable( bool enable ) ;
-

     // tell the control to ignore next text changed signal
     void IgnoreNextTextUpdate();
 
     // tell the control to ignore next text changed signal
     void IgnoreNextTextUpdate();
 


@@ -180,13 +151,17 @@ public:
 
     static wxVisualAttributes
     GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL);
 
     static wxVisualAttributes
     GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL);

-    
+

 protected:
     virtual wxSize DoGetBestSize() const;
 
     // common part of all ctors
     void Init();
 
 protected:
     virtual wxSize DoGetBestSize() const;
 
     // common part of all ctors
     void Init();
 

+    // overridden wxWindow methods
+    virtual void DoFreeze();
+    virtual void DoThaw();
+

     // get the vertical adjustment, if any, NULL otherwise
     GtkAdjustment *GetVAdj() const;
 
     // get the vertical adjustment, if any, NULL otherwise
     GtkAdjustment *GetVAdj() const;
 


@@ -198,11 +173,9 @@ protected:
     // override this and return true.
     virtual bool UseGTKStyleBase() const { return true; }
 
     // 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);
+    virtual wxString DoGetValue() const;
+

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


@@ -212,22 +185,11 @@ private:
 
     bool        m_modified:1;
     bool        m_vScrollbarVisible:1;
 
     bool        m_modified:1;
     bool        m_vScrollbarVisible:1;

-#ifndef __WXGTK20__

     bool        m_updateFont:1;
     bool        m_updateFont:1;

-#endif // !__WXGTK20__

     bool        m_ignoreNextUpdate:1;
 
     bool        m_ignoreNextUpdate:1;
 

-#ifdef __WXGTK20__
-    // 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;
-#endif  
-

     DECLARE_EVENT_TABLE()
     DECLARE_EVENT_TABLE()

-    DECLARE_DYNAMIC_CLASS(wxTextCtrl);
+    DECLARE_DYNAMIC_CLASS(wxTextCtrl)

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