Disable some wxWebView tests that fail on the buildbot but not locally.

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

diff --git a/src/osx/textctrl_osx.cpp b/src/osx/textctrl_osx.cpp
index 5d243607e0c9a0d62156e9370b9d3ed55f3f03e6..a49ff2cfe209ea2e8613fa27a8c15f97655f9b7f 100644 (file)
--- a/src/osx/textctrl_osx.cpp
+++ b/src/osx/textctrl_osx.cpp
@@ -4,7 +4,7 @@
 // Author:      Stefan Csomor
 // Modified by: Ryan Norton (MLTE GetLineLength and GetLineText)
 // Created:     1998-01-01
 // Author:      Stefan Csomor
 // Modified by: Ryan Norton (MLTE GetLineLength and GetLineText)
 // Created:     1998-01-01

-// RCS-ID:      $Id: textctrl.cpp 54820 2008-07-29 20:04:11Z SC $
+// RCS-ID:      $Id$

 // Copyright:   (c) Stefan Csomor
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) Stefan Csomor
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////


@@ -48,11 +48,10 @@
 
 #include "wx/osx/private.h"
 
 
 #include "wx/osx/private.h"
 

-IMPLEMENT_DYNAMIC_CLASS(wxTextCtrl, wxTextCtrlBase)
-

 BEGIN_EVENT_TABLE(wxTextCtrl, wxTextCtrlBase)
     EVT_DROP_FILES(wxTextCtrl::OnDropFiles)
     EVT_CHAR(wxTextCtrl::OnChar)
 BEGIN_EVENT_TABLE(wxTextCtrl, wxTextCtrlBase)
     EVT_DROP_FILES(wxTextCtrl::OnDropFiles)
     EVT_CHAR(wxTextCtrl::OnChar)

+    EVT_KEY_DOWN(wxTextCtrl::OnKeyDown)

     EVT_MENU(wxID_CUT, wxTextCtrl::OnCut)
     EVT_MENU(wxID_COPY, wxTextCtrl::OnCopy)
     EVT_MENU(wxID_PASTE, wxTextCtrl::OnPaste)
     EVT_MENU(wxID_CUT, wxTextCtrl::OnCut)
     EVT_MENU(wxID_COPY, wxTextCtrl::OnCopy)
     EVT_MENU(wxID_PASTE, wxTextCtrl::OnPaste)


@@ -78,7 +77,6 @@ void wxTextCtrl::Init()
     m_dirty = false;
 
     m_privateContextMenu = NULL;
     m_dirty = false;
 
     m_privateContextMenu = NULL;

-    m_triggerUpdateEvents = true ;

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


@@ -97,7 +95,7 @@ bool wxTextCtrl::Create( wxWindow *parent,
     const wxValidator& validator,
     const wxString& name )
 {
     const wxValidator& validator,
     const wxString& name )
 {

-    m_macIsUserPane = false ;
+    DontCreatePeer();

     m_editable = true ;
 
     if ( ! (style & wxNO_BORDER) )
     m_editable = true ;
 
     if ( ! (style & wxNO_BORDER) )


@@ -114,16 +112,16 @@ bool wxTextCtrl::Create( wxWindow *parent,
     }
 
 
     }
 
 

-    m_peer = wxWidgetImpl::CreateTextControl( this, GetParent(), GetId(), str, pos, size, style, GetExtraStyle() );
+    SetPeer(wxWidgetImpl::CreateTextControl( this, GetParent(), GetId(), str, pos, size, style, GetExtraStyle() ));

 
     MacPostControlCreate(pos, size) ;
 
     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
 #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() ;
     // only now the embedding is correct and we can do a positioning update
 
     MacSuperChangedPosition() ;


@@ -136,11 +134,6 @@ bool wxTextCtrl::Create( wxWindow *parent,
     return true;
 }
 
     return true;
 }
 

-wxTextWidgetImpl* wxTextCtrl::GetTextPeer() const
-{
-    return dynamic_cast<wxTextWidgetImpl*> (m_peer);
-}
-

 void wxTextCtrl::MacSuperChangedPosition()
 {
     wxWindow::MacSuperChangedPosition() ;
 void wxTextCtrl::MacSuperChangedPosition()
 {
     wxWindow::MacSuperChangedPosition() ;


@@ -211,7 +204,7 @@ wxSize wxTextCtrl::DoGetBestSize() const
         if (size.x > 0 && size.y > 0)
             return size;
     }
         if (size.x > 0 && size.y > 0)
             return size;
     }

-    
+

     int wText, hText;
 
     // these are the numbers from the HIG:
     int wText, hText;
 
     // these are the numbers from the HIG:


@@ -293,33 +286,31 @@ wxString wxTextCtrl::GetLineText(long lineNo) const
     return GetTextPeer()->GetLineText(lineNo) ;
 }
 
     return GetTextPeer()->GetLineText(lineNo) ;
 }
 

-void wxTextCtrl::Remove(long from, long to)
-{
-    wxTextEntry::Remove(from, to);
-    if ( m_triggerUpdateEvents )
-        SendTextUpdatedEvent();
-}
-
-void wxTextCtrl::WriteText(const wxString& str)
+void wxTextCtrl::Copy()

 {
 {

-    wxTextEntry::WriteText( str ) ;
-    if ( m_triggerUpdateEvents )
-        SendTextUpdatedEvent();
-}
-
-void wxTextCtrl::Clear()
-{
-    wxTextEntry::Clear() ;
-    SendTextUpdatedEvent();
+    if (CanCopy())
+    {
+        wxClipboardTextEvent evt(wxEVT_COMMAND_TEXT_COPY, GetId());
+        evt.SetEventObject(this);
+        if (!GetEventHandler()->ProcessEvent(evt))
+        {
+            wxTextEntry::Copy();
+        }
+    }

 }
 
 void wxTextCtrl::Cut()
 {
     if (CanCut())
     {
 }
 
 void wxTextCtrl::Cut()
 {
     if (CanCut())
     {

-        wxTextEntry::Cut() ;
+        wxClipboardTextEvent evt(wxEVT_COMMAND_TEXT_CUT, GetId());
+        evt.SetEventObject(this);
+        if (!GetEventHandler()->ProcessEvent(evt))
+        {
+            wxTextEntry::Cut();

 
 

-        SendTextUpdatedEvent();
+            SendTextUpdatedEvent();
+        }

     }
 }
 
     }
 }
 


@@ -327,10 +318,15 @@ void wxTextCtrl::Paste()
 {
     if (CanPaste())
     {
 {
     if (CanPaste())
     {

-        wxTextEntry::Paste();
+        wxClipboardTextEvent evt(wxEVT_COMMAND_TEXT_PASTE, GetId());
+        evt.SetEventObject(this);
+        if (!GetEventHandler()->ProcessEvent(evt))
+        {
+            wxTextEntry::Paste();

 
 

-        // TODO: eventually we should add setting the default style again
-        SendTextUpdatedEvent();
+            // TODO: eventually we should add setting the default style again
+            SendTextUpdatedEvent();
+        }

     }
 }
 
     }
 }
 


@@ -341,27 +337,41 @@ void wxTextCtrl::OnDropFiles(wxDropFilesEvent& event)
         LoadFile( event.GetFiles()[0] );
 }
 
         LoadFile( event.GetFiles()[0] );
 }
 

+void wxTextCtrl::OnKeyDown(wxKeyEvent& event)
+{
+    if ( event.GetModifiers() == wxMOD_CONTROL )
+    {
+        switch( event.GetKeyCode() )
+        {
+            case 'A':
+                SelectAll();
+                return;
+            case 'C':
+                if ( CanCopy() )
+                    Copy() ;
+                return;
+            case 'V':
+                if ( CanPaste() )
+                    Paste() ;
+                return;
+            case 'X':
+                if ( CanCut() )
+                    Cut() ;
+                return;
+            default:
+                break;
+        }
+    }
+    // no, we didn't process it
+    event.Skip();
+}
+

 void wxTextCtrl::OnChar(wxKeyEvent& event)
 {
     int key = event.GetKeyCode() ;
     bool eat_key = false ;
     long from, to;
 
 void wxTextCtrl::OnChar(wxKeyEvent& event)
 {
     int key = event.GetKeyCode() ;
     bool eat_key = false ;
     long from, to;
 

-    if ( key == 'a' && event.MetaDown() )
-    {
-        SelectAll() ;
-
-        return ;
-    }
-
-    if ( key == 'c' && event.MetaDown() )
-    {
-        if ( CanCopy() )
-            Copy() ;
-
-        return ;
-    }
-

     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
     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


@@ -388,22 +398,6 @@ void wxTextCtrl::OnChar(wxKeyEvent& event)
     // assume that any key not processed yet is going to modify the control
     m_dirty = true;
 
     // assume that any key not processed yet is going to modify the control
     m_dirty = true;
 

-    if ( key == 'v' && event.MetaDown() )
-    {
-        if ( CanPaste() )
-            Paste() ;
-
-        return ;
-    }
-
-    if ( key == 'x' && event.MetaDown() )
-    {
-        if ( CanCut() )
-            Cut() ;
-
-        return ;
-    }
-

     switch ( key )
     {
         case WXK_RETURN:
     switch ( key )
     {
         case WXK_RETURN:


@@ -608,6 +602,21 @@ bool wxTextCtrl::MacSetupCursor( const wxPoint& pt )
         return true ;
 }
 
         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
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // implementation base class
 // ----------------------------------------------------------------------------


@@ -766,9 +775,10 @@ int wxTextWidgetImpl::GetLineLength(long lineNo) const
             count = 0;
             for (size_t j = i; j < content.length(); j++)
             {
             count = 0;
             for (size_t j = i; j < content.length(); j++)
             {

-                count++;

                 if (content[j] == '\n')
                     return count;
                 if (content[j] == '\n')
                     return count;

+
+                count++;

             }
 
             return count;
             }
 
             return count;