Merge the changes from 3.0 branch.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@75178 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2013-11-12 18:06:37 +00:00
parent e4d0bc4bb1
commit 9b31387508
100 changed files with 7289 additions and 1390 deletions

View File

@@ -599,21 +599,6 @@ bool wxTextCtrl::MacSetupCursor( const wxPoint& pt )
return true ;
}
bool wxTextCtrl::SetHint(const wxString& hint)
{
m_hintString = hint;
if ( GetTextPeer() && GetTextPeer()->SetHint(hint) )
return true;
return false;
}
wxString wxTextCtrl::GetHint() const
{
return m_hintString;
}
// ----------------------------------------------------------------------------
// implementation base class
// ----------------------------------------------------------------------------