X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/41b81aed52c199f71562ba1e8c8027b5aa1c0b68..0944fceb987def04dc89d03d58c35793d0ecdfed:/include/wx/gtk1/textctrl.h diff --git a/include/wx/gtk1/textctrl.h b/include/wx/gtk1/textctrl.h index 2024575d7d..b55dc917c9 100644 --- a/include/wx/gtk1/textctrl.h +++ b/include/wx/gtk1/textctrl.h @@ -19,7 +19,7 @@ // wxTextCtrl //----------------------------------------------------------------------------- -class wxTextCtrl: public wxTextCtrlBase +class WXDLLIMPEXP_CORE wxTextCtrl: public wxTextCtrlBase { public: wxTextCtrl() { Init(); } @@ -32,6 +32,8 @@ public: const wxValidator& validator = wxDefaultValidator, const wxString &name = wxTextCtrlNameStr); + ~wxTextCtrl(); + bool Create(wxWindow *parent, wxWindowID id, const wxString &value = wxEmptyString, @@ -114,12 +116,12 @@ public: 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 bool Enable( bool enable = TRUE ); + virtual bool Enable( bool enable = true ); // Implementation from now on void OnDropFiles( wxDropFilesEvent &event ); @@ -154,13 +156,13 @@ public: 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); @@ -180,7 +182,7 @@ public: static wxVisualAttributes GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL); - + protected: virtual wxSize DoGetBestSize() const; @@ -202,7 +204,7 @@ protected: // 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(); @@ -224,10 +226,15 @@ private: // 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; +#endif DECLARE_EVENT_TABLE() - DECLARE_DYNAMIC_CLASS(wxTextCtrl); + DECLARE_DYNAMIC_CLASS(wxTextCtrl) }; #endif // __GTKTEXTCTRLH__