diff options
| author | Neil <nyamatongwe@gmail.com> | 2013-06-29 23:37:27 +1000 |
|---|---|---|
| committer | Neil <nyamatongwe@gmail.com> | 2013-06-29 23:37:27 +1000 |
| commit | e96849e601b686f43bfe4fee0f7924c8a7ae846c (patch) | |
| tree | 787bc9b8a424b76b9df8099d70119dc48d45877d | |
| parent | 4f2107e926254fdda3d93e195c9e472068da0876 (diff) | |
| download | scintilla-mirror-e96849e601b686f43bfe4fee0f7924c8a7ae846c.tar.gz | |
Removed checks for Digital Mars C++. The checks were old so updates (or using Platform
SDK headers) should have fixed the missing header and library.
No one on the mailing list appears to be using DMC.
| -rw-r--r-- | win32/ScintillaWin.cxx | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/win32/ScintillaWin.cxx b/win32/ScintillaWin.cxx index 27b19cc8c..a63d803fb 100644 --- a/win32/ScintillaWin.cxx +++ b/win32/ScintillaWin.cxx @@ -89,9 +89,7 @@ #endif #include <commctrl.h> -#ifndef __DMC__ #include <zmouse.h> -#endif #include <ole2.h> #ifndef MK_ALT @@ -634,10 +632,6 @@ LRESULT ScintillaWin::WndPaint(uptr_t wParam) { } sptr_t ScintillaWin::HandleComposition(uptr_t wParam, sptr_t lParam) { -#ifdef __DMC__ - // Digital Mars compiler does not include Imm library - return 0; -#else if (lParam & GCS_RESULTSTR) { HIMC hIMC = ::ImmGetContext(MainHWND()); if (hIMC) { @@ -672,7 +666,6 @@ sptr_t ScintillaWin::HandleComposition(uptr_t wParam, sptr_t lParam) { return 0; } return ::DefWindowProc(MainHWND(), WM_IME_COMPOSITION, wParam, lParam); -#endif } // Translate message IDs from WM_* and EM_* to SCI_* so can partly emulate Windows Edit control @@ -875,13 +868,10 @@ sptr_t ScintillaWin::WndProc(unsigned int iMessage, uptr_t wParam, sptr_t lParam return ::DefWindowProc(MainHWND(), iMessage, wParam, lParam); case WM_LBUTTONDOWN: { -#ifndef __DMC__ - // Digital Mars compiler does not include Imm library // For IME, set the composition string as the result string. HIMC hIMC = ::ImmGetContext(MainHWND()); ::ImmNotifyIME(hIMC, NI_COMPOSITIONSTR, CPS_COMPLETE, 0); ::ImmReleaseContext(MainHWND(), hIMC); -#endif // //Platform::DebugPrintf("Buttdown %d %x %x %x %x %x\n",iMessage, wParam, lParam, // Platform::IsKeyDown(VK_SHIFT), @@ -2176,8 +2166,6 @@ DropTarget::DropTarget() { * Called when IME Window opened. */ void ScintillaWin::ImeStartComposition() { -#ifndef __DMC__ - // Digital Mars compiler does not include Imm library if (caret.active) { // Move IME Window to current caret position HIMC hIMC = ::ImmGetContext(MainHWND()); @@ -2218,7 +2206,6 @@ void ScintillaWin::ImeStartComposition() { // Caret is displayed in IME window. So, caret in Scintilla is useless. DropCaret(); } -#endif } /** Called when IME Window closed. */ |