[Scummvm-cvs-logs] CVS: scummvm/backends/wince/CEgui CEGUI.h,1.2,1.3 ItemSwitch.h,1.2,1.3 PanelKeyboard.cpp,1.2,1.3 PanelKeyboard.h,1.2,1.3

Nicolas Bacca arisme at users.sourceforge.net
Sun May 9 07:48:02 CEST 2004


Update of /cvsroot/scummvm/scummvm/backends/wince/CEgui
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27153

Modified Files:
	CEGUI.h ItemSwitch.h PanelKeyboard.cpp PanelKeyboard.h 
Log Message:
Switch to EventsBuffer

Index: CEGUI.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/wince/CEgui/CEGUI.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- CEGUI.h	26 Jan 2004 08:13:10 -0000	1.2
+++ CEGUI.h	9 May 2004 14:47:26 -0000	1.3
@@ -21,7 +21,6 @@
 
 #include "ToolbarHandler.h"
 #include "Panel.h"
-#include "ItemSendKey.h"
 #include "ItemSwitch.h"
 #include "PanelKeyboard.h"
 

Index: ItemSwitch.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/wince/CEgui/ItemSwitch.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- ItemSwitch.h	26 Jan 2004 08:13:10 -0000	1.2
+++ ItemSwitch.h	9 May 2004 14:47:26 -0000	1.3
@@ -27,9 +27,8 @@
 #include "common/system.h"
 
 #include "Panel.h"
-#include "KeysBuffer.h"
+#include "EventsBuffer.h"
 
-using CEKEYS::KeysBuffer;
 using CEKEYS::Key;
 
 namespace CEGUI {

Index: PanelKeyboard.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/wince/CEgui/PanelKeyboard.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- PanelKeyboard.cpp	26 Jan 2004 08:13:10 -0000	1.2
+++ PanelKeyboard.cpp	9 May 2004 14:47:26 -0000	1.3
@@ -29,9 +29,8 @@
 	const char KEYBOARD_MAPPING_ALPHA_LOW[] = {"nopqrstuvwxyz"};
 	const char KEYBOARD_MAPPING_NUMERIC_LOW[] = {"67890"};
 
-	PanelKeyboard::PanelKeyboard(WORD reference, KeysBuffer *buffer) : Toolbar() {
+	PanelKeyboard::PanelKeyboard(WORD reference) : Toolbar() {
 		setBackground(reference);
-		_buffer = buffer->Instance(); 
 	} 
 
 	
@@ -73,12 +72,10 @@
 				keyCode = 10;
 			}
 
-			if (keyAscii != 0) {
+			if (keyAscii != 0 && pushed) {
 				_key.setAscii(keyAscii);
 				_key.setKeycode(tolower(keyAscii));
-				_key.setPushed(pushed);
-				_buffer->add(&_key);
-				return true;
+				return EventsBuffer::simulateKey(&_key);
 			}
 			else
 				return false;

Index: PanelKeyboard.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/wince/CEgui/PanelKeyboard.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- PanelKeyboard.h	26 Jan 2004 08:13:10 -0000	1.2
+++ PanelKeyboard.h	9 May 2004 14:47:26 -0000	1.3
@@ -27,20 +27,19 @@
 #include "common/system.h"
 
 #include "Toolbar.h"
-#include "KeysBuffer.h"
+#include "EventsBuffer.h"
 
-using CEKEYS::KeysBuffer;
 using CEKEYS::Key;
+using CEKEYS::EventsBuffer;
 
 namespace CEGUI {
 
 	class PanelKeyboard : public Toolbar {
 	public:
-		PanelKeyboard(WORD reference, KeysBuffer *buffer);
+		PanelKeyboard(WORD reference);
 		virtual ~PanelKeyboard(); 
 		virtual bool action(int x, int y, bool pushed);
 	private:
-		KeysBuffer *_buffer;
 		Key _key;
 	};
 }





More information about the Scummvm-git-logs mailing list