Added more makefiles

[wxWidgets.git] / utils / HelpGen / src / HelpGen.cpp

diff --git a/utils/HelpGen/src/HelpGen.cpp b/utils/HelpGen/src/HelpGen.cpp
index d4bb7670507f9f599f9899b1c5d00097d48a7bcf..28f36a2f0185a8a86e6f5d5d109863ec21455c74 100644 (file)
--- a/utils/HelpGen/src/HelpGen.cpp
+++ b/utils/HelpGen/src/HelpGen.cpp
@@ -40,10 +40,11 @@
 #ifndef WX_PRECOMP
     #include <wx/string.h>
     #include <wx/log.h>
 #ifndef WX_PRECOMP
     #include <wx/string.h>
     #include <wx/log.h>

-    #include <wx/file.h>

     #include <wx/dynarray.h>
 #endif // WX_PRECOMP
 
     #include <wx/dynarray.h>
 #endif // WX_PRECOMP
 

+#include <wx/file.h>
+

 // C++ parsing classes
 #include "cjparser.h"
 
 // C++ parsing classes
 #include "cjparser.h"
 


@@ -69,6 +70,10 @@ static wxString GetAllComments(const spContext& ctx);
 
 // get the string with current time (returns pointer to static buffer)
 // timeFormat is used for the call of strftime(3)
 
 // get the string with current time (returns pointer to static buffer)
 // timeFormat is used for the call of strftime(3)

+#ifdef GetCurrentTime
+#undef GetCurrentTime
+#endif
+

 static const char *GetCurrentTime(const char *timeFormat);
 
 // -----------------------------------------------------------------------------
 static const char *GetCurrentTime(const char *timeFormat);
 
 // -----------------------------------------------------------------------------


@@ -424,8 +429,8 @@ void HelpGenVisitor::VisitClass( spClass& cl )
             }
 
             wxString baseclass = *i;
             }
 
             wxString baseclass = *i;

-            derived << "\\helpref{" << baseclass << "}"
-                       "{ " << baseclass.MakeLower()  << "}";
+            derived << "\\helpref{" << baseclass << "}";
+                       derived << "{" << baseclass.MakeLower()  << "}";

         }
     }
     totalText << derived << "\n\n";
         }
     }
     totalText << derived << "\n\n";


@@ -569,7 +574,7 @@ void HelpGenVisitor::VisitOperation( spOperation& op )
         funcname = dtor;
     }
 
         funcname = dtor;
     }
 

-    totalText.Printf("\\membersection{%s::%s}\\label{%s}\n"
+    totalText.Printf("\\membersection{%s::%s}\\label{%s}\n\n"

                      "\\%sfunc{%s%s}{%s}{",
                      classname, funcname,
                      MakeLabel(classname, funcname).c_str(),
                      "\\%sfunc{%s%s}{%s}{",
                      classname, funcname,
                      MakeLabel(classname, funcname).c_str(),