[Gemrb-commits] gemrb/gemrb/plugins/Core Control.cpp,1.29,1.30 Label.cpp,1.29,1.30 TextEdit.cpp,1.22,1.23 Window.cpp,1.36,1.37

[Laszlo T. <ave...@us...>]

Update of /cvsroot/gemrb/gemrb/gemrb/plugins/Core
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14816/Core

Modified Files:
	Control.cpp Label.cpp TextEdit.cpp Window.cpp 
Log Message:
fixed SetText in TextEdit/Label to invalidate the parent window (if it exists)


Index: TextEdit.cpp
===================================================================
RCS file: /cvsroot/gemrb/gemrb/gemrb/plugins/Core/TextEdit.cpp,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** TextEdit.cpp	18 Nov 2004 23:32:41 -0000	1.22
--- TextEdit.cpp	21 Nov 2004 16:12:07 -0000	1.23
***************
*** 154,158 ****
  {
  	strncpy( ( char * ) Buffer, string, max );
! 	( ( Window * ) Owner )->Invalidate();
  	return 0;
  }
--- 154,160 ----
  {
  	strncpy( ( char * ) Buffer, string, max );
! 	if (Owner) {
! 		( ( Window * ) Owner )->Invalidate();
! 	}
  	return 0;
  }

Index: Control.cpp
===================================================================
RCS file: /cvsroot/gemrb/gemrb/gemrb/plugins/Core/Control.cpp,v
retrieving revision 1.29
retrieving revision 1.30
diff -C2 -d -r1.29 -r1.30
*** Control.cpp	18 Nov 2004 23:32:40 -0000	1.29
--- Control.cpp	21 Nov 2004 16:12:07 -0000	1.30
***************
*** 34,38 ****
  	Value = 0;
  	Tooltip = NULL;
! 
  	XPos = 0;
  	YPos = 0;
--- 34,38 ----
  	Value = 0;
  	Tooltip = NULL;
! 	Owner = 0;
  	XPos = 0;
  	YPos = 0;

Index: Label.cpp
===================================================================
RCS file: /cvsroot/gemrb/gemrb/gemrb/plugins/Core/Label.cpp,v
retrieving revision 1.29
retrieving revision 1.30
diff -C2 -d -r1.29 -r1.30
*** Label.cpp	20 Nov 2004 10:39:58 -0000	1.29
--- Label.cpp	21 Nov 2004 16:12:07 -0000	1.30
***************
*** 71,75 ****
  		SetColor(white, black);
  	}
! 	Changed = true;
  	return 0;
  }
--- 71,77 ----
  		SetColor(white, black);
  	}
! 	if (Owner) {
! 		( ( Window * ) Owner )->Invalidate();
! 	}
  	return 0;
  }
***************
*** 128,131 ****
  const char* Label::QueryText()
  {
!         return ( const char * ) Buffer;
  }
--- 130,133 ----
  const char* Label::QueryText()
  {
! 	return ( const char * ) Buffer;
  }

Index: Window.cpp
===================================================================
RCS file: /cvsroot/gemrb/gemrb/gemrb/plugins/Core/Window.cpp,v
retrieving revision 1.36
retrieving revision 1.37
diff -C2 -d -r1.36 -r1.37
*** Window.cpp	1 Nov 2004 16:28:47 -0000	1.36
--- Window.cpp	21 Nov 2004 16:12:07 -0000	1.37
***************
*** 182,185 ****
--- 182,188 ----
  	DefaultControl = -1;
  	for (unsigned int i = 0; i < Controls.size(); i++) {
+ 		if (!Controls[i]) {
+ 			continue;
+ 		}
  		Controls[i]->Changed = true;
  		switch (Controls[i]->ControlType) {