X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/fb896a322a2ed53d393ee738765ddd3f72cee004..8e77fd8bca165aab9709649d79a7cbc6a172d4e1:/include/wx/cocoa/textctrl.h?ds=sidebyside diff --git a/include/wx/cocoa/textctrl.h b/include/wx/cocoa/textctrl.h index 5205ed9f64..64e4f32a6c 100644 --- a/include/wx/cocoa/textctrl.h +++ b/include/wx/cocoa/textctrl.h @@ -4,9 +4,9 @@ // Author: David Elliott // Modified by: // Created: 2003/03/16 -// RCS-ID: $Id: +// RCS-ID: $Id$ // Copyright: (c) 2003 David Elliott -// Licence: wxWindows license +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// #ifndef __WX_COCOA_TEXTCTRL_H__ @@ -17,7 +17,7 @@ // ======================================================================== // wxTextCtrl // ======================================================================== -class WXDLLEXPORT wxTextCtrl : public wxTextCtrlBase, protected wxCocoaNSTextField +class WXDLLIMPEXP_CORE wxTextCtrl : public wxTextCtrlBase, protected wxCocoaNSTextField { DECLARE_DYNAMIC_CLASS(wxTextCtrl) DECLARE_EVENT_TABLE() @@ -50,12 +50,12 @@ public: // ------------------------------------------------------------------------ protected: virtual void Cocoa_didChangeText(void); + virtual void CocoaTarget_action(void); // ------------------------------------------------------------------------ // Implementation // ------------------------------------------------------------------------ public: virtual wxString GetValue() const; - virtual void SetValue(const wxString& value); virtual int GetLineLength(long lineNo) const; virtual wxString GetLineText(long lineNo) const; @@ -76,6 +76,7 @@ public: virtual void Remove(long from, long to); // clears the dirty flag + virtual void MarkDirty(); virtual void DiscardEdits(); // writing text inserts it at the current position, appending always @@ -107,12 +108,16 @@ 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 SelectAll(); virtual void SetEditable(bool editable); +protected: + virtual wxSize DoGetBestSize() const; + + virtual void DoSetValue(const wxString& value, int flags = 0); }; #endif // __WX_COCOA_TEXTCTRL_H__