Index: trunk/tests/render_test/rl.cc
===================================================================
--- trunk/tests/render_test/rl.cc	(revision 90)
+++ trunk/tests/render_test/rl.cc	(revision 93)
@@ -1,3 +1,2 @@
-#include <nv/lib/sdl12.hh>
 #include <nv/interface/vertex_buffer.hh>
 #include <nv/gl/gl_device.hh>
@@ -205,22 +204,25 @@
 		m_char_program->set_uniform( "tex", 0 );
 		m_window->get_context()->draw( nv::TRIANGLES, m_render_state, m_char_program, m_char_va, 6 );
-
-		SDL_GL_SwapBuffers();
-		SDL_Event event;
-		while(SDL_PollEvent(&event)) 
+		m_window->swap_buffers();
+
+		nv::io_event event;
+		while(m_window->poll_event(event)) 
 		{      
 			switch (event.type) 
 			{
-			case SDL_QUIT:
+			case nv::EV_QUIT:
 				keypress = 1;
 				break;
-			case SDL_KEYDOWN:
-				switch (event.key.keysym.sym) 
+			case nv::EV_KEY:
+				if (event.key.pressed)
 				{
-				case SDLK_ESCAPE: keypress = 1; break;
-				case SDLK_LEFT: move.x = move.x - 1.0f; break;
-				case SDLK_RIGHT: move.x = move.x + 1.0f; break;
-				case SDLK_UP: move.z = move.z - 1.0f; break;
-				case SDLK_DOWN: move.z = move.z + 1.0f; break;
+					switch (event.key.code) 
+					{
+					case nv::KEY_ESCAPE : keypress = 1; break;
+					case nv::KEY_LEFT   : move.x = move.x - 1.0f; break;
+					case nv::KEY_RIGHT  : move.x = move.x + 1.0f; break;
+					case nv::KEY_UP     : move.z = move.z - 1.0f; break;
+					case nv::KEY_DOWN   : move.z = move.z + 1.0f; break;
+					}
 				}
 				break;
