Fixed bug: wxPropertyGridInterface::SetPropertyReadOnly() with wxPG_DONT_RECURSE...

[wxWidgets.git] / src / osx / textctrl_osx.cpp

diff --git a/src/osx/textctrl_osx.cpp b/src/osx/textctrl_osx.cpp
index feda0352d3b96cf2cd1bce5b2f8dc250bc12b335..1059c4b6c676e09581150e2882afc3b70deaa3af 100644 (file)
--- a/src/osx/textctrl_osx.cpp
+++ b/src/osx/textctrl_osx.cpp
@@ -80,7 +80,7 @@ void wxTextCtrl::Init()
 
     m_maxLength = 0;
     m_privateContextMenu = NULL;
 
     m_maxLength = 0;
     m_privateContextMenu = NULL;

-    m_triggerOnSetValue = true ;
+    m_triggerUpdateEvents = true ;

 }
 
 wxTextCtrl::~wxTextCtrl()
 }
 
 wxTextCtrl::~wxTextCtrl()


@@ -157,7 +157,7 @@ void wxTextCtrl::MacCheckSpelling(bool check)
     GetTextPeer()->CheckSpelling(check);
 }
 
     GetTextPeer()->CheckSpelling(check);
 }
 

-wxString wxTextCtrl::GetValue() const
+wxString wxTextCtrl::DoGetValue() const

 {
     return GetTextPeer()->GetStringValue() ;
 }
 {
     return GetTextPeer()->GetStringValue() ;
 }


@@ -167,20 +167,6 @@ void wxTextCtrl::GetSelection(long* from, long* to) const
     GetTextPeer()->GetSelection( from , to ) ;
 }
 
     GetTextPeer()->GetSelection( from , to ) ;
 }
 

-void wxTextCtrl::DoSetValue(const wxString& str, int flags)
-{
-    // optimize redraws
-    if ( GetValue() == str )
-        return;
-
-    GetTextPeer()->SetStringValue( str ) ;
-
-    if ( (flags & SetValue_SendEvent) && m_triggerOnSetValue )
-    {
-        SendTextUpdatedEvent();
-    }
-}
-

 void wxTextCtrl::SetMaxLength(unsigned long len)
 {
     m_maxLength = len ;
 void wxTextCtrl::SetMaxLength(unsigned long len)
 {
     m_maxLength = len ;


@@ -225,10 +211,8 @@ void wxTextCtrl::Cut()
     {
         GetTextPeer()->Cut() ;
 
     {
         GetTextPeer()->Cut() ;
 

-        wxCommandEvent event( wxEVT_COMMAND_TEXT_UPDATED, m_windowId );
-        event.SetEventObject( this );
-        HandleWindowEvent( event );
-      }
+        SendTextUpdatedEvent();
+    }

 }
 
 void wxTextCtrl::Paste()
 }
 
 void wxTextCtrl::Paste()


@@ -238,10 +222,7 @@ void wxTextCtrl::Paste()
         GetTextPeer()->Paste() ;
 
         // TODO: eventually we should add setting the default style again
         GetTextPeer()->Paste() ;
 
         // TODO: eventually we should add setting the default style again

-
-        wxCommandEvent event( wxEVT_COMMAND_TEXT_UPDATED, m_windowId );
-        event.SetEventObject( this );
-        HandleWindowEvent( event );
+        SendTextUpdatedEvent();

     }
 }
 
     }
 }
 


@@ -290,7 +271,7 @@ void wxTextCtrl::SetInsertionPoint(long pos)
 
 void wxTextCtrl::SetInsertionPointEnd()
 {
 
 void wxTextCtrl::SetInsertionPointEnd()
 {

-    wxTextPos pos = GetLastPosition();
+    long pos = GetLastPosition();

     SetInsertionPoint( pos );
 }
 
     SetInsertionPoint( pos );
 }
 


@@ -307,14 +288,11 @@ wxTextPos wxTextCtrl::GetLastPosition() const
     return GetTextPeer()->GetLastPosition() ;
 }
 
     return GetTextPeer()->GetLastPosition() ;
 }
 

-void wxTextCtrl::Replace(long from, long to, const wxString& str)
-{
-    GetTextPeer()->Replace( from , to , str ) ;
-}
-

 void wxTextCtrl::Remove(long from, long to)
 {
     GetTextPeer()->Remove( from , to ) ;
 void wxTextCtrl::Remove(long from, long to)
 {
     GetTextPeer()->Remove( from , to ) ;

+    if ( m_triggerUpdateEvents )
+        SendTextUpdatedEvent();

 }
 
 void wxTextCtrl::SetSelection(long from, long to)
 }
 
 void wxTextCtrl::SetSelection(long from, long to)


@@ -325,17 +303,14 @@ void wxTextCtrl::SetSelection(long from, long to)
 void wxTextCtrl::WriteText(const wxString& str)
 {
     GetTextPeer()->WriteText( str ) ;
 void wxTextCtrl::WriteText(const wxString& str)
 {
     GetTextPeer()->WriteText( str ) ;

-}
-
-void wxTextCtrl::AppendText(const wxString& text)
-{
-    SetInsertionPointEnd();
-    WriteText( text );
+    if ( m_triggerUpdateEvents )
+        SendTextUpdatedEvent();

 }
 
 void wxTextCtrl::Clear()
 {
     GetTextPeer()->Clear() ;
 }
 
 void wxTextCtrl::Clear()
 {
     GetTextPeer()->Clear() ;

+    SendTextUpdatedEvent();

 }
 
 bool wxTextCtrl::IsModified() const
 }
 
 bool wxTextCtrl::IsModified() const


@@ -767,7 +742,7 @@ void wxTextWidgetImpl::SetEditable(bool WXUNUSED(editable))
 {
 }
 
 {
 }
 

-wxTextPos wxTextWidgetImpl::GetLastPosition() const
+long wxTextWidgetImpl::GetLastPosition() const

 {
     return GetStringValue().length() ;
 }
 {
     return GetStringValue().length() ;
 }