X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d01ca1e4d1078c854e3a354a9536c230525afdcc..ccc040255c07064f2ed96f1a345d21860b202cb6:/src/stc/stc.cpp diff --git a/src/stc/stc.cpp b/src/stc/stc.cpp index bb3320188c..1fa360de2d 100644 --- a/src/stc/stc.cpp +++ b/src/stc/stc.cpp @@ -47,7 +47,11 @@ #include "wx/tokenzr.h" #include "wx/mstream.h" #include "wx/image.h" -#include "wx/ffile.h" +#if wxUSE_FFILE + #include "wx/ffile.h" +#elif wxUSE_FILE + #include "wx/ffile.h" +#endif #include "ScintillaWX.h" @@ -963,7 +967,7 @@ void wxStyledTextCtrl::SetWordChars(const wxString& characters) // Get the set of characters making up words for when moving or selecting by word. wxString wxStyledTextCtrl::GetWordChars() const { int msg = 2646; - int len = SendMsg(msg, 0, NULL); + int len = SendMsg(msg, 0, (sptr_t)NULL); if (!len) return wxEmptyString; wxMemoryBuffer mbuf(len+1); @@ -2212,7 +2216,7 @@ int wxStyledTextCtrl::GetMultiPaste() const // Retrieve the value of a tag from a regular expression search. wxString wxStyledTextCtrl::GetTag(int tagNumber) const { int msg = 2616; - int len = SendMsg(msg, tagNumber, NULL); + int len = SendMsg(msg, tagNumber, (sptr_t)NULL); if (!len) return wxEmptyString; wxMemoryBuffer mbuf(len+1); @@ -3163,7 +3167,7 @@ void wxStyledTextCtrl::SetWhitespaceChars(const wxString& characters) // Get the set of characters making up whitespace for when moving or selecting by word. wxString wxStyledTextCtrl::GetWhitespaceChars() const { int msg = 2647; - int len = SendMsg(msg, 0, NULL); + int len = SendMsg(msg, 0, (sptr_t)NULL); if (!len) return wxEmptyString; wxMemoryBuffer mbuf(len+1); @@ -3184,7 +3188,7 @@ void wxStyledTextCtrl::SetPunctuationChars(const wxString& characters) // Get the set of characters making up punctuation characters wxString wxStyledTextCtrl::GetPunctuationChars() const { int msg = 2649; - int len = SendMsg(msg, 0, NULL); + int len = SendMsg(msg, 0, (sptr_t)NULL); if (!len) return wxEmptyString; wxMemoryBuffer mbuf(len+1); @@ -4074,7 +4078,7 @@ void* wxStyledTextCtrl::PrivateLexerCall(int operation, void* pointer) { // Retrieve a '\n' separated list of properties understood by the current lexer. wxString wxStyledTextCtrl::PropertyNames() const { int msg = 4014; - int len = SendMsg(msg, 0, NULL); + int len = SendMsg(msg, 0, (sptr_t)NULL); if (!len) return wxEmptyString; wxMemoryBuffer mbuf(len+1); @@ -4094,7 +4098,7 @@ int wxStyledTextCtrl::PropertyType(const wxString& name) // Describe a property. wxString wxStyledTextCtrl::DescribeProperty(const wxString& name) const { int msg = 4016; - int len = SendMsg(msg, (sptr_t)(const char*)wx2stc(name), NULL); + int len = SendMsg(msg, (sptr_t)(const char*)wx2stc(name), (sptr_t)NULL); if (!len) return wxEmptyString; wxMemoryBuffer mbuf(len+1); @@ -4108,7 +4112,7 @@ wxString wxStyledTextCtrl::DescribeProperty(const wxString& name) const { // Retrieve a '\n' separated list of descriptions of the keyword sets understood by the current lexer. wxString wxStyledTextCtrl::DescribeKeyWordSets() const { int msg = 4017; - int len = SendMsg(msg, 0, NULL); + int len = SendMsg(msg, 0, (sptr_t)NULL); if (!len) return wxEmptyString; wxMemoryBuffer mbuf(len+1); @@ -4372,58 +4376,114 @@ void wxStyledTextCtrl::ScrollToColumn(int column) { } -#if wxUSE_TEXTCTRL -bool wxStyledTextCtrl::DoSaveFile(const wxString& filename, int fileType) +void wxStyledTextCtrl::DoSetValue(const wxString& value, int flags) { - bool ok = wxTextAreaBase::DoSaveFile(filename, fileType); -#else -bool wxStyledTextCtrl::SaveFile(const wxString& filename) + if ( flags & SetValue_SelectionOnly ) + ReplaceSelection(value); + else + SetText(value); + + // We don't send wxEVT_COMMAND_TEXT_UPDATED anyhow, so ignore the + // SetValue_SendEvent bit of the flags +} + +bool +wxStyledTextCtrl::DoSaveFile(const wxString& filename, int WXUNUSED(fileType)) { +#if wxUSE_FFILE || wxUSE_FILE + #if wxUSE_FFILE - wxFFile file(filename, wxT("w")); - bool ok = file.IsOpened() && file.Write(GetValue(), *wxConvCurrent); -#else - bool ok = false; -#endif // wxUSE_FFILE + // Take care to use "b" to ensure that possibly non-native EOLs in the file + // contents are not mangled when saving it. + wxFFile file(filename, wxS("wb")); +#elif wxUSE_FILE + wxFile file(filename, wxFile::write); #endif - if (ok) + + if ( file.IsOpened() && file.Write(GetValue(), *wxConvCurrent) ) { SetSavePoint(); + + return true; } - return ok; + +#endif // !wxUSE_FFILE && !wxUSE_FILE + + return false; } -#if wxUSE_TEXTCTRL -bool wxStyledTextCtrl::DoLoadFile(const wxString& filename, int fileType) -{ - bool ok = wxTextAreaBase::DoLoadFile(filename, fileType); -#else -bool wxStyledTextCtrl::LoadFile(const wxString& filename) +bool +wxStyledTextCtrl::DoLoadFile(const wxString& filename, int WXUNUSED(fileType)) { +#if wxUSE_FFILE || wxUSE_FILE + #if wxUSE_FFILE - wxFFile file(filename); - bool ok = file.IsOpened(); - if (ok) + // As above, we want to read the real EOLs from the file, e.g. without + // translating them to just LFs under Windows, so that the original CR LF + // are preserved when it's written back. + wxFFile file(filename, wxS("rb")); +#else + wxFile file(filename); +#endif + + if ( file.IsOpened() ) { wxString text; - ok = file.ReadAll(&text, *wxConvCurrent); - if (ok) + if ( file.ReadAll(&text, *wxConvCurrent) ) { + // Detect the EOL: we use just the first line because there is not + // much we can do if the file uses inconsistent EOLs anyhow, we'd + // need to ask the user about the one we should really use and we + // don't currently provide a way to do it. + // + // We also only check for Unix and DOS EOLs but not classic Mac + // CR-only one as it's obsolete by now. + const wxString::size_type posLF = text.find('\n'); + if ( posLF != wxString::npos ) + { + // Set EOL mode to ensure that the new lines inserted into the + // text use the same EOLs as the existing ones. + if ( posLF > 0 && text[posLF - 1] == '\r' ) + SetEOLMode(wxSTC_EOL_CRLF); + else + SetEOLMode(wxSTC_EOL_LF); + } + //else: Use the default EOL for the current platform. + SetValue(text); + EmptyUndoBuffer(); + SetSavePoint(); + + return true; } } -#else - bool ok = false; -#endif // wxUSE_FFILE -#endif - if (ok) - { - EmptyUndoBuffer(); - SetSavePoint(); - } - return ok; +#endif // !wxUSE_FFILE && !wxUSE_FILE + + return false; +} + +// If we don't derive from wxTextAreaBase, we need to implement these methods +// ourselves, otherwise we already inherit them. +#if !wxUSE_TEXTCTRL + +bool wxStyledTextCtrl::SaveFile(const wxString& filename) +{ + if ( filename.empty() ) + return false; + + return DoSaveFile(filename, wxTEXT_TYPE_ANY); +} + +bool wxStyledTextCtrl::LoadFile(const wxString& filename) +{ + if ( filename.empty() ) + return false; + + return DoLoadFile(filename, wxTEXT_TYPE_ANY); } +#endif // !wxUSE_TEXTCTRL + #if wxUSE_DRAG_AND_DROP wxDragResult wxStyledTextCtrl::DoDragOver(wxCoord x, wxCoord y, wxDragResult def) { return m_swx->DoDragOver(x, y, def); @@ -4444,6 +4504,9 @@ bool wxStyledTextCtrl::GetUseAntiAliasing() { return m_swx->GetUseAntiAliasing(); } +void wxStyledTextCtrl::AnnotationClearLine(int line) { + SendMsg(SCI_ANNOTATIONSETTEXT, line, NULL); +}