Merge branch 'uncool/dvbsi++'

Conflicts:
	src/driver/Makefile.am
	src/driver/streamts.cpp
	src/gui/audioplayer.cpp
	src/gui/epgview.cpp
	src/gui/infoviewer_bb.cpp
	src/gui/widget/textbox.h
This commit is contained in:
Stefan Seyfried
2012-11-11 00:40:30 +01:00
55 changed files with 1446 additions and 881 deletions

View File

@@ -213,6 +213,7 @@ CMsgBox::~CMsgBox()
void CMsgBox::initVar(void)
{
//TRACE("->CMsgBox::InitVar\r\n");
m_nResult = mbrYes;
m_cTitle = "";
m_cIcon = "";
m_nMode = SCROLL | TITLE | BORDER ;