Fixed wxscintilla compilation for wxDFB.

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

diff --git a/src/osx/textctrl_osx.cpp b/src/osx/textctrl_osx.cpp
index 573fd4c6ae5973d05a15800230c4a1332fa8ebd4..e7e82f21c2143569cdfe143eaff4c5640f814a23 100644 (file)
--- a/src/osx/textctrl_osx.cpp
+++ b/src/osx/textctrl_osx.cpp
@@ -53,6 +53,7 @@ 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)


@@ -75,12 +76,9 @@ END_EVENT_TABLE()
 
 void wxTextCtrl::Init()
 {
 
 void wxTextCtrl::Init()
 {

-    m_editable = true ;

     m_dirty = false;
 
     m_dirty = false;
 

-    m_maxLength = 0;

     m_privateContextMenu = NULL;
     m_privateContextMenu = NULL;

-    m_triggerUpdateEvents = true ;

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


@@ -138,11 +136,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() ;


@@ -163,16 +156,6 @@ void wxTextCtrl::MacCheckSpelling(bool check)
     GetTextPeer()->CheckSpelling(check);
 }
 
     GetTextPeer()->CheckSpelling(check);
 }
 

-wxString wxTextCtrl::DoGetValue() const
-{
-    return GetTextPeer()->GetStringValue() ;
-}
-
-void wxTextCtrl::GetSelection(long* from, long* to) const
-{
-    GetTextPeer()->GetSelection( from , to ) ;
-}
-

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


@@ -204,132 +187,11 @@ bool wxTextCtrl::SetDefaultStyle(const wxTextAttr& style)
     return true ;
 }
 
     return true ;
 }
 

-// Clipboard operations
-
-void wxTextCtrl::Copy()
-{
-    if (CanCopy())
-        GetTextPeer()->Copy() ;
-}
-
-void wxTextCtrl::Cut()
-{
-    if (CanCut())
-    {
-        GetTextPeer()->Cut() ;
-
-        SendTextUpdatedEvent();
-    }
-}
-
-void wxTextCtrl::Paste()
-{
-    if (CanPaste())
-    {
-        GetTextPeer()->Paste() ;
-
-        // TODO: eventually we should add setting the default style again
-        SendTextUpdatedEvent();
-    }
-}
-
-bool wxTextCtrl::CanCopy() const
-{
-    // Can copy if there's a selection
-    long from, to;
-    GetSelection( &from, &to );
-
-    return (from != to);
-}
-
-bool wxTextCtrl::CanCut() const
-{
-    if ( !IsEditable() )
-        return false;
-
-    // Can cut if there's a selection
-    long from, to;
-    GetSelection( &from, &to );
-
-    return (from != to);
-}
-
-bool wxTextCtrl::CanPaste() const
-{
-    if (!IsEditable())
-        return false;
-
-    return GetTextPeer()->CanPaste() ;
-}
-
-void wxTextCtrl::SetEditable(bool editable)
-{
-    if ( editable != m_editable )
-    {
-        m_editable = editable ;
-        GetTextPeer()->SetEditable( editable ) ;
-    }
-}
-
-void wxTextCtrl::SetInsertionPoint(long pos)
-{
-    SetSelection( pos , pos ) ;
-}
-
-void wxTextCtrl::SetInsertionPointEnd()
-{
-    long pos = GetLastPosition();
-    SetInsertionPoint( pos );
-}
-
-long wxTextCtrl::GetInsertionPoint() const
-{
-    long begin, end ;
-    GetSelection( &begin , &end ) ;
-
-    return begin ;
-}
-
-wxTextPos wxTextCtrl::GetLastPosition() const
-{
-    return GetTextPeer()->GetLastPosition() ;
-}
-
-void wxTextCtrl::Remove(long from, long to)
-{
-    GetTextPeer()->Remove( from , to ) ;
-    if ( m_triggerUpdateEvents )
-        SendTextUpdatedEvent();
-}
-
-void wxTextCtrl::SetSelection(long from, long to)
-{
-    GetTextPeer()->SetSelection( from , to ) ;
-}
-
-void wxTextCtrl::WriteText(const wxString& str)
-{
-    GetTextPeer()->WriteText( str ) ;
-    if ( m_triggerUpdateEvents )
-        SendTextUpdatedEvent();
-}
-
-void wxTextCtrl::Clear()
-{
-    GetTextPeer()->Clear() ;
-    SendTextUpdatedEvent();
-}
-

 bool wxTextCtrl::IsModified() const
 {
     return m_dirty;
 }
 
 bool wxTextCtrl::IsModified() const
 {
     return m_dirty;
 }
 

-bool wxTextCtrl::IsEditable() const
-{
-    return IsEnabled() && m_editable ;
-}
-

 bool wxTextCtrl::AcceptsFocus() const
 {
     // we don't want focus if we can't be edited
 bool wxTextCtrl::AcceptsFocus() const
 {
     // we don't want focus if we can't be edited


@@ -386,38 +248,6 @@ bool wxTextCtrl::GetStyle(long position, wxTextAttr& style)
     return GetTextPeer()->GetStyle(position, style);
 }
 
     return GetTextPeer()->GetStyle(position, style);
 }
 

-// ----------------------------------------------------------------------------
-// Undo/redo
-// ----------------------------------------------------------------------------
-
-void wxTextCtrl::Undo()
-{
-    if (CanUndo())
-        GetTextPeer()->Undo() ;
-}
-
-void wxTextCtrl::Redo()
-{
-    if (CanRedo())
-        GetTextPeer()->Redo() ;
-}
-
-bool wxTextCtrl::CanUndo() const
-{
-    if ( !IsEditable() )
-        return false ;
-
-    return GetTextPeer()->CanUndo() ;
-}
-
-bool wxTextCtrl::CanRedo() const
-{
-    if ( !IsEditable() )
-        return false ;
-
-    return GetTextPeer()->CanRedo() ;
-}
-

 void wxTextCtrl::MarkDirty()
 {
     m_dirty = true;
 void wxTextCtrl::MarkDirty()
 {
     m_dirty = true;


@@ -458,10 +288,48 @@ wxString wxTextCtrl::GetLineText(long lineNo) const
     return GetTextPeer()->GetLineText(lineNo) ;
 }
 
     return GetTextPeer()->GetLineText(lineNo) ;
 }
 

-void wxTextCtrl::Command(wxCommandEvent & event)
+void wxTextCtrl::Copy()

 {
 {

-    SetValue(event.GetString());
-    ProcessCommand(event);
+    if (CanCopy())
+    {
+        wxClipboardTextEvent evt(wxEVT_COMMAND_TEXT_COPY, GetId());        
+        evt.SetEventObject(this);
+        if (!GetEventHandler()->ProcessEvent(evt))
+        {
+            wxTextEntry::Copy();
+        }
+    }
+}
+
+void wxTextCtrl::Cut()
+{
+    if (CanCut())
+    {
+        wxClipboardTextEvent evt(wxEVT_COMMAND_TEXT_CUT, GetId());        
+        evt.SetEventObject(this);
+        if (!GetEventHandler()->ProcessEvent(evt))
+        {
+            wxTextEntry::Cut();
+
+            SendTextUpdatedEvent();
+        }
+    }
+}
+
+void wxTextCtrl::Paste()
+{
+    if (CanPaste())
+    {
+        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();
+        }
+    }

 }
 
 void wxTextCtrl::OnDropFiles(wxDropFilesEvent& event)
 }
 
 void wxTextCtrl::OnDropFiles(wxDropFilesEvent& event)


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

+void wxTextCtrl::OnKeyDown(wxKeyEvent& event)
+{
+    if ( event.GetModifiers() == wxMOD_CMD )
+    {
+        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


@@ -518,22 +400,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:


@@ -614,10 +480,18 @@ void wxTextCtrl::OnChar(wxKeyEvent& event)
 #endif
 }
 
 #endif
 }
 

+void wxTextCtrl::Command(wxCommandEvent & event)
+{
+    SetValue(event.GetString());
+    ProcessCommand(event);
+}
+

 // ----------------------------------------------------------------------------
 // standard handlers for standard edit menu events
 // ----------------------------------------------------------------------------
 
 // ----------------------------------------------------------------------------
 // standard handlers for standard edit menu events
 // ----------------------------------------------------------------------------
 

+// CS: Context Menus only work with MLTE implementations or non-multiline HIViews at the moment
+

 void wxTextCtrl::OnCut(wxCommandEvent& WXUNUSED(event))
 {
     Cut();
 void wxTextCtrl::OnCut(wxCommandEvent& WXUNUSED(event))
 {
     Cut();


@@ -695,8 +569,6 @@ void wxTextCtrl::OnUpdateSelectAll(wxUpdateUIEvent& event)
     event.Enable(GetLastPosition() > 0);
 }
 
     event.Enable(GetLastPosition() > 0);
 }
 

-// CS: Context Menus only work with MLTE implementations or non-multiline HIViews at the moment
-

 void wxTextCtrl::OnContextMenu(wxContextMenuEvent& event)
 {
     if ( GetTextPeer()->HasOwnContextMenu() )
 void wxTextCtrl::OnContextMenu(wxContextMenuEvent& event)
 {
     if ( GetTextPeer()->HasOwnContextMenu() )