cleaning up the mess created by the FloodFill patch

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

diff --git a/utils/HelpGen/src/sourcepainter.cpp b/utils/HelpGen/src/sourcepainter.cpp
index fbabb6644641ef54a55cb9a5d9d386272b389544..487600935830a3f66b1ca9de7ef770705d8bf70a 100644 (file)
--- a/utils/HelpGen/src/sourcepainter.cpp
+++ b/utils/HelpGen/src/sourcepainter.cpp
@@ -21,12 +21,9 @@
 #endif
 
 #if defined( wxUSE_TEMPLATE_STL )
 #endif
 
 #if defined( wxUSE_TEMPLATE_STL )

-
-       #include <map>
+#  include <map>

 #else
 #else

-
-       #include "wxstlac.h"
-
+#  include "wxstlac.h"

 #endif
 
 #include "sourcepainter.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
 
                // "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;
                KeywordT dummy;
 
                if ( (char*)& dummy != &dummy.keyWord[0] )
                        throw;

+*/

 
                int size = sizeof(__gKeyWords) / sizeof( KeywordT );
 
 
                int size = sizeof(__gKeyWords) / sizeof( KeywordT );
 


@@ -637,7 +636,7 @@ void SourcePainter::GetResultString(string& result, MarkupTagsT tags)
 {
        // this method works, only if results of processing 
        // are collected
 {
        // this method works, only if results of processing 
        // are collected

-       ASSERT( mCollectResultsOn ); 
+       // ASSERT( mCollectResultsOn ); 

        result = "";
 
        int pos = 0;
        result = "";
 
        int pos = 0;