Added checks for wxUSE_IOSTREAMH to #include the correct header file based on setup...

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 661af5ebb6286cb44d2213a2b2b5ef800ef8c565..fcdbf3e1b42aa0d2a7b8a3640d4f6a00711c8fbb 100644 (file)
--- a/src/common/dbtable.cpp
+++ b/src/common/dbtable.cpp
@@ -35,7 +35,11 @@
 #endif
 
 #ifdef DBDEBUG_CONSOLE
 #endif
 
 #ifdef DBDEBUG_CONSOLE

-    #include "iostream.h"
+#if wxUSE_IOSTREAMH
+    #include <iostream.h>
+#else
+    #include <iostream>
+#endif

     #include "wx/ioswrap.h"
 #endif
 
     #include "wx/ioswrap.h"
 #endif
 

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;
 

diff --git a/utils/projgen/makeproj.cpp b/utils/projgen/makeproj.cpp
index e52a40d5246c8b1825c9a050fad6daa5822aae4d..0f0fdf76a94317a5e808f1db1c1383717db0fab7 100644 (file)
--- a/utils/projgen/makeproj.cpp
+++ b/utils/projgen/makeproj.cpp
@@ -23,8 +23,13 @@
 #include "wx/wx.h"
 #include "wx/resource.h"
 
 #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"
 
 #include "makeproj.h"
 #include "projgenrc.h"