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:
George Tasker
2002-01-15 14:49:31 +00:00
parent 68320e40cd
commit 4888e623a6
3 changed files with 38 additions and 4 deletions

View File

@@ -35,7 +35,11 @@
#endif #endif
#ifdef DBDEBUG_CONSOLE #ifdef DBDEBUG_CONSOLE
#include "iostream.h" #if wxUSE_IOSTREAMH
#include <iostream.h>
#else
#include <iostream>
#endif
#include "wx/ioswrap.h" #include "wx/ioswrap.h"
#endif #endif

View File

@@ -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() ) if ( lst[i]->StartsParagraph() )
{ {
str += mTags[TAG_PARAGRAPH].start; str += mTags[TAG_PARAGRAPH].start;
} }
str += lst[i]->mText; str += lst[i]->mText;
} }
// remove new lines, and insert paragraph breaks // remove new lines, and insert paragraph breaks
// if empty lines found // if empty lines found
size_t len = str.length(); size_t len = str.length();
@@ -192,22 +198,38 @@ void RipperDocGen::AppendComments( spContext& fromContext, string& str )
if ( str[n] == 10 || if ( str[n] == 10 ||
str[n] == 13 ) 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 ) void RipperDocGen::VisitPreprocessorLine( spPreprocessorLine& pd )
{ {
if ( pd.mDefType != SP_PREP_DEF_REDEFINE_SYMBOL ) if ( pd.mDefType != SP_PREP_DEF_REDEFINE_SYMBOL )
return; return;
if ( CheckIfUncommented( pd, *mpMacroIdx ) ) if ( CheckIfUncommented( pd, *mpMacroIdx ) )
return; return;

View File

@@ -23,8 +23,13 @@
#include "wx/wx.h" #include "wx/wx.h"
#include "wx/resource.h" #include "wx/resource.h"
#include "iostream.h" #if wxUSE_IOSTREAMH
#include "fstream.h" #include <iostream.h>
#include <fstream.h>
#else
#include <iostream>
#include <fstream>
#endif
#include "makeproj.h" #include "makeproj.h"
#include "projgenrc.h" #include "projgenrc.h"