Fix another crash when conversion fails in Unix PostScript code.

[wxWidgets.git] / src / stc / stc.cpp

diff --git a/src/stc/stc.cpp b/src/stc/stc.cpp
index 1dc93c27de4543e43a61798ab831bc3a2533b3ba..93e4266d2bef4036d5bff6a3ac497dae9d4b5e9a 100644 (file)
--- a/src/stc/stc.cpp
+++ b/src/stc/stc.cpp
@@ -10,7 +10,6 @@
 // Author:      Robin Dunn
 //
 // Created:     13-Jan-2000
 // Author:      Robin Dunn
 //
 // Created:     13-Jan-2000

-// RCS-ID:      $Id$

 // Copyright:   (c) 2000 by Total Control Software
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) 2000 by Total Control Software
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////


@@ -50,7 +49,7 @@
 #if wxUSE_FFILE
     #include "wx/ffile.h"
 #elif wxUSE_FILE
 #if wxUSE_FFILE
     #include "wx/ffile.h"
 #elif wxUSE_FILE

-    #include "wx/ffile.h"
+    #include "wx/file.h"

 #endif
 
 #ifdef __WXGTK__
 #endif
 
 #ifdef __WXGTK__


@@ -1797,12 +1796,12 @@ int wxStyledTextCtrl::GetTargetEnd() const
          return SendMsg(2194, wx2stclen(text, buf), (sptr_t)(const char*)buf);
 }
 
          return SendMsg(2194, wx2stclen(text, buf), (sptr_t)(const char*)buf);
 }
 

-// Replace the target text with the argument text after \d processing.
+// Replace the target text with the argument text after \\d processing.

 // Text is counted so it can contain NULs.
 // Text is counted so it can contain NULs.

-// Looks for \d where d is between 1 and 9 and replaces these with the strings
+// Looks for \\d where d is between 1 and 9 and replaces these with the strings

 // matched in the last search operation which were surrounded by \( and \).
 // Returns the length of the replacement text including any change
 // matched in the last search operation which were surrounded by \( and \).
 // Returns the length of the replacement text including any change

-// caused by processing the \d patterns.
+// caused by processing the \\d patterns.

 
      int wxStyledTextCtrl::ReplaceTargetRE(const wxString& text) {
          const wxWX2MBbuf buf = wx2stc(text);
 
      int wxStyledTextCtrl::ReplaceTargetRE(const wxString& text) {
          const wxWX2MBbuf buf = wx2stc(text);


@@ -2211,7 +2210,7 @@ void wxStyledTextCtrl::SetMultiPaste(int multiPaste)
     SendMsg(2614, multiPaste, 0);
 }
 
     SendMsg(2614, multiPaste, 0);
 }
 

-// Retrieve the effect of pasting when there are multiple selections..
+// Retrieve the effect of pasting when there are multiple selections.

 int wxStyledTextCtrl::GetMultiPaste() const
 {
     return SendMsg(2615, 0, 0);
 int wxStyledTextCtrl::GetMultiPaste() const
 {
     return SendMsg(2615, 0, 0);