Correct format specifiers used to show wxIPV4address.

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

diff --git a/src/osx/textctrl_osx.cpp b/src/osx/textctrl_osx.cpp
index af08390bfad3ae7a958eabc4d2451ed289c4d949..e7e82f21c2143569cdfe143eaff4c5640f814a23 100644 (file)
--- a/src/osx/textctrl_osx.cpp
+++ b/src/osx/textctrl_osx.cpp
@@ -79,7 +79,6 @@ void wxTextCtrl::Init()
     m_dirty = false;
 
     m_privateContextMenu = NULL;
     m_dirty = false;
 
     m_privateContextMenu = NULL;

-    m_triggerUpdateEvents = true ;

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


@@ -137,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() ;


@@ -294,33 +288,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)
-{
-    wxTextEntry::WriteText( str ) ;
-    if ( m_triggerUpdateEvents )
-        SendTextUpdatedEvent();
-}
-
-void wxTextCtrl::Clear()
+void wxTextCtrl::Copy()

 {
 {

-    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();
+        }

     }
 }
 
     }
 }
 


@@ -328,10 +320,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();
+        }

     }
 }
 
     }
 }
 


@@ -344,7 +341,7 @@ void wxTextCtrl::OnDropFiles(wxDropFilesEvent& event)
 
 void wxTextCtrl::OnKeyDown(wxKeyEvent& event)
 {
 
 void wxTextCtrl::OnKeyDown(wxKeyEvent& event)
 {

-    if ( event.MetaDown() )
+    if ( event.GetModifiers() == wxMOD_CMD )

     {
         switch( event.GetKeyCode() )
         {
     {
         switch( event.GetKeyCode() )
         {