CrystalEdit/Sample: Fix compilation errors

diff --git a/Externals/crystaledit/editlib/parsers/crystallineparser.cpp b/Externals/crystaledit/editlib/parsers/crystallineparser.cpp
index 81a6a66..d55853f 100644 (file)
--- a/Externals/crystaledit/editlib/parsers/crystallineparser.cpp
+++ b/Externals/crystaledit/editlib/parsers/crystallineparser.cpp
@@ -119,13 +119,13 @@ GetTextType(int index)
  * @param [in] exts Extension setting
  */
 void
-SetExtension(int index, const String& exts)
+SetExtension(int index, const TCHAR *pszExts)
 {
   if (index < 0 || index > SRC_XML)
     return;
 
   int size = sizeof(TextDefinition::exts) / sizeof(TextDefinition::exts[0]);
-  _tcscpy_s(m_SourceDefs[index].exts, size, exts.c_str());
+  _tcscpy_s(m_SourceDefs[index].exts, size, pszExts);
 }
 
 }

diff --git a/Externals/crystaledit/editlib/parsers/crystallineparser.h b/Externals/crystaledit/editlib/parsers/crystallineparser.h
index ebc5b59..3794ba5 100644 (file)
--- a/Externals/crystaledit/editlib/parsers/crystallineparser.h
+++ b/Externals/crystaledit/editlib/parsers/crystallineparser.h
@@ -137,7 +137,7 @@ bool IsHtmlUser2Keyword(const TCHAR *pszChars, int nLength);
 \r
 TextDefinition *GetTextType(const TCHAR *pszExt);\r
 TextDefinition* GetTextType(int index);\r
-void SetExtension(int index, const String& exts);\r
+void SetExtension(int index, const TCHAR *pszExts);\r
 \r
 unsigned ParseLinePlain(unsigned dwCookie, const TCHAR *pszChars, int nLength, TEXTBLOCK * pBuf, int &nActualItems);\r
 unsigned ParseLineAsp(unsigned dwCookie, const TCHAR *pszChars, int nLength, TEXTBLOCK * pBuf, int &nActualItems);\r

diff --git a/Src/OptionsEditorSyntax.cpp b/Src/OptionsEditorSyntax.cpp
index 9a1eff5..5251f78 100644 (file)
--- a/Src/OptionsEditorSyntax.cpp
+++ b/Src/OptionsEditorSyntax.cpp
@@ -53,7 +53,7 @@ void SetDefaults(COptionsMgr *pOptionsMgr)
 
                        // Register the settings read from the registry in CrystalLineParser.
                        String exts = pOptionsMgr->GetString(name);
-                       CrystalLineParser::SetExtension(i, exts);
+                       CrystalLineParser::SetExtension(i, exts.c_str());
                }
        }
 }
@@ -100,7 +100,7 @@ void Save(COptionsMgr* pOptionsMgr, const String* const pExtension)
                        pOptionsMgr->SaveOption(name, pExtension[i-1]);
 
                        // Save the extension settings to CrystalLineParser.
-                       CrystalLineParser::SetExtension(i, pExtension[i-1]);
+                       CrystalLineParser::SetExtension(i, pExtension[i-1].c_str());
                }
        }
 }