aboutsummaryrefslogtreecommitdiffhomepage
path: root/win32/ScintillaWin.cxx
diff options
context:
space:
mode:
authorUnknown <nyamatongwe@gmail.com>2013-06-05 22:39:05 +1000
committerUnknown <nyamatongwe@gmail.com>2013-06-05 22:39:05 +1000
commitee13aae48194ac55f08fd0186f51c52cea29e15d (patch)
tree610289be374867df67e45f55c5a364e1f3b293a0 /win32/ScintillaWin.cxx
parent78c68eb0882e2fb37ecb1693466da128e63f5b39 (diff)
parent6e29602a6c893a998dc78a9f8d96eb0d70c5a12c (diff)
downloadscintilla-mirror-ee13aae48194ac55f08fd0186f51c52cea29e15d.tar.gz
Merged with GTK+ change.
Diffstat (limited to 'win32/ScintillaWin.cxx')
-rw-r--r--win32/ScintillaWin.cxx12
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());
}