projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Moved the popup menu event handlers to dialog event handler
[wxWidgets.git]
/
utils
/
HelpGen
/
src
/
docripper.cpp
diff --git
a/utils/HelpGen/src/docripper.cpp
b/utils/HelpGen/src/docripper.cpp
index 9599d619200dc84b8b21ee0dd6186c401348a120..3b50e47cbcab2d4d705e7e237d1fb79512744317 100644
(file)
--- a/
utils/HelpGen/src/docripper.cpp
+++ b/
utils/HelpGen/src/docripper.cpp
@@
-22,7
+22,11
@@
#include "docripper.h"
#include "docripper.h"
-#include <iostream.h>
+#if wxUSE_IOSTREAMH
+ #include <iostream.h>
+#else
+ #include <iostream>
+#endif
// script templates
// script templates
@@
-178,12
+182,14
@@
void RipperDocGen::AppendComments( spContext& fromContext, string& str )
if ( lst[i]->StartsParagraph() )
{
str += mTags[TAG_PARAGRAPH].start;
if ( lst[i]->StartsParagraph() )
{
str += mTags[TAG_PARAGRAPH].start;
+
}
str += lst[i]->mText;
}
// remove new lines, and insert paragraph breaks
}
str += lst[i]->mText;
}
// remove new lines, and insert paragraph breaks
+
// if empty lines found
size_t len = str.length();
// if empty lines found
size_t len = str.length();
@@
-192,22
+198,38
@@
void RipperDocGen::AppendComments( spContext& fromContext, string& str )
if ( str[n] == 10 ||
str[n] == 13 )
if ( str[n] == 10 ||
str[n] == 13 )
+
{
{
+
if ( n + 2 < len )
if ( n + 2 < len )
+
{
{
+
if ( ( str[n] == 13 && str[n+1] == 10 && // FIXME:: quick-hack
if ( ( str[n] == 13 && str[n+1] == 10 && // FIXME:: quick-hack
+
str[n+2] == 13 ) ||
str[n+2] == 13 ) ||
+
( str[n] == 10 && str[n+1] == 10 )
( str[n] == 10 && str[n+1] == 10 )
+
)
)
+
{
{
+
str.insert( n + 1, "<p>" ); // FIXME:: quick-hack
str.insert( n + 1, "<p>" ); // FIXME:: quick-hack
+
len += 3;
len += 3;
+
}
}
+
}
}
+
+
str[n] = ' ';
str[n] = ' ';
+
}
}
+
str += mTags[TAG_PARAGRAPH].end;
}
str += mTags[TAG_PARAGRAPH].end;
}
@@
-423,9
+445,12
@@
void RipperDocGen::VisitTypeDef( spTypeDef& td )
void RipperDocGen::VisitPreprocessorLine( spPreprocessorLine& pd )
{
if ( pd.mDefType != SP_PREP_DEF_REDEFINE_SYMBOL )
void RipperDocGen::VisitPreprocessorLine( spPreprocessorLine& pd )
{
if ( pd.mDefType != SP_PREP_DEF_REDEFINE_SYMBOL )
+
+
return;
return;
+
if ( CheckIfUncommented( pd, *mpMacroIdx ) )
return;
if ( CheckIfUncommented( pd, *mpMacroIdx ) )
return;