diff --git a/MUSHclient.cpp b/MUSHclient.cpp index 32c554c4..b1fbadb1 100644 --- a/MUSHclient.cpp +++ b/MUSHclient.cpp @@ -1855,8 +1855,8 @@ CTextDocument * pTextDoc = FindNotepad (strTitle); return false; } // end of having an existing notepad document - BOOL bOK = CreateTextWindow (strText, // contents - strTitle, // title + BOOL bOK = CreateTextWindow ((LPCTSTR) strText, // contents + (LPCTSTR) strTitle, // title NULL, // document 0, // document number App.m_strDefaultInputFont, diff --git a/TextDocument.cpp b/TextDocument.cpp index 8b6659b3..d68c13ba 100644 --- a/TextDocument.cpp +++ b/TextDocument.cpp @@ -436,7 +436,7 @@ CMUSHclientDoc * pDoc = FindWorld (); } CreateTextWindow ("", // contents - strTitle, // title + (LPCTSTR) strTitle, // title pDoc, // document m_iUniqueDocumentNumber, // document number m_strFontName, diff --git a/dialogs/cmdhist.cpp b/dialogs/cmdhist.cpp index 516da5f4..74ac3fbd 100644 --- a/dialogs/cmdhist.cpp +++ b/dialogs/cmdhist.cpp @@ -242,7 +242,7 @@ CString str; str = m_msgList->GetAt (pos); // edit current input window - CreateTextWindow (str, // command + CreateTextWindow ((LPCTSTR) str, // command TFormat ("Notepad: %s", (LPCTSTR) m_pDoc->m_mush_name), // title m_pDoc, // document m_pDoc->m_iUniqueDocumentNumber, // document number diff --git a/doc.cpp b/doc.cpp index ca22a067..039f4f76 100644 --- a/doc.cpp +++ b/doc.cpp @@ -5126,7 +5126,7 @@ CString strMessage; dlg.m_strRecallLinePreamble); if (!strMessage.IsEmpty ()) - CreateTextWindow (strMessage, + CreateTextWindow ((LPCTSTR) strMessage, TFormat ("Recall: %s", (LPCTSTR) m_RecallFindInfo.m_strFindStringList.GetHead ()), this, @@ -6403,8 +6403,11 @@ void CMUSHclientDoc::SendTo ( break; case eSendToNotepad: - CreateTextWindow (strSendText + ENDLINE, // contents - strDescription, // title + { + CString strContents = strSendText; + strContents += ENDLINE; + CreateTextWindow ((LPCTSTR) strContents, // contents + (LPCTSTR) strDescription, // title this, // document m_iUniqueDocumentNumber, // document number m_input_font_name, @@ -6423,6 +6426,7 @@ void CMUSHclientDoc::SendTo ( false, eNotepadTrigger ); + } break; case eAppendToNotepad: @@ -7435,7 +7439,9 @@ UINT dFormat = 0; CloseClipboard(); - CreateTextWindow (strMessage + ENDLINE, // contents + CString strContents = strMessage; + strContents += ENDLINE; + CreateTextWindow ((LPCTSTR) strContents, // contents "Clipboard contents", // title this, // document m_iUniqueDocumentNumber, // document number diff --git a/mushview.cpp b/mushview.cpp index 9d9f46bc..61eeaefa 100644 --- a/mushview.cpp +++ b/mushview.cpp @@ -5441,7 +5441,7 @@ CString strSelection; // edit current input window - CreateTextWindow (strSelection, // contents + CreateTextWindow ((LPCTSTR) strSelection, // contents TFormat ("Notepad: %s", (LPCTSTR) pDoc->m_mush_name), // title pDoc, // document pDoc->m_iUniqueDocumentNumber, // document number @@ -5494,7 +5494,7 @@ CString strMessage; 0, // all lines pDoc->m_strRecallLinePreamble); // default preamble - CreateTextWindow (strMessage, + CreateTextWindow ((LPCTSTR) strMessage, TFormat ("Recall: %s", (LPCTSTR) strSelection), pDoc, diff --git a/scripting/methods/methods_notepad.cpp b/scripting/methods/methods_notepad.cpp index 31af7a0f..b66be486 100644 --- a/scripting/methods/methods_notepad.cpp +++ b/scripting/methods/methods_notepad.cpp @@ -118,8 +118,8 @@ CTextDocument * pTextDoc = FindNotepad (strTitle); return false; } // end of having an existing notepad document - BOOL bOK = CreateTextWindow (strText, // contents - strTitle, // title + BOOL bOK = CreateTextWindow ((LPCTSTR) strText, // contents + (LPCTSTR) strTitle, // title this, // document m_iUniqueDocumentNumber, // document number m_input_font_name, diff --git a/sendvw.cpp b/sendvw.cpp index 9f5b652a..962b1566 100644 --- a/sendvw.cpp +++ b/sendvw.cpp @@ -2321,7 +2321,7 @@ CString strCurrent; strCurrent = strCurrent.Mid (nStartChar, nEndChar - nStartChar); // edit current input window - CreateTextWindow (strCurrent, // selection + CreateTextWindow ((LPCTSTR) strCurrent, // selection TFormat ("Notepad: %s", (LPCTSTR) pDoc->m_mush_name), // title pDoc, // document pDoc->m_iUniqueDocumentNumber, // document number