avoid setting initial position if it was not specified, broken in r70734

[wxWidgets.git] / src / osx / iphone / textctrl.mm

diff --git a/src/osx/iphone/textctrl.mm b/src/osx/iphone/textctrl.mm
index 7ad585bd7ff964c260d2e973827d62a59752e639..8fa70b90ad1eb8a49cf3bb8f1db964a4c971334e 100644 (file)
--- a/src/osx/iphone/textctrl.mm
+++ b/src/osx/iphone/textctrl.mm
@@ -1,10 +1,9 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        src/osx/cocoa/textctrl.mm
+// Name:        src/osx/iphone/textctrl.mm
 // Purpose:     wxTextCtrl
 // Author:      Stefan Csomor
 // Modified by: Ryan Norton (MLTE GetLineLength and GetLineText)
 // Created:     1998-01-01
-// RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -189,7 +188,7 @@ protected :
         wxWindow* wxpeer = (wxWindow*) impl->GetWXPeer();
         if ( wxpeer && wxpeer->GetWindowStyle() & wxTE_PROCESS_ENTER )
         {
-            wxCommandEvent event(wxEVT_COMMAND_TEXT_ENTER, wxpeer->GetId());
+            wxCommandEvent event(wxEVT_TEXT_ENTER, wxpeer->GetId());
             event.SetEventObject( wxpeer );
             event.SetString( static_cast<wxTextCtrl*>(wxpeer)->GetValue() );
             wxpeer->HandleWindowEvent( event );
@@ -663,7 +662,7 @@ void wxUITextFieldControl::controlAction(WXWidget WXUNUSED(slf),
     wxWindow* wxpeer = (wxWindow*) GetWXPeer();
     if ( wxpeer && (wxpeer->GetWindowStyle() & wxTE_PROCESS_ENTER) )
     {
-        wxCommandEvent event(wxEVT_COMMAND_TEXT_ENTER, wxpeer->GetId());
+        wxCommandEvent event(wxEVT_TEXT_ENTER, wxpeer->GetId());
         event.SetEventObject( wxpeer );
         event.SetString( static_cast<wxTextCtrl*>(wxpeer)->GetValue() );
         wxpeer->HandleWindowEvent( event );
@@ -674,6 +673,7 @@ bool wxUITextFieldControl::SetHint(const wxString& hint)
 {
     wxCFStringRef hintstring(hint);
     [m_textField setPlaceholder:hintstring.AsNSString()];
+    return true;
 }
 
 #endif