[Scummvm-cvs-logs] CVS: scummvm gui.cpp,1.15,1.16

Nicolas Bacca arisme at users.sourceforge.net
Thu Mar 14 16:32:05 CET 2002


Update of /cvsroot/scummvm/scummvm
In directory usw-pr-cvs1:/tmp/cvs-serv25386

Modified Files:
	gui.cpp 
Log Message:
Keyboard issue for WinCE, typo in button type, and reduce the save dialog since random crashes happen when something overlaps the inventory

Index: gui.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/gui.cpp,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** gui.cpp	14 Mar 2002 17:36:12 -0000	1.15
--- gui.cpp	15 Mar 2002 00:31:51 -0000	1.16
***************
*** 363,367 ****
  	{GUI_CUSTOMTEXT, 0x01, 0, 30 + 10, 20 + 10 + 15 + 5 + 15, 230, 15, 0, 10},	 // ScummVM Url
  	{GUI_CUSTOMTEXT, 0x01, 0, 30 + 75, 20 + 10 + 15 + 5 + 15 + 15 + 15, 150, 15, 0, 11}, // Lucasarts
! 	{GUI_CUSTOMTEXT, 0x01, GWF_BUTTON, 30 + 113, 20 + 96, 54, 16, 40, 9 },
  	{0}
  };
--- 363,367 ----
  	{GUI_CUSTOMTEXT, 0x01, 0, 30 + 10, 20 + 10 + 15 + 5 + 15, 230, 15, 0, 10},	 // ScummVM Url
  	{GUI_CUSTOMTEXT, 0x01, 0, 30 + 75, 20 + 10 + 15 + 5 + 15 + 15 + 15, 150, 15, 0, 11}, // Lucasarts
! 	{GUI_RESTEXT, 0x01, GWF_BUTTON, 30 + 113, 20 + 96, 54, 16, 40, 9 },
  	{0}
  };
***************
*** 392,396 ****
  
  const GuiWidget save_load_dialog[] = {
! 	{GUI_STAT,0xFF,GWF_DEFAULT|GWF_PARENT,30,20,260,150,0,0},
  	{GUI_RESTEXT,0x01,0,40,5,128,16,0,1}, /* How may I serve you? */
  	{GUI_RESTEXT,0x02,0,40,5,128,16,0,2}, /* Select a game to LOAD */
--- 392,396 ----
  
  const GuiWidget save_load_dialog[] = {
! 	{GUI_STAT,0xFF,GWF_DEFAULT|GWF_PARENT,30,20,260,125,0,0},
  	{GUI_RESTEXT,0x01,0,40,5,128,16,0,1}, /* How may I serve you? */
  	{GUI_RESTEXT,0x02,0,40,5,128,16,0,2}, /* Select a game to LOAD */
***************
*** 774,779 ****
  	_active = false;
  
! #ifdef _WIN32_WCE
! 	if (_dialog == SAVELOAD_DIALOG) {
  		draw_keyboard = false;
  		toolbar_drawn = false;
--- 774,780 ----
  	_active = false;
  
! #ifdef _WIN32_WCE
! 	// Option dialog can be accessed from the file dialog now, always check
! 	if (draw_keyboard) {
  		draw_keyboard = false;
  		toolbar_drawn = false;





More information about the Scummvm-git-logs mailing list