Index: trunk/src/gui/gui_gfx_renderer.cc
===================================================================
--- trunk/src/gui/gui_gfx_renderer.cc	(revision 520)
+++ trunk/src/gui/gui_gfx_renderer.cc	(revision 534)
@@ -109,5 +109,5 @@
 {
 public:
-	screen_render_data( context* actx, nv::size_t initial_size )
+	screen_render_data( context* actx, nv::uint32 initial_size )
 		: buffer( actx, VERTEX_BUFFER, DYNAMIC_DRAW, initial_size ), ctx( actx ), varray(), shader()
 	{
@@ -147,5 +147,5 @@
 	m_area.dim( dimension( w->get_width(), w->get_height() ) );
 	region white = m_atlas.get_region( ivec2( 3, 3 ) );
-	size_t wsize = m_atlas.get_depth() * 4 * 4;
+	uint32 wsize = m_atlas.get_depth() * 4 * 4;
 	uint8* wfill = new uint8[m_atlas.get_depth() * 4 * 4];
 	raw_fill( wfill, wfill + wsize, 255 );
@@ -178,5 +178,5 @@
 }
 
-texture_font* gfx_renderer::get_font( nv::size_t name ) const
+texture_font* gfx_renderer::get_font( nv::uint32 name ) const
 {
 	if ( name >= m_fonts.size() ) return nullptr;
@@ -184,5 +184,5 @@
 }
 
-const image_info* gfx_renderer::get_image( nv::size_t name ) const
+const image_info* gfx_renderer::get_image( nv::uint32 name ) const
 {
 	if ( name >= m_images.size() ) return nullptr;
@@ -190,5 +190,5 @@
 }
 
-nv::size_t gfx_renderer::load_font( const string_view& filename, nv::size_t size )
+nv::uint32 gfx_renderer::load_font( const string_view& filename, nv::uint32 size )
 {
 	string128 id( filename );
@@ -199,5 +199,5 @@
 		return i->second;
 	}
-	size_t result = m_fonts.size();
+	uint32 result = m_fonts.size();
 	texture_font* f = new texture_font( &m_atlas, filename.data(), static_cast<float>( size ) );
 	f->load_glyphs( "!\"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~ " );
@@ -208,5 +208,5 @@
 }
 
-nv::size_t gfx_renderer::load_image( const string_view& filename )
+nv::uint32 gfx_renderer::load_image( const string_view& filename )
 {
 	auto i = m_image_names.find( filename );
@@ -215,5 +215,5 @@
 		return i->second;
 	}
-	size_t result = m_images.size();
+	uint32 result = m_images.size();
 	image_data* data = m_window->get_device()->create_image_data( filename );
 	// TODO: Repitching
@@ -236,5 +236,5 @@
 	}
 	element_render_data* er = reinterpret_cast< element_render_data* >( e->m_render_data );
-	size_t size_before = er->buffer.data().size();
+	uint32 size_before = er->buffer.data().size();
 
 	vector< gui_quad >& qvec = er->buffer.lock();
@@ -254,5 +254,5 @@
 		if ( m_style.get( e, "skin", selector, path ) )
 		{
-			size_t image_id = load_image( path );
+			uint32 image_id = load_image( path );
 			const image_info* image = get_image( image_id );
 			if ( image )
@@ -319,5 +319,5 @@
 			if ( m_style.get( e, "text_color", selector, color ) && m_style.get( e, "text_font", selector, path ) && m_style.get( e, "text_size", selector, border ) )
 			{
-				size_t font_id = load_font( path, size_t( border ) );
+				uint32 font_id = load_font( path, uint32( border ) );
 				texture_font* font = get_font( font_id );
 				position p = abs.ul + position( 0, border );
Index: trunk/src/gui/gui_style.cc
===================================================================
--- trunk/src/gui/gui_style.cc	(revision 520)
+++ trunk/src/gui/gui_style.cc	(revision 534)
@@ -33,5 +33,5 @@
 	if ( !resolve( e->m_id, e->m_class, cselector, centry, LUA_TTABLE ) ) return false;
 	vec = vec4();
-	for ( size_t i = 0; i < 4; ++i )
+	for ( uint32 i = 0; i < 4; ++i )
 	{
 		lua_rawgeti( m_lua, -1, int(i+1) );