From 6016c60b4c7e61e73c0e932c752c4303780c7f6a Mon Sep 17 00:00:00 2001 From: Thilo Graf Date: Mon, 5 Nov 2012 21:19:39 +0100 Subject: [PATCH] CTextBox: fix build merge error, max_width is not declared --- src/gui/widget/textbox.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/gui/widget/textbox.cpp b/src/gui/widget/textbox.cpp index 801587e20..fe86218be 100644 --- a/src/gui/widget/textbox.cpp +++ b/src/gui/widget/textbox.cpp @@ -146,7 +146,7 @@ void CTextBox::initVar(void) m_showTextFrame = 0; m_nNrOfNewLine = 0; m_nMaxLineWidth = 0; - max_width = 0; + m_nMaxTextWidth = 0; m_cText = ""; m_nMode = SCROLL;