diff options
| author | nyamatongwe <unknown> | 2007-04-19 13:23:00 +0000 |
|---|---|---|
| committer | nyamatongwe <unknown> | 2007-04-19 13:23:00 +0000 |
| commit | 8c2c08e8294956d3e5ea98a51bf430b47a73c2fd (patch) | |
| tree | 773e54b572cc9d86ff5edf472cf60cb97a884c6b /win32/ScintillaWin.cxx | |
| parent | f1eb7da396f7a856006c15254216b5867ea23bc9 (diff) | |
| download | scintilla-mirror-8c2c08e8294956d3e5ea98a51bf430b47a73c2fd.tar.gz | |
Patch from Xie Renhui uses explicit ANSI calls on Windows so can be
compiled in Unicode mode.
Diffstat (limited to 'win32/ScintillaWin.cxx')
| -rw-r--r-- | win32/ScintillaWin.cxx | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/win32/ScintillaWin.cxx b/win32/ScintillaWin.cxx index acca53d6a..0d76e949f 100644 --- a/win32/ScintillaWin.cxx +++ b/win32/ScintillaWin.cxx @@ -369,7 +369,7 @@ static int InputCodePage() { HKL inputLocale = ::GetKeyboardLayout(0); LANGID inputLang = LOWORD(inputLocale); char sCodePage[10]; - int res = ::GetLocaleInfo(MAKELCID(inputLang, SORT_DEFAULT), + int res = ::GetLocaleInfoA(MAKELCID(inputLang, SORT_DEFAULT), LOCALE_IDEFAULTANSICODEPAGE, sCodePage, sizeof(sCodePage)); if (!res) return 0; @@ -1386,11 +1386,11 @@ void ScintillaWin::AddToPopUp(const char *label, int cmd, bool enabled) { #ifdef TOTAL_CONTROL HMENU hmenuPopup = reinterpret_cast<HMENU>(popup.GetID()); if (!label[0]) - ::AppendMenu(hmenuPopup, MF_SEPARATOR, 0, ""); + ::AppendMenuA(hmenuPopup, MF_SEPARATOR, 0, ""); else if (enabled) - ::AppendMenu(hmenuPopup, MF_STRING, cmd, label); + ::AppendMenuA(hmenuPopup, MF_STRING, cmd, label); else - ::AppendMenu(hmenuPopup, MF_STRING | MF_DISABLED | MF_GRAYED, cmd, label); + ::AppendMenuA(hmenuPopup, MF_STRING | MF_DISABLED | MF_GRAYED, cmd, label); #endif } @@ -1725,7 +1725,7 @@ void ScintillaWin::ImeStartComposition() { // Since the style creation code has been made platform independent, // The logfont for the IME is recreated here. int styleHere = (pdoc->StyleAt(currentPos)) & 31; - LOGFONT lf = {0,0,0,0,0,0,0,0,0,0,0,0,0,TEXT("")}; + LOGFONTA lf = {0,0,0,0,0,0,0,0,0,0,0,0,0, ""}; int sizeZoomed = vs.styles[styleHere].size + vs.zoomLevel; if (sizeZoomed <= 2) // Hangs if sizeZoomed <= 1 sizeZoomed = 2; @@ -1743,7 +1743,7 @@ void ScintillaWin::ImeStartComposition() { if (vs.styles[styleHere].fontName) strcpy(lf.lfFaceName, vs.styles[styleHere].fontName); - ::ImmSetCompositionFont(hIMC, &lf); + ::ImmSetCompositionFontA(hIMC, &lf); } ::ImmReleaseContext(MainHWND(), hIMC); // Caret is displayed in IME window. So, caret in Scintilla is useless. |