Fix wxPropertyGrid rendering problems when used with wxAUI. It seems we cannot rely...

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

diff --git a/src/osx/textctrl_osx.cpp b/src/osx/textctrl_osx.cpp
index feda0352d3b96cf2cd1bce5b2f8dc250bc12b335..6edd282e97b83ec4339ba51db7a97f455252569d 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_triggerOnSetValue = true ;
+    m_triggerUpdateEvents = true ;
 }
 
 wxTextCtrl::~wxTextCtrl()
@@ -119,7 +119,13 @@ bool wxTextCtrl::Create( wxWindow *parent,
     m_peer = wxWidgetImpl::CreateTextControl( this, GetParent(), GetId(), str, pos, size, style, GetExtraStyle() );
 
     MacPostControlCreate(pos, size) ;
-
+    
+#if wxOSX_USE_COCOA
+    // under carbon everything can already be set before the MacPostControlCreate embedding takes place
+    // but under cocoa for single line textfields this only works after everything has been set up
+    GetTextPeer()->SetStringValue(str);
+#endif
+    
     // only now the embedding is correct and we can do a positioning update
 
     MacSuperChangedPosition() ;
@@ -134,7 +140,7 @@ bool wxTextCtrl::Create( wxWindow *parent,
 
 wxTextWidgetImpl* wxTextCtrl::GetTextPeer() const
 {
-    return dynamic_cast<wxTextWidgetImpl*> (m_peer); 
+    return dynamic_cast<wxTextWidgetImpl*> (m_peer);
 }
 
 void wxTextCtrl::MacSuperChangedPosition()
@@ -157,7 +163,7 @@ void wxTextCtrl::MacCheckSpelling(bool check)
     GetTextPeer()->CheckSpelling(check);
 }
 
-wxString wxTextCtrl::GetValue() const
+wxString wxTextCtrl::DoGetValue() const
 {
     return GetTextPeer()->GetStringValue() ;
 }
@@ -167,20 +173,6 @@ void wxTextCtrl::GetSelection(long* from, long* to) const
     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 ;
@@ -225,10 +217,8 @@ void wxTextCtrl::Cut()
     {
         GetTextPeer()->Cut() ;
 
-        wxCommandEvent event( wxEVT_COMMAND_TEXT_UPDATED, m_windowId );
-        event.SetEventObject( this );
-        HandleWindowEvent( event );
-      }
+        SendTextUpdatedEvent();
+    }
 }
 
 void wxTextCtrl::Paste()
@@ -238,10 +228,7 @@ void wxTextCtrl::Paste()
         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 +277,7 @@ void wxTextCtrl::SetInsertionPoint(long pos)
 
 void wxTextCtrl::SetInsertionPointEnd()
 {
-    wxTextPos pos = GetLastPosition();
+    long pos = GetLastPosition();
     SetInsertionPoint( pos );
 }
 
@@ -307,14 +294,11 @@ wxTextPos wxTextCtrl::GetLastPosition() const
     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 ) ;
+    if ( m_triggerUpdateEvents )
+        SendTextUpdatedEvent();
 }
 
 void wxTextCtrl::SetSelection(long from, long to)
@@ -325,17 +309,14 @@ void wxTextCtrl::SetSelection(long from, long to)
 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() ;
+    SendTextUpdatedEvent();
 }
 
 bool wxTextCtrl::IsModified() const
@@ -392,6 +373,11 @@ wxSize wxTextCtrl::DoGetBestSize() const
     return wxSize(wText, hText);
 }
 
+bool wxTextCtrl::GetStyle(long position, wxTextAttr& style)
+{
+    return GetTextPeer()->GetStyle(position, style);
+}
+
 // ----------------------------------------------------------------------------
 // Undo/redo
 // ----------------------------------------------------------------------------
@@ -498,7 +484,7 @@ void wxTextCtrl::OnChar(wxKeyEvent& event)
         return ;
     }
 
-    if ( !IsEditable() && key != WXK_LEFT && key != WXK_RIGHT && key != WXK_DOWN && key != WXK_UP && key != WXK_TAB &&
+    if ( !IsEditable() && !event.IsKeyInCategory(WXK_CATEGORY_ARROW | WXK_CATEGORY_TAB) &&
         !( key == WXK_RETURN && ( (m_windowStyle & wxTE_PROCESS_ENTER) || (m_windowStyle & wxTE_MULTILINE) ) )
 //        && key != WXK_PAGEUP && key != WXK_PAGEDOWN && key != WXK_HOME && key != WXK_END
         )
@@ -511,8 +497,8 @@ void wxTextCtrl::OnChar(wxKeyEvent& event)
     // allow navigation and deletion
     GetSelection( &from, &to );
     if ( !IsMultiLine() && m_maxLength && GetValue().length() >= m_maxLength &&
-        key != WXK_LEFT && key != WXK_RIGHT && key != WXK_TAB && key != WXK_UP && key != WXK_DOWN && 
-        key != WXK_BACK && key != WXK_DELETE && !( key == WXK_RETURN && (m_windowStyle & wxTE_PROCESS_ENTER) ) &&
+        !event.IsKeyInCategory(WXK_CATEGORY_ARROW | WXK_CATEGORY_TAB | WXK_CATEGORY_CUT) &&
+        !( key == WXK_RETURN && (m_windowStyle & wxTE_PROCESS_ENTER) ) &&
         from == to )
     {
         // eat it, we don't want to add more than allowed # of characters
@@ -605,6 +591,8 @@ void wxTextCtrl::OnChar(wxKeyEvent& event)
         event.Skip(true) ;
     }
 
+    // osx_cocoa sends its event upon insertText
+#if wxOSX_USE_CARBON
     if ( ( key >= 0x20 && key < WXK_START ) ||
          ( key >= WXK_NUMPAD0 && key <= WXK_DIVIDE ) ||
          key == WXK_RETURN ||
@@ -615,6 +603,7 @@ void wxTextCtrl::OnChar(wxKeyEvent& event)
         event1.SetEventObject( this );
         wxPostEvent( GetEventHandler(), event1 );
     }
+#endif
 }
 
 // ----------------------------------------------------------------------------
@@ -740,6 +729,12 @@ bool wxTextCtrl::MacSetupCursor( const wxPoint& pt )
 // implementation base class
 // ----------------------------------------------------------------------------
 
+bool wxTextWidgetImpl::GetStyle(long WXUNUSED(position),
+                                wxTextAttr& WXUNUSED(style))
+{
+    return false;
+}
+
 void wxTextWidgetImpl::SetStyle(long WXUNUSED(start),
                                 long WXUNUSED(end),
                                 const wxTextAttr& WXUNUSED(style))
@@ -767,7 +762,7 @@ void wxTextWidgetImpl::SetEditable(bool WXUNUSED(editable))
 {
 }
 
-wxTextPos wxTextWidgetImpl::GetLastPosition() const
+long wxTextWidgetImpl::GetLastPosition() const
 {
     return GetStringValue().length() ;
 }