diff options
-rw-r--r-- | qt/ScintillaEditBase/PlatQt.cpp | 4 | ||||
-rw-r--r-- | qt/ScintillaEditBase/PlatQt.h | 2 | ||||
-rw-r--r-- | qt/ScintillaEditBase/ScintillaQt.cpp | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/qt/ScintillaEditBase/PlatQt.cpp b/qt/ScintillaEditBase/PlatQt.cpp index 3d285a337..7b98b5024 100644 --- a/qt/ScintillaEditBase/PlatQt.cpp +++ b/qt/ScintillaEditBase/PlatQt.cpp @@ -223,7 +223,7 @@ void SurfaceImpl::Release() bool SurfaceImpl::Initialised() { - return device != 0; + return device != nullptr; } void SurfaceImpl::PenColour(ColourDesired fore) @@ -238,7 +238,7 @@ void SurfaceImpl::BrushColour(ColourDesired back) GetPainter()->setBrush(QBrush(QColorFromCA(back))); } -void SurfaceImpl::SetCodec(Font &font) +void SurfaceImpl::SetCodec(const Font &font) { if (font.GetID()) { const char *csid = "UTF-8"; diff --git a/qt/ScintillaEditBase/PlatQt.h b/qt/ScintillaEditBase/PlatQt.h index d83f49fb1..db6a3645b 100644 --- a/qt/ScintillaEditBase/PlatQt.h +++ b/qt/ScintillaEditBase/PlatQt.h @@ -131,7 +131,7 @@ public: void SetBidiR2L(bool bidiR2L_) override; void BrushColour(ColourDesired back); - void SetCodec(Font &font); + void SetCodec(const Font &font); void SetFont(Font &font); QPaintDevice *GetPaintDevice(); diff --git a/qt/ScintillaEditBase/ScintillaQt.cpp b/qt/ScintillaEditBase/ScintillaQt.cpp index 87e05f12d..1ad4a84b3 100644 --- a/qt/ScintillaEditBase/ScintillaQt.cpp +++ b/qt/ScintillaEditBase/ScintillaQt.cpp @@ -37,7 +37,7 @@ ScintillaQt::ScintillaQt(QAbstractScrollArea *parent) // On OS X drawing text into a pixmap moves it around 1 pixel to // the right compared to drawing it directly onto a window. // Buffered drawing turned off by default to avoid this. - WndProc(SCI_SETBUFFEREDDRAW, false, 0); + view.bufferedDraw = false; Init(); |