Index: trunk/dev/MSDK/MGui/Sources/X11/MJoystickLinux.cpp
===================================================================
--- trunk/dev/MSDK/MGui/Sources/X11/MJoystickLinux.cpp	(Revision 200)
+++ trunk/dev/MSDK/MGui/Sources/X11/MJoystickLinux.cpp	(Arbeitskopie)
@@ -120,17 +120,4 @@
 	}


-}
-
-int main(int argc, char* argv[])
-{
-	MJoystickLinux joystick(JOY1_DEV);
-
-	while(1)
-	{
-		joystick.updateData();
-
-		printf("Axis x = %f\n", joystick.getDeltaAxis(0));
-		fflush(stdout);
-	}
 }
\ Kein Zeilenumbruch am Ende der Datei
Index: trunk/dev/MSDK/MGui/Sources/X11/MX11Window.cpp
===================================================================
--- trunk/dev/MSDK/MGui/Sources/X11/MX11Window.cpp	(Revision 200)
+++ trunk/dev/MSDK/MGui/Sources/X11/MX11Window.cpp	(Arbeitskopie)
@@ -213,7 +213,7 @@

 #ifdef linux
 static void updateJoystick(MJoystick* joystick, MJoystickLinux* joystickLinux,
-			   MWindow* window)
+			   MWindow* window, MWIN_EVENT_TYPE eventType)
 {
 	joystickLinux->updateData();

@@ -239,7 +239,7 @@
 	joystick->setV(joystickLinux->getDeltaAxis(5));

 	MWinEvent events;
-	events.type = MWIN_EVENT_JOYSTICK1_UPDATE;
+	events.type = eventType;
 	window->sendEvents(&events);

 	joystick->flush();
@@ -575,10 +575,10 @@
 	MWindow* window = MWindow::getInstance();

 	MJoystick* joystick = window->getJoystick1();
-	updateJoystick(joystick, &joystick1, window);
+	updateJoystick(joystick, &joystick1, window, MWIN_EVENT_JOYSTICK1_UPDATE);

 	joystick = window->getJoystick2();
-	updateJoystick(joystick, &joystick2, window);
+	updateJoystick(joystick, &joystick2, window, MWIN_EVENT_JOYSTICK2_UPDATE);
 #endif

 	return true;