X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/16671f229af4d3ff3ca2a6612a8ebc6c89f45c24..43ff861df48f0837dac98005dd397c5f127ca136:/include/wx/osx/textctrl.h?ds=sidebyside diff --git a/include/wx/osx/textctrl.h b/include/wx/osx/textctrl.h index c7c934144a..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) @@ -69,17 +66,10 @@ public: virtual int GetNumberOfLines() const; virtual bool IsModified() const; - virtual bool IsEditable() const; - - // If the return values from and to are the same, there is no selection. - virtual void GetSelection(long* from, long* to) const; // operations // ---------- - // editing - virtual void Clear(); - virtual void Remove(long from, long to); // sets/clears the dirty flag virtual void MarkDirty(); @@ -89,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 @@ -97,10 +91,6 @@ public: virtual bool SetStyle(long start, long end, const wxTextAttr& style); virtual bool SetDefaultStyle(const wxTextAttr& style); - // writing text inserts it at the current position; - // appending always inserts it at the end - virtual void WriteText(const wxString& text); - // translate between the position (which is just an index into the textctrl // considering all its contents as a single strings) and (x, y) coordinates // which represent column and line. @@ -109,31 +99,11 @@ public: virtual void ShowPosition(long pos); - // Clipboard operations + // overrides so that we can send text updated events virtual void Copy(); virtual void Cut(); virtual void Paste(); - virtual bool CanCopy() const; - virtual bool CanCut() const; - virtual bool CanPaste() const; - - // Undo/redo - virtual void Undo(); - virtual void Redo(); - - virtual bool CanUndo() const; - virtual bool CanRedo() const; - - // Insertion point - virtual void SetInsertionPoint(long pos); - virtual void SetInsertionPointEnd(); - virtual long GetInsertionPoint() const; - virtual wxTextPos GetLastPosition() const; - - virtual void SetSelection(long from, long to); - virtual void SetEditable(bool editable); - // Implementation // -------------- virtual void Command(wxCommandEvent& event); @@ -143,6 +113,7 @@ public: // callbacks void OnDropFiles(wxDropFilesEvent& event); void OnChar(wxKeyEvent& event); // Process 'enter' if required + void OnKeyDown(wxKeyEvent& event); // Process clipboard shortcuts void OnCut(wxCommandEvent& event); void OnCopy(wxCommandEvent& event); @@ -168,34 +139,26 @@ public: virtual void MacSuperChangedPosition(); virtual void MacCheckSpelling(bool check); - wxTextWidgetImpl * GetTextPeer() const; protected: // common part of all ctors void Init(); virtual wxSize DoGetBestSize() const; - virtual wxString DoGetValue() const; - - bool m_editable; - // flag is set to true when the user edits the controls contents bool m_dirty; - // need to make this public because of the current implementation via callbacks - unsigned long m_maxLength; - - 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_