X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c84030e020e56735cb4b7c1534e99d21a8bb48c0..61f09f569358d7b2752733c4a24d1bd10daefae2:/include/wx/osx/textctrl.h?ds=sidebyside diff --git a/include/wx/osx/textctrl.h b/include/wx/osx/textctrl.h index aa010f84c1..1116b4def8 100644 --- a/include/wx/osx/textctrl.h +++ b/include/wx/osx/textctrl.h @@ -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) @@ -99,13 +96,10 @@ public: virtual void ShowPosition(long pos); // overrides so that we can send text updated events + 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 // -------------- virtual void Command(wxCommandEvent& event); @@ -115,6 +109,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); @@ -140,32 +135,25 @@ public: virtual void MacSuperChangedPosition(); virtual void MacCheckSpelling(bool check); - virtual wxTextWidgetImpl * GetTextPeer() const; protected: // common part of all ctors void Init(); virtual wxSize DoGetBestSize() 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; - DECLARE_EVENT_TABLE() + DECLARE_EVENT_TABLE() }; #endif // _WX_TEXTCTRL_H_