diff options
| author | nyamatongwe <devnull@localhost> | 2013-06-05 19:37:01 +1000 |
|---|---|---|
| committer | nyamatongwe <devnull@localhost> | 2013-06-05 19:37:01 +1000 |
| commit | 6a18cb9dae536fc0a2d862c66ef5f131ceeafc94 (patch) | |
| tree | 016c08f51824832d3c65adffa5419877198df1e7 | |
| parent | a142d82e01d77bb3cbe658e543f32ca36eaeec78 (diff) | |
| download | scintilla-mirror-6a18cb9dae536fc0a2d862c66ef5f131ceeafc94.tar.gz | |
Enable EnsureRenderTarget and DropRenderTarget only when Direct2D available.
| -rw-r--r-- | win32/ScintillaWin.cxx | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/win32/ScintillaWin.cxx b/win32/ScintillaWin.cxx index dca98d5ed..27b19cc8c 100644 --- a/win32/ScintillaWin.cxx +++ b/win32/ScintillaWin.cxx @@ -217,8 +217,10 @@ class ScintillaWin : virtual void Initialise(); virtual void Finalise(); +#if defined(USE_D2D) void EnsureRenderTarget(); void DropRenderTarget(); +#endif HWND MainHWND(); static sptr_t DirectFunction( @@ -404,15 +406,18 @@ void ScintillaWin::Finalise() { ScintillaBase::Finalise(); SetTicking(false); SetIdle(false); +#if defined(USE_D2D) DropRenderTarget(); +#endif ::RevokeDragDrop(MainHWND()); if (SUCCEEDED(hrOle)) { ::OleUninitialize(); } } -void ScintillaWin::EnsureRenderTarget() { #if defined(USE_D2D) + +void ScintillaWin::EnsureRenderTarget() { if (!renderTargetValid) { DropRenderTarget(); renderTargetValid = true; @@ -454,18 +459,17 @@ void ScintillaWin::EnsureRenderTarget() { // need to be recreated. DropGraphics(false); } -#endif } void ScintillaWin::DropRenderTarget() { -#if defined(USE_D2D) if (pRenderTarget) { pRenderTarget->Release(); pRenderTarget = 0; } -#endif } +#endif + HWND ScintillaWin::MainHWND() { return reinterpret_cast<HWND>(wMain.GetID()); } |