X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6eaa9a7e082a4653642151865df7d0edea480f27..cc2608047b09f1fedfae027c083a35b1073010a4:/src/common/textcmn.cpp

diff --git a/src/common/textcmn.cpp b/src/common/textcmn.cpp
index 526f83412d..6248877613 100644
--- a/src/common/textcmn.cpp
+++ b/src/common/textcmn.cpp
@@ -736,7 +736,7 @@ bool wxTextCtrlBase::SetDefaultStyle(const wxTextAttr& style)
 // file IO functions
 // ----------------------------------------------------------------------------
 
-bool wxTextCtrlBase::DoLoadFile(const wxString& filename, int WXUNUSED(fileType))
+bool wxTextAreaBase::DoLoadFile(const wxString& filename, int WXUNUSED(fileType))
 {
 #if wxUSE_FFILE
     wxFFile file(filename);
@@ -747,18 +747,34 @@ bool wxTextCtrlBase::DoLoadFile(const wxString& filename, int WXUNUSED(fileType)
         {
             SetValue(text);
 
-            DiscardEdits();
-
-            m_filename = filename;
-
             return true;
         }
     }
+#endif // wxUSE_FFILE
+
+    return false;
+}
 
+bool wxTextCtrlBase::DoLoadFile(const wxString& filename, int fileType)
+{
+    if ( wxTextAreaBase::DoLoadFile(filename, fileType) )
+    {
+        DiscardEdits();
+        m_filename = filename;
+        return true;
+    }
     wxLogError(_("File couldn't be loaded."));
-#endif // wxUSE_FFILE
+    return false;
+}
 
+bool wxTextAreaBase::DoSaveFile(const wxString& filename, int WXUNUSED(fileType))
+{
+#if wxUSE_FFILE
+    wxFFile file(filename, wxT("w"));
+    return file.IsOpened() && file.Write(GetValue(), *wxConvCurrent);
+#else
     return false;
+#endif // wxUSE_FFILE
 }
 
 bool wxTextAreaBase::SaveFile(const wxString& filename, int fileType)
@@ -775,11 +791,9 @@ bool wxTextAreaBase::SaveFile(const wxString& filename, int fileType)
     return DoSaveFile(filenameToUse, fileType);
 }
 
-bool wxTextCtrlBase::DoSaveFile(const wxString& filename, int WXUNUSED(fileType))
+bool wxTextCtrlBase::DoSaveFile(const wxString& filename, int fileType)
 {
-#if wxUSE_FFILE
-    wxFFile file(filename, _T("w"));
-    if ( file.IsOpened() && file.Write(GetValue()) )
+    if ( wxTextAreaBase::DoSaveFile(filename, fileType) )
     {
         // if it worked, save for future calls
         m_filename = filename;
@@ -789,10 +803,6 @@ bool wxTextCtrlBase::DoSaveFile(const wxString& filename, int WXUNUSED(fileType)
 
         return true;
     }
-#endif // wxUSE_FFILE
-
-    wxLogError(_("The text couldn't be saved."));
-
     return false;
 }
 
@@ -859,32 +869,32 @@ bool wxTextCtrlBase::EmulateKeyPress(const wxKeyEvent& event)
         case WXK_NUMPAD7:
         case WXK_NUMPAD8:
         case WXK_NUMPAD9:
-            ch = (wxChar)(_T('0') + keycode - WXK_NUMPAD0);
+            ch = (wxChar)(wxT('0') + keycode - WXK_NUMPAD0);
             break;
 
         case WXK_MULTIPLY:
         case WXK_NUMPAD_MULTIPLY:
-            ch = _T('*');
+            ch = wxT('*');
             break;
 
         case WXK_ADD:
         case WXK_NUMPAD_ADD:
-            ch = _T('+');
+            ch = wxT('+');
             break;
 
         case WXK_SUBTRACT:
         case WXK_NUMPAD_SUBTRACT:
-            ch = _T('-');
+            ch = wxT('-');
             break;
 
         case WXK_DECIMAL:
         case WXK_NUMPAD_DECIMAL:
-            ch = _T('.');
+            ch = wxT('.');
             break;
 
         case WXK_DIVIDE:
         case WXK_NUMPAD_DIVIDE:
-            ch = _T('/');
+            ch = wxT('/');
             break;
 
         case WXK_DELETE:
@@ -926,7 +936,7 @@ bool wxTextCtrlBase::EmulateKeyPress(const wxKeyEvent& event)
             }
             else
             {
-                ch = _T('\0');
+                ch = wxT('\0');
             }
     }