[Scummvm-cvs-logs] CVS: scummvm/gui dialog.cpp,1.14,1.15 dialog.h,1.5,1.6

Max Horn fingolfin at users.sourceforge.net
Sat Sep 28 12:26:03 CEST 2002


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

Modified Files:
	dialog.cpp dialog.h 
Log Message:
patch #612722: MI2 NewGui title fix

Index: dialog.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/gui/dialog.cpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- dialog.cpp	19 Sep 2002 17:44:41 -0000	1.14
+++ dialog.cpp	28 Sep 2002 19:25:09 -0000	1.15
@@ -243,7 +243,7 @@
 	return w;
 }
 
-void Dialog::addButton(int x, int y, int w, int h, const char *label, uint32 cmd, char hotkey)
+void Dialog::addButton(int x, int y, int w, int h, const ScummVM::String &label, uint32 cmd, char hotkey)
 {
 	new ButtonWidget(this, x, y, w, h, label, cmd, hotkey);
 }

Index: dialog.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/gui/dialog.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- dialog.h	19 Sep 2002 17:44:41 -0000	1.5
+++ dialog.h	28 Sep 2002 19:25:09 -0000	1.6
@@ -70,7 +70,7 @@
 protected:
 	Widget* findWidget(int x, int y); // Find the widget at pos x,y if any
 
-	void addButton(int x, int y, int w, int h, const char *label, uint32 cmd, char hotkey);
+	void addButton(int x, int y, int w, int h, const ScummVM::String &label, uint32 cmd, char hotkey);
 };
 
 #endif





More information about the Scummvm-git-logs mailing list