From: George Tasker <gtasker@allenbrook.com>
Date: Tue, 15 Jan 2002 14:49:31 +0000 (+0000)
Subject: Added checks for wxUSE_IOSTREAMH to #include the correct header file based on setup... 
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/4888e623a6869c6af62cfe42da6303f9c8870585

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
---

diff --git a/src/common/dbtable.cpp b/src/common/dbtable.cpp
index 661af5ebb6..fcdbf3e1b4 100644
--- a/src/common/dbtable.cpp
+++ b/src/common/dbtable.cpp
@@ -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
 
diff --git a/utils/HelpGen/src/docripper.cpp b/utils/HelpGen/src/docripper.cpp
index 9599d61920..3b50e47cbc 100644
--- a/utils/HelpGen/src/docripper.cpp
+++ b/utils/HelpGen/src/docripper.cpp
@@ -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;
 
diff --git a/utils/projgen/makeproj.cpp b/utils/projgen/makeproj.cpp
index e52a40d524..0f0fdf76a9 100644
--- a/utils/projgen/makeproj.cpp
+++ b/utils/projgen/makeproj.cpp
@@ -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"