From 053ae5f20bfc2d133617f50a262c9e5d5c52c60e Mon Sep 17 00:00:00 2001
From: Thilo Graf <dbt@novatux.de>
Date: Fri, 14 Sep 2012 20:44:56 +0200
Subject: [PATCH] CTextBox/CMsgBox: reduce data type conflicts

Origin commit data
------------------
Commit: https://github.com/neutrino-images/ni-neutrino/commit/342fa5f88a2d59c55992ed9aef0d1cb25ca08d82
Author: Thilo Graf <dbt@novatux.de>
Date: 2012-09-14 (Fri, 14 Sep 2012)

Origin message was:
------------------
*CTextBox/CMsgBox: reduce data type conflicts
---
 src/gui/widget/msgbox.h  |  4 ++--
 src/gui/widget/textbox.h | 27 ++++++++++++++-------------
 2 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/src/gui/widget/msgbox.h b/src/gui/widget/msgbox.h
index ead68cda1..a30186389 100644
--- a/src/gui/widget/msgbox.h
+++ b/src/gui/widget/msgbox.h
@@ -75,7 +75,7 @@ class CMsgBox
 			mbAll =		0x07,
 			mbBack =	0x08
 		};
-		 enum mode_
+		enum modes
 		{
 			AUTO_WIDTH	= 0x01,
 			AUTO_HIGH	= 0x02,
@@ -85,7 +85,7 @@ class CMsgBox
 			BORDER		= 0x20,
 			CENTER		= 0x40,
 			NO_AUTO_LINEBREAK= 0x80
-		}mode;
+		};
 
 	private:
 		/* Functions */
diff --git a/src/gui/widget/textbox.h b/src/gui/widget/textbox.h
index dfdd3f45c..d719c5291 100644
--- a/src/gui/widget/textbox.h
+++ b/src/gui/widget/textbox.h
@@ -83,8 +83,19 @@ class CBox
 		int iHeight;
 };
 
-class CTextBox  
+class CTextBox
 {
+	public:
+		/* Variables */
+		enum textbox_modes
+		{
+			AUTO_WIDTH	= 0x01,
+			AUTO_HIGH	= 0x02,
+			SCROLL		= 0x04,
+			CENTER		= 0x40,
+			NO_AUTO_LINEBREAK = 0x80
+		};
+		
 	private:
 		/* Functions */
 		void refreshTextLineArray(void);
@@ -132,22 +143,12 @@ class CTextBox
 		int text_border_width;
 		
 	public:
-		/* Variables */
-		typedef enum mode_
-		{
-			AUTO_WIDTH	= 0x01,
-			AUTO_HIGH	= 0x02,
-			SCROLL		= 0x04,
-			CENTER		= 0x40,
-			NO_AUTO_LINEBREAK = 0x80
-		} mode;
-		
 		/* Constructor */
 		CTextBox();
 		CTextBox(	const char * text);
 		CTextBox(	const char * text, 
 					Font* font_text,
-					const int mode, 
+					const int pmode,
 					const CBox* position,
 					CFBWindow::color_t textBackgroundColor = COL_MENUCONTENT_PLUS_0);
 
@@ -163,7 +164,7 @@ class CTextBox
 		void	setBackGroundRadius(const int radius, const int type){m_nBgRadius = radius; m_nBgRadiusType = type;};
 		void    setTextBorderWidth(int border);
 		void	setTextFont(Font* font_text);
-		void	setTextMode(const mode text_mode){m_nMode = text_mode;};
+		void	setTextMode(const int text_mode){m_nMode = text_mode;};
 		void	setBackGroundColor(CFBWindow::color_t textBackgroundColor){m_textBackgroundColor = textBackgroundColor;};
 
 		inline	bool 	isPainted(void)			{if( frameBuffer == NULL) return (false); else return (true);};