Index: trunk/src/gl/gl_context.cc
===================================================================
--- trunk/src/gl/gl_context.cc	(revision 503)
+++ trunk/src/gl/gl_context.cc	(revision 505)
@@ -848,5 +848,4 @@
 }
 
-
 nv::gl_context::~gl_context()
 {
Index: trunk/src/gl/gl_device.cc
===================================================================
--- trunk/src/gl/gl_device.cc	(revision 503)
+++ trunk/src/gl/gl_device.cc	(revision 505)
@@ -145,5 +145,4 @@
 {
 	unsigned glid = 0;
-	unsigned glenum = buffer_type_to_enum( type );
 	glGenBuffers( 1, &glid );
 
Index: trunk/src/gl/gl_window.cc
===================================================================
--- trunk/src/gl/gl_window.cc	(revision 503)
+++ trunk/src/gl/gl_window.cc	(revision 505)
@@ -9,4 +9,5 @@
 #include "nv/core/logging.hh"
 #include "nv/lib/gl.hh"
+#include "nv/lib/sdl.hh"
 
 using namespace nv;
@@ -31,5 +32,4 @@
 	delete m_context;
 	m_context = nullptr;
-	delete m_input;
 }
 
@@ -41,4 +41,5 @@
 
 	m_handle = handle;
+	m_dc     = dc;
 
 	// TODO: error checking
@@ -110,2 +111,15 @@
 }
 
+void nv::gl_window::make_current()
+{
+#if NV_PLATFORM == NV_WINDOWS
+	HDC hdc = reinterpret_cast<HDC>( m_hwnd );
+	dynwglMakeCurrent( hdc, reinterpret_cast<HGLRC>( m_context->get_native_handle() ) );
+#endif
+}
+
+nv::uint32 nv::gl_window::window_id()
+{
+	return SDL_GetWindowID( static_cast<SDL_Window*>( m_handle ) );
+}
+