Enable variadic macros for VC9 and later.

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

diff --git a/include/wx/osx/textctrl.h b/include/wx/osx/textctrl.h
index 1116b4def81556ef8e2da849149e5ed2738c6bd4..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,7 +99,7 @@ public:
     virtual void Copy();
     virtual void Cut();
     virtual void Paste();
     virtual void Copy();
     virtual void Cut();
     virtual void Paste();

-    
+

     // Implementation
     // --------------
     virtual void Command(wxCommandEvent& event);
     // Implementation
     // --------------
     virtual void Command(wxCommandEvent& event);


@@ -152,6 +152,7 @@ protected:
 
 private :
     wxMenu  *m_privateContextMenu;
 
 private :
     wxMenu  *m_privateContextMenu;

+    wxString m_hintString;

 
     DECLARE_EVENT_TABLE()
 };
 
     DECLARE_EVENT_TABLE()
 };