git.cweiske.de
/
enigma2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'bug_440_dvdplayer_audioselection'
[enigma2.git]
/
lib
/
gui
/
ewindowstyle.cpp
diff --git
a/lib/gui/ewindowstyle.cpp
b/lib/gui/ewindowstyle.cpp
index 2558669ae363ae98ff33aec5711b809501d5bde1..0ecdc2a245c79ae36ef750194d24ae3702592282 100644
(file)
--- a/
lib/gui/ewindowstyle.cpp
+++ b/
lib/gui/ewindowstyle.cpp
@@
-9,6
+9,13
@@
eWindowStyle::~eWindowStyle() {}
DEFINE_REF(eWindowStyleManager);
DEFINE_REF(eWindowStyleManager);
+ePtr<eWindowStyleManager> NewWindowStylePtr(void)
+{
+ ePtr<eWindowStyleManager> ptr;
+ eWindowStyleManager::getInstance(ptr);
+ return ptr;
+}
+
eWindowStyleManager::eWindowStyleManager()
{
m_instance = this;
eWindowStyleManager::eWindowStyleManager()
{
m_instance = this;
@@
-21,7
+28,9
@@
eWindowStyleManager::~eWindowStyleManager()
void eWindowStyleManager::getStyle(int style_id, ePtr<eWindowStyle> &style)
{
void eWindowStyleManager::getStyle(int style_id, ePtr<eWindowStyle> &style)
{
- style = m_current_style[style_id];
+ std::map<int, ePtr<eWindowStyle> >::iterator it = m_current_style.find(style_id);
+ ASSERT(it != m_current_style.end());
+ style = it->second;
}
void eWindowStyleManager::setStyle(int style_id, eWindowStyle *style)
}
void eWindowStyleManager::setStyle(int style_id, eWindowStyle *style)