[Gemrb-commits] gemrb: branch master updated. v0.7.2-269-g7e74cd3

[Brad A. <br...@us...>]

gemrb: Infinity Engine emulator

The branch master has been updated
       via  7e74cd319e79308f343ab4309f286f72b92347b0 (commit)

Summary of changes:
 gemrb/GUIScripts/GUIDefines.py       |    1 -
 gemrb/core/GUI/TextArea.cpp          |   12 +-----------
 gemrb/core/GUI/TextArea.h            |    3 ---
 gemrb/docs/en/GUIScript/SetEvent.txt |    1 -
 4 files changed, 1 insertions(+), 16 deletions(-)
      from  7ebae174d5b4feae1845143ae2d2131bc3fb86a8 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://gemrb.git.sourceforge.net/git/gitweb.cgi?p=gemrb/gemrb;a=commitdiff;h=7e74cd319e79308f343ab4309f286f72b92347b0

commit 7e74cd319e79308f343ab4309f286f72b92347b0
Author: Brad Allred <bra...@me...>
Date:   Fri Jan 4 09:38:29 2013 -0700

    TextArea: we no loger have use of OutOfText handler

diff --git a/gemrb/GUIScripts/GUIDefines.py b/gemrb/GUIScripts/GUIDefines.py
index 5c915ef..ede1ee2 100644
--- a/gemrb/GUIScripts/GUIDefines.py
+++ b/gemrb/GUIScripts/GUIDefines.py
@@ -91,7 +91,6 @@ IE_GUI_EDIT_ON_CHANGE       = 0x03000000
 IE_GUI_EDIT_ON_DONE         = 0x03000001
 IE_GUI_EDIT_ON_CANCEL       = 0x03000002
 IE_GUI_TEXTAREA_ON_CHANGE   = 0x05000000
-IE_GUI_TEXTAREA_OUT_OF_TEXT = 0x05000001
 IE_GUI_LABEL_ON_PRESS       = 0x06000000
 IE_GUI_SCROLLBAR_ON_CHANGE  = 0x07000000
 IE_GUI_WORLDMAP_ON_PRESS    = 0x08000000
diff --git a/gemrb/core/GUI/TextArea.cpp b/gemrb/core/GUI/TextArea.cpp
index 997b91c..6dae41c 100644
--- a/gemrb/core/GUI/TextArea.cpp
+++ b/gemrb/core/GUI/TextArea.cpp
@@ -54,7 +54,6 @@ TextArea::TextArea(Color hitextcolor, Color initcolor, Color lowtextcolor)
 	seltext = -1;
 	Value = 0xffffffff;
 	ResetEventHandler( TextAreaOnChange );
-	ResetEventHandler( TextAreaOutOfText );
 	PortraitResRef[0]=0;
 	palette = core->CreatePalette( hitextcolor, lowtextcolor );
 	initpalette = core->CreatePalette( initcolor, lowtextcolor );
@@ -229,13 +228,7 @@ void TextArea::Draw(unsigned short x, unsigned short y)
 			//the buffer is filled enough
 			return;
 		}
-		if (RunEventHandler( TextAreaOutOfText )) {
-			return;
-		}
-		if (linesize==lines.size()) {
-			ResetEventHandler( TextAreaOutOfText );
-			return;
-		}
+
 		AppendText("\n",-1);
 		return;
 	}
@@ -921,9 +914,6 @@ bool TextArea::SetEvent(int eventType, EventHandler handler)
 	case IE_GUI_TEXTAREA_ON_CHANGE:
 		TextAreaOnChange = handler;
 		break;
-	case IE_GUI_TEXTAREA_OUT_OF_TEXT:
-		TextAreaOutOfText = handler;
-		break;
 	default:
 		return false;
 	}
diff --git a/gemrb/core/GUI/TextArea.h b/gemrb/core/GUI/TextArea.h
index 06b22d0..6e219be 100644
--- a/gemrb/core/GUI/TextArea.h
+++ b/gemrb/core/GUI/TextArea.h
@@ -40,7 +40,6 @@ namespace GemRB {
 // Keep these synchronized with GUIDefines.py
 // 0x05 is the control type of TextArea
 #define IE_GUI_TEXTAREA_ON_CHANGE   0x05000000
-#define IE_GUI_TEXTAREA_OUT_OF_TEXT 0x05000001
 
 // TextArea flags, keep these in sync too
 // the control type is intentionally left out
@@ -180,8 +179,6 @@ public: //Events
 	void SetFocus(bool focus);
 	/** OnChange Scripted Event Function Name */
 	EventHandler TextAreaOnChange;
-	/** OutOfText Scripted Event Function Name */
-	EventHandler TextAreaOutOfText;
 };
 
 }
diff --git a/gemrb/docs/en/GUIScript/SetEvent.txt b/gemrb/docs/en/GUIScript/SetEvent.txt
index 98ff994..4e7c2c2 100644
--- a/gemrb/docs/en/GUIScript/SetEvent.txt
+++ b/gemrb/docs/en/GUIScript/SetEvent.txt
@@ -19,7 +19,6 @@ IE_GUI_PROGRESS_END_REACHED = 0x01000000, the progressbar received a 100 percent
 IE_GUI_SLIDER_ON_CHANGE   = 0x02000000, the slider's knob position has changed.
 IE_GUI_EDIT_ON_CHANGE     = 0x03000000, the text in the editbox has changed.
 IE_GUI_TEXTAREA_ON_CHANGE = 0x05000000, the text in the textarea has changed.
-IE_GUI_TEXTAREA_OUT_OF_TEXT = 0x05000001, the smooth scrolling textarea is out of text.
 IE_GUI_LABEL_ON_PRESS     = 0x06000000, the label was pressed.
 IE_GUI_SCROLLBAR_ON_CHANGE= 0x07000000, the scrollbar's knob position has changed.
 .... (See GUIDefines.py for more event types)

-----------------------------------------------------------------------


This is an automated email from the git hooks/post-receive script.
-- 
gemrb: Infinity Engine emulator