mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-28 16:01:10 +02:00
Code Issues Packages Projects Releases Wiki Activity

Change new class member name to more unique, this prevents possible conflicts - with strict compile at least one was in bouqueteditor_channels.cpp

Browse Source 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@1910 e54a6e83-5905-42d5-8d5c-058d10e6a962


Origin commit data
------------------
Branch: ni/coolstream
Commit: bdd958ba74
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2011-11-26 (Sat, 26 Nov 2011)



------------------
This commit was generated by Migit
This commit is contained in:
[CST] Focus
2011-11-26 09:31:53 +00:00
parent 2bcf7219a3
commit 5fc16d4d16
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/gui/widget/menue.cpp
View File

@@ -327,14 +327,14 @@ CMenuWidget::CMenuWidget(const char* Name, const std::string & Icon, const int m
void CMenuWidget::Init(const std::string & Icon, const int mwidth, const mn_widget_id_t &w_index)
{
m = CMenuGlobal::getInstance(); //create CMenuGlobal instance only here
mglobal = CMenuGlobal::getInstance(); //create CMenuGlobal instance only here
frameBuffer = CFrameBuffer::getInstance();
iconfile = Icon;
//handle select values
widget_index = w_index;
preselected = NO_WIDGET_ID;
selected = (widget_index == NO_WIDGET_ID ? preselected : m->v_selected[widget_index]);
selected = (widget_index == NO_WIDGET_ID ? preselected : mglobal->v_selected[widget_index]);
min_width = 0;
width = 0; /* is set in paint() */
@@ -755,7 +755,7 @@ int CMenuWidget::exec(CMenuTarget* parent, const std::string &)
}
if (widget_index > -1)
m->v_selected[widget_index] = selected;
mglobal->v_selected[widget_index] = selected;
frameBuffer->Unlock();
return retval;