don't crash on weird line endings like \r\r\n

[wxWidgets.git] / src / common / textcmn.cpp

diff --git a/src/common/textcmn.cpp b/src/common/textcmn.cpp
index f6d3bcb676951cf8a2e9a302433207f82331ced7..6f53679d6b3377592efe2ec47bd48be70028d362 100644 (file)
--- a/src/common/textcmn.cpp
+++ b/src/common/textcmn.cpp
@@ -54,6 +54,8 @@ DEFINE_EVENT_TYPE(wxEVT_COMMAND_TEXT_ENTER)
 DEFINE_EVENT_TYPE(wxEVT_COMMAND_TEXT_URL)
 DEFINE_EVENT_TYPE(wxEVT_COMMAND_TEXT_MAXLEN)
 
 DEFINE_EVENT_TYPE(wxEVT_COMMAND_TEXT_URL)
 DEFINE_EVENT_TYPE(wxEVT_COMMAND_TEXT_MAXLEN)
 

+IMPLEMENT_ABSTRACT_CLASS(wxTextCtrlBase, wxControl)
+

 // ----------------------------------------------------------------------------
 // style functions - not implemented here
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // style functions - not implemented here
 // ----------------------------------------------------------------------------


@@ -194,7 +196,7 @@ const wxTextAttr& wxTextCtrlBase::GetDefaultStyle() const
 // file IO functions
 // ----------------------------------------------------------------------------
 
 // file IO functions
 // ----------------------------------------------------------------------------
 

-bool wxTextCtrlBase::LoadFile(const wxString& filename)
+bool wxTextCtrlBase::DoLoadFile(const wxString& filename, int WXUNUSED(fileType))

 {
 #if wxUSE_FFILE
     wxFFile file(filename);
 {
 #if wxUSE_FFILE
     wxFFile file(filename);


@@ -219,7 +221,7 @@ bool wxTextCtrlBase::LoadFile(const wxString& filename)
     return false;
 }
 
     return false;
 }
 

-bool wxTextCtrlBase::SaveFile(const wxString& filename)
+bool wxTextCtrlBase::SaveFile(const wxString& filename, int fileType)

 {
     wxString filenameToUse = filename.empty() ? m_filename : filename;
     if ( filenameToUse.empty() )
 {
     wxString filenameToUse = filename.empty() ? m_filename : filename;
     if ( filenameToUse.empty() )


@@ -230,16 +232,21 @@ bool wxTextCtrlBase::SaveFile(const wxString& filename)
         return false;
     }
 
         return false;
     }
 

+    return DoSaveFile(filenameToUse, fileType);
+}
+
+bool wxTextCtrlBase::DoSaveFile(const wxString& filename, int WXUNUSED(fileType))
+{

 #if wxUSE_FFILE
 #if wxUSE_FFILE

-    wxFFile file(filenameToUse, _T("w"));
+    wxFFile file(filename, _T("w"));

     if ( file.IsOpened() && file.Write(GetValue()) )
     {
     if ( file.IsOpened() && file.Write(GetValue()) )
     {

+        // if it worked, save for future calls
+        m_filename = filename;
+

         // it's not modified any longer
         DiscardEdits();
 
         // it's not modified any longer
         DiscardEdits();
 

-        // if it worked, save for future calls
-        m_filename = filenameToUse;
-

         return true;
     }
 #endif // wxUSE_FFILE
         return true;
     }
 #endif // wxUSE_FFILE


@@ -518,6 +525,24 @@ wxTextCtrlBase::HitTest(const wxPoint& WXUNUSED(pt),
     return wxTE_HT_UNKNOWN;
 }
 
     return wxTE_HT_UNKNOWN;
 }
 

+// ----------------------------------------------------------------------------
+// events
+// ----------------------------------------------------------------------------
+
+void wxTextCtrlBase::SendTextUpdatedEvent()
+{
+    wxCommandEvent event(wxEVT_COMMAND_TEXT_UPDATED, GetId());
+
+    // do not do this as it could be very inefficient if the text control
+    // contains a lot of text and we're not using ref-counted wxString
+    // implementation -- instead, event.GetString() will query the control for
+    // its current text if needed
+    //event.SetString(GetValue());
+
+    event.SetEventObject(this);
+    GetEventHandler()->ProcessEvent(event);
+}
+

 #else // !wxUSE_TEXTCTRL
 
 // define this one even if !wxUSE_TEXTCTRL because it is also used by other
 #else // !wxUSE_TEXTCTRL
 
 // define this one even if !wxUSE_TEXTCTRL because it is also used by other