git.cweiske.de
/
enigma2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
use new/delete instead of malloc/free
[enigma2.git]
/
lib
/
gdi
/
grc.h
diff --git
a/lib/gdi/grc.h
b/lib/gdi/grc.h
index a59749720b15cdff322dbe90573d542f52c62cbe..f931046a88016f1a79d96aaea1dcc953645aa1a1 100644
(file)
--- a/
lib/gdi/grc.h
+++ b/
lib/gdi/grc.h
@@
-77,7
+77,7
@@
struct gOpcode
struct prenderText
{
eRect area;
struct prenderText
{
eRect area;
-
std::string
text;
+
char *
text;
int flags;
} *renderText;
int flags;
} *renderText;
@@
-185,7
+185,7
@@
class gPainter
public:
gPainter(gDC *dc, eRect rect=eRect());
virtual ~gPainter();
public:
gPainter(gDC *dc, eRect rect=eRect());
virtual ~gPainter();
-
+
void setBackgroundColor(const gColor &color);
void setForegroundColor(const gColor &color);
void setBackgroundColor(const gColor &color);
void setForegroundColor(const gColor &color);
@@
-252,6
+252,7
@@
protected:
ePtr<gPixmap> m_pixmap;
gColor m_foreground_color, m_background_color;
ePtr<gPixmap> m_pixmap;
gColor m_foreground_color, m_background_color;
+ gRGB m_foreground_color_rgb, m_background_color_rgb;
ePtr<gFont> m_current_font;
ePoint m_current_offset;
ePtr<gFont> m_current_font;
ePoint m_current_offset;