diff options
| author | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2013-02-01 14:53:38 +0000 |
|---|---|---|
| committer | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2013-02-01 14:53:38 +0000 |
| commit | 43c642c61857ceefe07ce0fb929c569b52a545a5 (patch) | |
| tree | 865d4f643ca3024818a963b2d5ff1aceb8c3a9f5 /NxWidgets/libnxwidgets/src/cgraphicsport.cxx | |
| parent | 5a5bdf7d1b7afcf5c7b30209bdfad2abf2e72f3b (diff) | |
| download | nuttx-43c642c61857ceefe07ce0fb929c569b52a545a5.tar.gz nuttx-43c642c61857ceefe07ce0fb929c569b52a545a5.tar.bz2 nuttx-43c642c61857ceefe07ce0fb929c569b52a545a5.zip | |
NxWidgets updates from Petteri Aimonen; buildroot GDB build fix from Ken Bannister
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@5592 42af7a65-404d-4744-a932-0658087f49c3
Diffstat (limited to 'NxWidgets/libnxwidgets/src/cgraphicsport.cxx')
| -rw-r--r-- | NxWidgets/libnxwidgets/src/cgraphicsport.cxx | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/NxWidgets/libnxwidgets/src/cgraphicsport.cxx b/NxWidgets/libnxwidgets/src/cgraphicsport.cxx index 73f2352eb..f295483a9 100644 --- a/NxWidgets/libnxwidgets/src/cgraphicsport.cxx +++ b/NxWidgets/libnxwidgets/src/cgraphicsport.cxx @@ -604,7 +604,7 @@ void CGraphicsPort::drawBitmapGreyScale(nxgl_coord_t x, nxgl_coord_t y, void CGraphicsPort::drawText(struct nxgl_point_s *pos, CRect *bound, CNxFont *font, const CNxString &string) { - drawText(pos, bound, font, string, 0, string.getLength()); + _drawText(pos, bound, font, string, 0, string.getLength(), 0, true); } /** @@ -632,7 +632,7 @@ void CGraphicsPort::drawText(struct nxgl_point_s *pos, CRect *bound, // Draw the string with this new color - drawText(pos, bound, font, string, startIndex, length); + _drawText(pos, bound, font, string, startIndex, length, 0, true); // Restore the font color @@ -654,7 +654,7 @@ void CGraphicsPort::drawText(struct nxgl_point_s *pos, CRect *bound, CNxFont *font, const CNxString &string, int startIndex, int length) { - drawText(pos, bound, font, string, startIndex, length, 0, true); + _drawText(pos, bound, font, string, startIndex, length, 0, true); } /** @@ -680,7 +680,7 @@ void CGraphicsPort::drawText(struct nxgl_point_s *pos, CRect *bound, nxgl_mxpixel_t savedColor = font->getColor(); font->setColor(color); - drawText(pos, bound, font, string, startIndex, length, background, false); + _drawText(pos, bound, font, string, startIndex, length, background, false); font->setColor(savedColor); } @@ -697,11 +697,12 @@ void CGraphicsPort::drawText(struct nxgl_point_s *pos, CRect *bound, * @param background Color to use for background if transparent is false. * @param transparent Whether to fill the background. */ -void CGraphicsPort::drawText(struct nxgl_point_s *pos, CRect *bound, - CNxFont *font, const CNxString &string, - int startIndex, int length, - nxgl_mxpixel_t background, - bool transparent) + +void CGraphicsPort::_drawText(struct nxgl_point_s *pos, CRect *bound, + CNxFont *font, const CNxString &string, + int startIndex, int length, + nxgl_mxpixel_t background, + bool transparent) { // Verify index and length |