X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ac349b6e662fbd445618f13dc3d9ae881c1e7ebf..43ff861df48f0837dac98005dd397c5f127ca136:/include/wx/osx/textctrl.h?ds=sidebyside diff --git a/include/wx/osx/textctrl.h b/include/wx/osx/textctrl.h index 988340df21..283a1694ea 100644 --- a/include/wx/osx/textctrl.h +++ b/include/wx/osx/textctrl.h @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: wx/mac/carbon/textctrl.h +// Name: wx/osx/textctrl.h // Purpose: wxTextCtrl class // Author: Stefan Csomor // Modified by: @@ -26,9 +26,6 @@ #include "wx/control.h" #include "wx/textctrl.h" -// forward decl for wxListWidgetImpl implementation type. -class WXDLLIMPEXP_FWD_CORE wxTextWidgetImpl; - class WXDLLIMPEXP_CORE wxTextCtrl: public wxTextCtrlBase { DECLARE_DYNAMIC_CLASS(wxTextCtrl) @@ -82,6 +79,10 @@ public: // in a single line text control virtual void SetMaxLength(unsigned long len); + // set the grayed out hint text + virtual bool SetHint(const wxString& hint); + virtual wxString GetHint() const; + // text control under some platforms supports the text styles: these // methods apply the given text style to the given selection or to // set/get the style which will be used for all appended text @@ -102,10 +103,6 @@ public: virtual void Copy(); virtual void Cut(); virtual void Paste(); - - virtual void WriteText(const wxString& text); - virtual void Clear(); - virtual void Remove(long from, long to); // Implementation // -------------- @@ -142,7 +139,6 @@ public: virtual void MacSuperChangedPosition(); virtual void MacCheckSpelling(bool check); - virtual wxTextWidgetImpl * GetTextPeer() const; protected: // common part of all ctors void Init(); @@ -152,17 +148,17 @@ protected: // flag is set to true when the user edits the controls contents bool m_dirty; - virtual void EnableTextChangedEvents(bool enable) + virtual void EnableTextChangedEvents(bool WXUNUSED(enable)) { - m_triggerUpdateEvents = enable; + // nothing to do here as the events are never generated when we change + // the controls value programmatically anyhow } - bool m_triggerUpdateEvents ; - private : - wxMenu *m_privateContextMenu; + wxMenu *m_privateContextMenu; + wxString m_hintString; - DECLARE_EVENT_TABLE() + DECLARE_EVENT_TABLE() }; #endif // _WX_TEXTCTRL_H_