Regenerated makefiles for 2.5.2

[wxWidgets.git] / utils / HelpGen / src / sourcepainter.cpp

diff --git a/utils/HelpGen/src/sourcepainter.cpp b/utils/HelpGen/src/sourcepainter.cpp
index 7c8b2f92eefab0154125a66b955d31dab77f56ff..0c58ea54529f0f756256930fefabf9211b508e66 100644 (file)
--- a/utils/HelpGen/src/sourcepainter.cpp
+++ b/utils/HelpGen/src/sourcepainter.cpp
@@ -21,12 +21,9 @@
 #endif
 
 #if defined( wxUSE_TEMPLATE_STL )
-
-       #include <map>
+#  include <map>
 #else
-
-       #include "wxstlac.h"
-
+#  include "wxstlac.h"
 #endif
 
 #include "sourcepainter.h"
@@ -403,9 +400,9 @@ void check_keyword_map( int keywordMapNr )
                // "make sure" the address of the first member of non-polimorphic class
                // coinsides with the address of the instance
 
+/*
                KeywordT dummy;
 
-/*
                if ( (char*)& dummy != &dummy.keyWord[0] )
                        throw;
 */
@@ -642,20 +639,20 @@ void SourcePainter::GetResultString(string& result, MarkupTagsT tags)
        // ASSERT( mCollectResultsOn ); 
        result = "";
 
-       int pos = 0;
+       unsigned pos = 0;
 
        for( size_t i = 0; i != mBlocks.size(); ++i )
        {
                int desc = mBlocks[i];
 
-               int len  = desc & 0xFFFF;
+               unsigned len  = desc & 0xFFFF;
                int rank = (desc >> 16) & 0xFFFF;
 
                result += tags[ rank_tags_map[rank] ].start;
 
-               for( int n = 0; n != len; ++n )
+               for( unsigned n = 0; n != len; ++n )
                
-                       result += mResultStr[pos+n];
+                       result += mResultStr[(unsigned int)(pos+n)];
 
                pos += len;