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

Merge branch 'master' into pu/fb-setmode

Browse Source 
Origin commit data
------------------
Commit: 828329452e
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-03-12 (Sun, 12 Mar 2017)
This commit is contained in:
Michael Liebmann
2017-03-12 06:37:10 +01:00
parent f9abc1c985 616904958c
commit 6e32a631bd
7 changed files with 179 additions and 133 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/gui/widget/msgbox.cpp
View File

@@ -7,7 +7,7 @@
Günther@tuxbox.berlios.org
Implementation of CComponent Window class.
Copyright (C) 2014-2016 Thilo Graf 'dbt'
Copyright (C) 2014-2017 Thilo Graf 'dbt'
License: GPL
@@ -101,10 +101,8 @@ void CMsgBox::init(const int& Height, const int& ShowButtons, const msg_result_t
shadow = CC_SHADOW_ON;
//set result
if (Default_result != mbrNone)
result = default_result = Default_result;
else
result = mbrNone;
result = default_result = Default_result;
//add and initialize footer buttons with required buttons and basic properties
if (ShowButtons > -1)
mb_show_button = ShowButtons;
@@ -119,8 +117,8 @@ void CMsgBox::initTimeOut()
void CMsgBox::initButtons()
{
button_label_s btn;
vector<button_label_s> v_buttons;
button_label_cc btn;
vector<button_label_cc> v_buttons;
//evaluate combinations
if (mb_show_button & mbAll)