removing NSWindow based mouse tracking in favour of 10.5+ trackingArea implementation

[wxWidgets.git] / include / wx / osx / textctrl.h

diff --git a/include/wx/osx/textctrl.h b/include/wx/osx/textctrl.h
index 85583505fdd5dd43278181c82dcd0d9d94166aea..c983eee96457b37d3ee4e0623ff4a31488c9efb0 100644 (file)
--- 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:
 // Purpose:     wxTextCtrl class
 // Author:      Stefan Csomor
 // Modified by:


@@ -75,9 +75,9 @@ public:
     virtual void MarkDirty();
     virtual void DiscardEdits();
 
     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
 
     // text control under some platforms supports the text styles: these
     // methods apply the given text style to the given selection or to


@@ -99,10 +99,6 @@ public:
     virtual void Copy();
     virtual void Cut();
     virtual void Paste();
     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
     // --------------
 
     // Implementation
     // --------------


@@ -148,17 +144,17 @@ protected:
     // flag is set to true when the user edits the controls contents
     bool m_dirty;
 
     // 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 :
 private :

-  wxMenu  *m_privateContextMenu;
+    wxMenu  *m_privateContextMenu;
+    wxString m_hintString;

 
 

-  DECLARE_EVENT_TABLE()
+    DECLARE_EVENT_TABLE()

 };
 
 #endif // _WX_TEXTCTRL_H_
 };
 
 #endif // _WX_TEXTCTRL_H_