aboutsummaryrefslogtreecommitdiffhomepage
path: root/win32/ScintillaWin.cxx
diff options
context:
space:
mode:
authornyamatongwe <devnull@localhost>2004-12-03 23:15:54 +0000
committernyamatongwe <devnull@localhost>2004-12-03 23:15:54 +0000
commit5ad20736dd11bdf99afe06786411c2fe4ab891d8 (patch)
tree3aff5ac5f978a3725e055d146e65a4c39ff1cf37 /win32/ScintillaWin.cxx
parentc9b93d87e1ac6f6a11fc42561fc00ae44b17e1ac (diff)
downloadscintilla-mirror-5ad20736dd11bdf99afe06786411c2fe4ab891d8.tar.gz
Safest portion of patch from Régis Vaquette to allow compilation
for Windows CE. Changes literal strings to have TEXT() so convert to Unicode when comiling for Windows CE.
Diffstat (limited to 'win32/ScintillaWin.cxx')
-rw-r--r--win32/ScintillaWin.cxx4
1 files changed, 2 insertions, 2 deletions
diff --git a/win32/ScintillaWin.cxx b/win32/ScintillaWin.cxx
index 1f0b6deeb..8dba14b86 100644
--- a/win32/ScintillaWin.cxx
+++ b/win32/ScintillaWin.cxx
@@ -1279,7 +1279,7 @@ void ScintillaWin::Paste() {
void ScintillaWin::CreateCallTipWindow(PRectangle) {
#ifdef TOTAL_CONTROL
if (!ct.wCallTip.Created()) {
- ct.wCallTip = ::CreateWindow(callClassName, "ACallTip",
+ ct.wCallTip = ::CreateWindow(callClassName, TEXT("ACallTip"),
WS_POPUP, 100, 100, 150, 20,
MainHWND(), 0,
GetWindowInstance(MainHWND()),
@@ -1632,7 +1632,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,""};
+ LOGFONT lf = {0,0,0,0,0,0,0,0,0,0,0,0,0,TEXT("")};
int sizeZoomed = vs.styles[styleHere].size + vs.zoomLevel;
if (sizeZoomed <= 2) // Hangs if sizeZoomed <= 1
sizeZoomed = 2;