diff options
| author | XhmikosR <xhmikosr@users.sourceforge.net> | 2012-07-17 11:04:30 +0000 |
|---|---|---|
| committer | XhmikosR <xhmikosr@users.sourceforge.net> | 2012-07-17 11:04:30 +0000 |
| commit | 704e7646ada360d221e7fc7bbb7ced90d42b40d2 (patch) | |
| tree | b7da9eebfca43190663bfe3440b3774ebbefc59a /scintilla/src | |
| parent | 78d436fd293de61f122f9cfd6a27566707a03dd1 (diff) | |
| download | notepad2-mod-704e7646ada360d221e7fc7bbb7ced90d42b40d2.zip notepad2-mod-704e7646ada360d221e7fc7bbb7ced90d42b40d2.tar.gz notepad2-mod-704e7646ada360d221e7fc7bbb7ced90d42b40d2.tar.bz2 | |
update scintilla (HG 0ed3c2cdc492)
git-svn-id: https://notepad2-mod.googlecode.com/svn/trunk@753 28bd50df-7adb-d945-0439-6e466c6a13cc
Diffstat (limited to 'scintilla/src')
| -rw-r--r-- | scintilla/src/Editor.cxx | 5 | ||||
| -rw-r--r-- | scintilla/src/XPM.cxx | 8 |
2 files changed, 9 insertions, 4 deletions
diff --git a/scintilla/src/Editor.cxx b/scintilla/src/Editor.cxx index bbbf528..a8f4018 100644 --- a/scintilla/src/Editor.cxx +++ b/scintilla/src/Editor.cxx @@ -4317,10 +4317,12 @@ void Editor::DelCharBack(bool allowLineStartDeletion) { sel.Range(r).ClearVirtualSpace();
}
}
+ ThinRectangularRange();
} else {
ClearSelection();
}
sel.RemoveDuplicates();
+ ContainerNeedsUpdate(SC_UPDATE_SELECTION);
// Avoid blinking during rapid typing:
ShowCaretAtCurrentPosition();
}
@@ -9162,6 +9164,9 @@ sptr_t Editor::WndProc(unsigned int iMessage, uptr_t wParam, sptr_t lParam) { case SCI_GETSELECTIONS:
return sel.Count();
+ case SCI_GETSELECTIONEMPTY:
+ return sel.Empty();
+
case SCI_CLEARSELECTIONS:
sel.Clear();
Redraw();
diff --git a/scintilla/src/XPM.cxx b/scintilla/src/XPM.cxx index 7b25892..07b3ac9 100644 --- a/scintilla/src/XPM.cxx +++ b/scintilla/src/XPM.cxx @@ -356,10 +356,10 @@ const unsigned char *RGBAImage::Pixels() const { void RGBAImage::SetPixel(int x, int y, ColourDesired colour, int alpha) {
unsigned char *pixel = &pixelBytes[0] + (y*width+x) * 4;
// RGBA
- pixel[0] = colour.GetRed();
- pixel[1] = colour.GetGreen();
- pixel[2] = colour.GetBlue();
- pixel[3] = alpha;
+ pixel[0] = static_cast<unsigned char>(colour.GetRed());
+ pixel[1] = static_cast<unsigned char>(colour.GetGreen());
+ pixel[2] = static_cast<unsigned char>(colour.GetBlue());
+ pixel[3] = static_cast<unsigned char>(alpha);
}
RGBAImageSet::RGBAImageSet() : height(-1), width(-1){
|