Merge the changes from 3.0 branch.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@75178 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

include/wx/osx/app.h

@@ -143,7 +143,7 @@ public:
     virtual void         MacNewFile() ;
     // in response of a reopen-application apple event
     virtual void         MacReopenApp() ;
-    
+
     // override this to return false from a non-bundled console app in order to stay in background ...
     virtual bool         OSXIsGUIApplication() { return true; }
 

include/wx/osx/textctrl.h

@@ -74,10 +74,6 @@ public:
     virtual void MarkDirty();
     virtual void DiscardEdits();
 
-    // 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
@@ -151,7 +147,6 @@ protected:
 
 private :
     wxMenu  *m_privateContextMenu;
-    wxString m_hintString;
 
     DECLARE_EVENT_TABLE()
 };

include/wx/osx/textentry.h

@@ -81,6 +81,10 @@ public:
 
     virtual bool SendMaxLenEvent();
 
+    // set the grayed out hint text
+    virtual bool SetHint(const wxString& hint);
+    virtual wxString GetHint() const;
+
     // Implementation
     // --------------
 
@@ -102,6 +106,8 @@ protected:
   // need to make this public because of the current implementation via callbacks
     unsigned long  m_maxLength;
 
+private:
+    wxString m_hintString;
 };
 
 #endif // _WX_OSX_TEXTENTRY_H_