aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--doc/ScintillaHistory.html3
-rw-r--r--win32/ScintillaWin.cxx6
2 files changed, 8 insertions, 1 deletions
diff --git a/doc/ScintillaHistory.html b/doc/ScintillaHistory.html
index e5a2d6a49..eea36f502 100644
--- a/doc/ScintillaHistory.html
+++ b/doc/ScintillaHistory.html
@@ -467,6 +467,9 @@
<a href="http://sourceforge.net/p/scintilla/feature-requests/1002/">Feature #1002.</a>
</li>
<li>
+ On Windows, fix painting on an explicit HDC when first paint attempt abandoned.
+ </li>
+ <li>
Easier access to printing on Qt with formatRange method.
</li>
<li>
diff --git a/win32/ScintillaWin.cxx b/win32/ScintillaWin.cxx
index 340dcd86d..ab1723924 100644
--- a/win32/ScintillaWin.cxx
+++ b/win32/ScintillaWin.cxx
@@ -626,7 +626,11 @@ LRESULT ScintillaWin::WndPaint(uptr_t wParam) {
::EndPaint(MainHWND(), pps);
if (paintState == paintAbandoned) {
// Painting area was insufficient to cover new styling or brace highlight positions
- FullPaint();
+ if (IsOcxCtrl) {
+ FullPaintDC(pps->hdc);
+ } else {
+ FullPaint();
+ }
}
paintState = notPainting;