X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/496af8a38398d68723de29eafb6fff291cc6462f..ab67e8874db324fab5223cc8d5dff8a8de3e2b77:/include/wx/osx/textctrl.h?ds=sidebyside

diff --git a/include/wx/osx/textctrl.h b/include/wx/osx/textctrl.h
index 3bd9c978a2..c983eee964 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)
@@ -78,9 +75,9 @@ public:
     virtual void MarkDirty();
     virtual void DiscardEdits();
 
-    // set the max number of characters which may be entered
-    // 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
@@ -99,12 +96,9 @@ 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
     // --------------
@@ -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,7 +135,6 @@ public:
     virtual void MacSuperChangedPosition();
     virtual void MacCheckSpelling(bool check);
 
-    virtual wxTextWidgetImpl * GetTextPeer() const;
 protected:
     // common part of all ctors
     void Init();
@@ -150,17 +144,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_