diff options
| -rw-r--r-- | win32/PlatWin.cxx | 3 | ||||
| -rw-r--r-- | win32/ScintillaWin.cxx | 6 |
2 files changed, 5 insertions, 4 deletions
diff --git a/win32/PlatWin.cxx b/win32/PlatWin.cxx index 8f705ee11..a2862efb0 100644 --- a/win32/PlatWin.cxx +++ b/win32/PlatWin.cxx @@ -989,7 +989,7 @@ ListItemData *LineToItem::Append(const char *text, int imageIndex) { return item; } -const char ListBoxX_ClassName[] = "ListBoxX"; +const TCHAR ListBoxX_ClassName[] = TEXT("ListBoxX"); ListBox::ListBox() { } @@ -1983,6 +1983,7 @@ void Platform::Assert(const char *c, const char *file, int line) { } else { strcat(buffer, "\r\n"); Platform::DebugDisplay(buffer); + ::DebugBreak(); abort(); } } diff --git a/win32/ScintillaWin.cxx b/win32/ScintillaWin.cxx index c7f569970..e1654fa87 100644 --- a/win32/ScintillaWin.cxx +++ b/win32/ScintillaWin.cxx @@ -91,8 +91,8 @@ extern void Platform_Finalise(); // GCC has trouble with the standard COM ABI so do it the old C way with explicit vtables. -const char scintillaClassName[] = "Scintilla"; -const char callClassName[] = "CallTip"; +const TCHAR scintillaClassName[] = TEXT("Scintilla"); +const TCHAR callClassName[] = TEXT("CallTip"); class ScintillaWin; // Forward declaration for COM interface subobjects @@ -287,7 +287,7 @@ ScintillaWin::ScintillaWin(HWND hwnd) { // There does not seem to be a real standard for indicating that the clipboard // contains a rectangular selection, so copy Developer Studio. cfColumnSelect = static_cast<CLIPFORMAT>( - ::RegisterClipboardFormat("MSDEVColumnSelect")); + ::RegisterClipboardFormat(TEXT("MSDEVColumnSelect"))); wMain = hwnd; |