From 44e45256727b41a68858d3896c83937aa4623c82 Mon Sep 17 00:00:00 2001 From: Thilo Graf Date: Sun, 23 Oct 2016 20:40:06 +0200 Subject: [PATCH] CMsgBox: use default text mode parameter with scroll for all derivatives Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/21e8188b5bf710e9a6305598b728095cf2147558 Author: Thilo Graf Date: 2016-10-23 (Sun, 23 Oct 2016) ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- src/gui/widget/msgbox.h | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/src/gui/widget/msgbox.h b/src/gui/widget/msgbox.h index 0cf3a8fc9..eda0c941d 100644 --- a/src/gui/widget/msgbox.h +++ b/src/gui/widget/msgbox.h @@ -7,7 +7,7 @@ Günther@tuxbox.berlios.org Implementation of CComponent Window class. - Copyright (C) 2014-2015 Thilo Graf 'dbt' + Copyright (C) 2014-2016 Thilo Graf 'dbt' License: GPL @@ -38,6 +38,7 @@ #define MSGBOX_MIN_WIDTH HINTBOX_MIN_WIDTH #define MSGBOX_MIN_HEIGHT HINTBOX_MIN_HEIGHT + 75 +#define DEFAULT_TEXT_MODE (CMsgBox::CENTER | CMsgBox::AUTO_WIDTH | CMsgBox::AUTO_HIGH | CMsgBox::SCROLL) //! Sub class of CHintBox. Shows a window as a messagebox /*! @@ -126,7 +127,7 @@ class CMsgBox : public CHintBox const int& Height = MSGBOX_MIN_HEIGHT, const int& ShowButtons = mbCancel, const msg_result_t& Default_result = mbrCancel, - const int& Text_mode = CMsgBox::CENTER | CTextBox::AUTO_WIDTH | CTextBox::AUTO_HIGH | CTextBox::SCROLL); + const int& Text_mode = DEFAULT_TEXT_MODE); CMsgBox(const char* Text, const neutrino_locale_t locale_Title = NONEXISTANT_LOCALE, @@ -136,7 +137,7 @@ class CMsgBox : public CHintBox const int& Height = MSGBOX_MIN_HEIGHT, const int& ShowButtons = mbCancel, const msg_result_t& Default_result = mbrCancel, - const int& Text_mode = CMsgBox::CENTER | CTextBox::AUTO_WIDTH | CTextBox::AUTO_HIGH | CTextBox::SCROLL); + const int& Text_mode = DEFAULT_TEXT_MODE); // ~CMsgBox(); //inherited int exec(); @@ -192,8 +193,6 @@ class CMsgBox : public CHintBox // bool setText(const std::string* newText); }; -#define DEFAULT_TEXT_MODE (CMsgBox::CENTER | CMsgBox::AUTO_WIDTH | CMsgBox::AUTO_HIGH) - int ShowMsg2UTF( const neutrino_locale_t Title, const char * const Text, const CMsgBox::msg_result_t Default,