X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/28468136d08dfa16a4052770a6c66e2c60663941..aa154cb1578ba9d44c7e24c5e76d8238bf8809d0:/utils/HelpGen/src/sourcepainter.cpp?ds=sidebyside

diff --git a/utils/HelpGen/src/sourcepainter.cpp b/utils/HelpGen/src/sourcepainter.cpp
index fbabb66446..0c58ea5452 100644
--- 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,10 +400,12 @@ 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;
+*/
 
 		int size = sizeof(__gKeyWords) / sizeof( KeywordT );
 
@@ -637,23 +636,23 @@ void SourcePainter::GetResultString(string& result, MarkupTagsT tags)
 {
 	// this method works, only if results of processing 
 	// are collected
-	ASSERT( mCollectResultsOn ); 
+	// 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;