Added checks for wxUSE_IOSTREAMH to #include the correct header file based on setup.h settings
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@13580 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
parent
68320e40cd
commit
4888e623a6
@ -35,7 +35,11 @@
|
||||
#endif
|
||||
|
||||
#ifdef DBDEBUG_CONSOLE
|
||||
#include "iostream.h"
|
||||
#if wxUSE_IOSTREAMH
|
||||
#include <iostream.h>
|
||||
#else
|
||||
#include <iostream>
|
||||
#endif
|
||||
#include "wx/ioswrap.h"
|
||||
#endif
|
||||
|
||||
|
@ -22,7 +22,11 @@
|
||||
|
||||
#include "docripper.h"
|
||||
|
||||
#include <iostream.h>
|
||||
#if wxUSE_IOSTREAMH
|
||||
#include <iostream.h>
|
||||
#else
|
||||
#include <iostream>
|
||||
#endif
|
||||
|
||||
// script templates
|
||||
|
||||
@ -178,12 +182,14 @@ void RipperDocGen::AppendComments( spContext& fromContext, string& str )
|
||||
if ( lst[i]->StartsParagraph() )
|
||||
{
|
||||
str += mTags[TAG_PARAGRAPH].start;
|
||||
|
||||
}
|
||||
|
||||
str += lst[i]->mText;
|
||||
}
|
||||
|
||||
// remove new lines, and insert paragraph breaks
|
||||
|
||||
// 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 ( n + 2 < len )
|
||||
|
||||
{
|
||||
|
||||
if ( ( str[n] == 13 && str[n+1] == 10 && // FIXME:: quick-hack
|
||||
|
||||
str[n+2] == 13 ) ||
|
||||
|
||||
( str[n] == 10 && str[n+1] == 10 )
|
||||
|
||||
)
|
||||
|
||||
{
|
||||
|
||||
str.insert( n + 1, "<p>" ); // FIXME:: quick-hack
|
||||
|
||||
len += 3;
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
||||
str[n] = ' ';
|
||||
|
||||
}
|
||||
|
||||
|
||||
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 )
|
||||
|
||||
|
||||
|
||||
return;
|
||||
|
||||
|
||||
if ( CheckIfUncommented( pd, *mpMacroIdx ) )
|
||||
return;
|
||||
|
||||
|
@ -23,8 +23,13 @@
|
||||
#include "wx/wx.h"
|
||||
#include "wx/resource.h"
|
||||
|
||||
#include "iostream.h"
|
||||
#include "fstream.h"
|
||||
#if wxUSE_IOSTREAMH
|
||||
#include <iostream.h>
|
||||
#include <fstream.h>
|
||||
#else
|
||||
#include <iostream>
|
||||
#include <fstream>
|
||||
#endif
|
||||
|
||||
#include "makeproj.h"
|
||||
#include "projgenrc.h"
|
||||
|
Loading…
Reference in New Issue
Block a user