* modules/gui/skins2/*: a couple of msvc build fixes. Patch courtesy of Brian Robb...

diff --git a/modules/gui/skins2/src/bitmap_font.cpp b/modules/gui/skins2/src/bitmap_font.cpp
index 7c07d9c519ffe020a9278b69e06882e98fe4b260..91316f5bdf54f6971f696288c7369176d911ec4f 100644 (file)
--- a/modules/gui/skins2/src/bitmap_font.cpp
+++ b/modules/gui/skins2/src/bitmap_font.cpp
@@ -30,6 +30,8 @@ BitmapFont::BitmapFont( intf_thread_t *pIntf, const GenericBitmap &rBitmap,
                         const string &rType ):
     GenericFont( pIntf ), m_rBitmap( rBitmap )
 {
+    int i;
+
     // Build the character table
     if( rType == "digits" )
     {
@@ -37,7 +39,7 @@ BitmapFont::BitmapFont( intf_thread_t *pIntf, const GenericBitmap &rBitmap,
         m_height = 13;
         m_advance = 12;
         m_skip = 6;
-        for( int i = 0; i <= 9; i++ )
+        for( i = 0; i <= 9; i++ )
         {
             m_table['0'+i].m_xPos = i * m_width;
         }
@@ -49,14 +51,14 @@ BitmapFont::BitmapFont( intf_thread_t *pIntf, const GenericBitmap &rBitmap,
         m_height = 6;
         m_advance = 5;
         m_skip = 5;
-        for( int i = 0; i < 26; i++ )
+        for( i = 0; i < 26; i++ )
         {
             m_table['A'+i].m_xPos = m_table['a'+i].m_xPos = i * m_width;
         }
         m_table[(size_t)'"'].m_xPos = 26 * m_width;
         m_table[(size_t)'@'].m_xPos = 27 * m_width;
         m_table[(size_t)' '].m_xPos = 29 * m_width;
-        for( int i = 0; i <= 9; i++ )
+        for( i = 0; i <= 9; i++ )
         {
             m_table['0'+i].m_xPos = i * m_width;
             m_table['0'+i].m_yPos = m_height;
@@ -64,7 +66,7 @@ BitmapFont::BitmapFont( intf_thread_t *pIntf, const GenericBitmap &rBitmap,
         static const char specialChars[] = {'.', ':', '(', ')', '-', '\'',
             '!', '_', '+', '\\', '/', '[', ']', '^', '&', '%', ',', '=', '$',
             '#'};
-        for( int i = 0; i < 19; i++ )
+        for( i = 0; i < 19; i++ )
         {
             m_table[(size_t)specialChars[i]].m_xPos = (11 + i) * m_width;
             m_table[(size_t)specialChars[i]].m_yPos = m_height;

diff --git a/modules/gui/skins2/src/skin_common.hpp b/modules/gui/skins2/src/skin_common.hpp
index 4f0d4725010b03f2ef4ab092ff3871914bb495ad..5b5e315f9fc62f7b445fb62770e1223202933fae 100644 (file)
--- a/modules/gui/skins2/src/skin_common.hpp
+++ b/modules/gui/skins2/src/skin_common.hpp
@@ -47,8 +47,10 @@ class ThemeRepository;
 #endif
 
 #ifdef _MSC_VER
-// turn off 'warning C4355: 'this' : used in base member initializer list'\r
+// turn off 'warning C4355: 'this' : used in base member initializer list'
 #pragma warning ( disable:4355 )
+// turn off 'identifier was truncated to '255' characters in the debug info'
+#pragma warning ( disable:4786 )
 #endif
 
 // Useful macros