X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/777105f2b7f91a17fab7d9c4808e282547bb9393..51f5e2822cdcb8b433b1d117f186dfd8bb06e240:/include/wx/gtk/textctrl.h

diff --git a/include/wx/gtk/textctrl.h b/include/wx/gtk/textctrl.h
index 4d71583c8d..e2041cb963 100644
--- a/include/wx/gtk/textctrl.h
+++ b/include/wx/gtk/textctrl.h
@@ -11,15 +11,11 @@
 #ifndef __GTKTEXTCTRLH__
 #define __GTKTEXTCTRLH__
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma interface "textctrl.h"
-#endif
-
 //-----------------------------------------------------------------------------
 // wxTextCtrl
 //-----------------------------------------------------------------------------
 
-class wxTextCtrl: public wxTextCtrlBase
+class WXDLLIMPEXP_CORE wxTextCtrl: public wxTextCtrlBase
 {
 public:
     wxTextCtrl() { Init(); }
@@ -32,6 +28,8 @@ public:
                const wxValidator& validator = wxDefaultValidator,
                const wxString &name = wxTextCtrlNameStr);
 
+    ~wxTextCtrl();
+
     bool Create(wxWindow *parent,
                 wxWindowID id,
                 const wxString &value = wxEmptyString,
@@ -88,7 +86,6 @@ public:
 
     virtual void ShowPosition(long pos);
 
-#ifdef __WXGTK20__
     virtual wxTextCtrlHitTestResult HitTest(const wxPoint& pt, long *pos) const;
     virtual wxTextCtrlHitTestResult HitTest(const wxPoint& pt,
                                             wxTextCoord *col,
@@ -96,7 +93,6 @@ public:
     {
         return wxTextCtrlBase::HitTest(pt, col, row);
     }
-#endif // __WXGTK20__
 
     // Clipboard operations
     virtual void Copy();
@@ -143,16 +139,10 @@ public:
 
     GtkWidget* GetConnectWidget();
     bool IsOwnGtkWindow( GdkWindow *window );
-    void DoApplyWidgetStyle(GtkRcStyle *style);
     void CalculateScrollbar();
     void OnInternalIdle();
 
-#ifdef __WXGTK20__
     void SetUpdateFont(bool WXUNUSED(update)) { }
-#else // !__WXGTK20__
-    void SetUpdateFont(bool update) { m_updateFont = update; }
-    void UpdateFontIfNeeded();
-#endif // __WXGTK20__/!__WXGTK20__
 
     void SetModified() { m_modified = true; }
 
@@ -161,10 +151,6 @@ public:
     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,
@@ -183,25 +169,17 @@ public:
 
 protected:
     virtual wxSize DoGetBestSize() const;
+    void DoApplyWidgetStyle(GtkRcStyle *style);
 
     // 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; }
 
-#ifdef __WXGTK20__
     // has the control been frozen by Freeze()?
     bool IsFrozen() const { return m_frozenness > 0; }
-#endif
 
 private:
     // change the font for everything in this control
@@ -212,19 +190,19 @@ private:
 
     bool        m_modified:1;
     bool        m_vScrollbarVisible:1;
-#ifndef __WXGTK20__
-    bool        m_updateFont:1;
-#endif // !__WXGTK20__
     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
+
+    // For wxTE_AUTO_URL
+    void OnUrlMouseEvent(wxMouseEvent&);
+    GdkCursor *m_gdkHandCursor;
+    GdkCursor *m_gdkXTermCursor;
 
     DECLARE_EVENT_TABLE()
     DECLARE_DYNAMIC_CLASS(wxTextCtrl)