git.cweiske.de
/
enigma2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
don't add any source span if no cutlist defined, because we don't have an 'infinite...
[enigma2.git]
/
lib
/
gui
/
ewidgetdesktop.cpp
diff --git
a/lib/gui/ewidgetdesktop.cpp
b/lib/gui/ewidgetdesktop.cpp
index 9f40a3dbcf9c303fa9fe583753c7e175678dd790..05b4ec4db07979d612875f10e306b0038dad335c 100644
(file)
--- a/
lib/gui/ewidgetdesktop.cpp
+++ b/
lib/gui/ewidgetdesktop.cpp
@@
-7,7
+7,7
@@
extern void dumpRegion(const gRegion ®ion);
void eWidgetDesktop::addRootWidget(eWidget *root)
{
void eWidgetDesktop::addRootWidget(eWidget *root)
{
-
assert
(!root->m_desktop);
+
ASSERT
(!root->m_desktop);
int invert_sense = 0;
/* buffered mode paints back-to-front, while immediate mode is front-to-back. */
int invert_sense = 0;
/* buffered mode paints back-to-front, while immediate mode is front-to-back. */
@@
-343,12
+343,11
@@
void eWidgetDesktop::setRedrawTask(eMainloop &ml)
{
if (m_mainloop)
{
{
if (m_mainloop)
{
- delete m_timer;
m_timer = 0;
m_mainloop = 0;
}
m_mainloop = &ml;
m_timer = 0;
m_mainloop = 0;
}
m_mainloop = &ml;
- m_timer =
new eTimer
(m_mainloop);
+ m_timer =
eTimer::create
(m_mainloop);
CONNECT(m_timer->timeout, eWidgetDesktop::paint);
if (m_require_redraw)
CONNECT(m_timer->timeout, eWidgetDesktop::paint);
if (m_require_redraw)
@@
-375,7
+374,7
@@
void eWidgetDesktop::makeCompatiblePixmap(gPixmap &pm)
ePtr<gPixmap> target_pixmap;
m_screen.m_dc->getPixmap(target_pixmap);
ePtr<gPixmap> target_pixmap;
m_screen.m_dc->getPixmap(target_pixmap);
-
assert
(target_pixmap);
+
ASSERT
(target_pixmap);
if (target_pixmap->surface && target_pixmap->surface->bpp > 8)
return;
if (target_pixmap->surface && target_pixmap->surface->bpp > 8)
return;
@@
-399,7
+398,7
@@
void eWidgetDesktop::setCompositionMode(int mode)
removeBufferForWidget(*i, l);
}
removeBufferForWidget(*i, l);
}
-eWidgetDesktop::eWidgetDesktop(eSize size): m_mainloop(0)
, m_timer(0)
+eWidgetDesktop::eWidgetDesktop(eSize size): m_mainloop(0)
{
m_screen.m_dirty_region = gRegion(eRect(ePoint(0, 0), size));
m_screen.m_screen_size = size;
{
m_screen.m_dirty_region = gRegion(eRect(ePoint(0, 0), size));
m_screen.m_screen_size = size;
@@
-463,7
+462,7
@@
void eWidgetDesktop::redrawComposition(int notified)
if (m_comp_mode != cmBuffered)
return;
if (m_comp_mode != cmBuffered)
return;
-
assert
(m_screen.m_dc);
+
ASSERT
(m_screen.m_dc);
gPainter p(m_screen.m_dc);
p.resetClip(eRect(ePoint(0, 0), m_screen.m_screen_size));
gPainter p(m_screen.m_dc);
p.resetClip(eRect(ePoint(0, 0), m_screen.m_screen_size));