projects
/
vuplus_dvbapp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
- add more python stuff
[vuplus_dvbapp]
/
lib
/
gdi
/
grc.h
diff --git
a/lib/gdi/grc.h
b/lib/gdi/grc.h
index
4793179
..
d6a3cd7
100644
(file)
--- a/
lib/gdi/grc.h
+++ b/
lib/gdi/grc.h
@@
-11,7
+11,7
@@
#include <stack>
#include <list>
#include <stack>
#include <list>
-#include <
lib/base/estring.h
>
+#include <
string
>
#include <lib/base/ringbuffer.h>
#include <lib/base/elock.h>
#include <lib/gdi/erect.h>
#include <lib/base/ringbuffer.h>
#include <lib/base/elock.h>
#include <lib/gdi/erect.h>
@@
-29,7
+29,7
@@
struct gOpcode
renderPara,
setFont,
renderPara,
setFont,
- fill, clear,
+ fill,
fillRegion,
clear,
blit,
setPalette,
blit,
setPalette,
@@
-55,10
+55,15
@@
struct gOpcode
eRect area;
} *fill;
eRect area;
} *fill;
+ struct pfillRegion
+ {
+ gRegion region;
+ } *fillRegion;
+
struct prenderText
{
eRect area;
struct prenderText
{
eRect area;
-
eS
tring text;
+
std::s
tring text;
int flags;
} *renderText;
int flags;
} *renderText;
@@
-117,7
+122,7
@@
struct gOpcode
};
/* gRC is the singleton which controls the fifo and dispatches commands */
};
/* gRC is the singleton which controls the fifo and dispatches commands */
-class gRC: public
virtual
iObject
+class gRC: public iObject
{
DECLARE_REF;
private:
{
DECLARE_REF;
private:
@@
-173,6
+178,7
@@
public:
void renderPara(eTextPara *para, ePoint offset=ePoint(0, 0));
void fill(const eRect &area);
void renderPara(eTextPara *para, ePoint offset=ePoint(0, 0));
void fill(const eRect &area);
+ void fill(const gRegion &area);
void clear();
void clear();