Made HelpGen into a wxWin app (still uses command-line args); moved includes

into src for simplicity; added VC++ 5 project file


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@3642 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

utils/HelpGen/src/HelpGen.cpp

@@ -73,6 +73,16 @@
 // just a copy of argv
 static char **g_argv = NULL;
 
+class HelpGenApp: public wxApp
+{
+public:
+    HelpGenApp() {};
+
+    bool OnInit();
+};
+
+IMPLEMENT_APP(HelpGenApp);
+
 // -----------------------------------------------------------------------------
 // private functions
 // -----------------------------------------------------------------------------
@@ -456,7 +466,12 @@ static void usage()
     exit(1);
 }
 
+/*
 int main(int argc, char **argv)
+{
+*/
+
+bool HelpGenApp::OnInit()
 {
     enum
     {
@@ -634,7 +649,7 @@ int main(int argc, char **argv)
             wxLogError("Can't complete diff.");
 
             // failure
-            return 1;
+            return false;
         }
 
         DocManager docman(paramNames);
@@ -654,7 +669,7 @@ int main(int argc, char **argv)
         docman.DumpDifferences(ctxTop);
     }
 
-    return 0;
+    return false;
 }
 
 // -----------------------------------------------------------------------------
@@ -1914,6 +1929,10 @@ static const char *GetCurrentTime(const char *timeFormat)
 
 /*
    $Log$
+   Revision 1.8  1999/09/13 14:29:39  JS
+   Made HelpGen into a wxWin app (still uses command-line args); moved includes
+   into src for simplicity; added VC++ 5 project file
+
    Revision 1.7  1999/02/21 22:32:32  VZ
    1. more C++ parser fixes - now it almost parses wx/string.h
     a) #if/#ifdef/#else (very) limited support

utils/HelpGen/src/HelpGen.rc

@@ -1,3 +1,2 @@
-/* mondrian ICON "mondrian.ico" */
 #include "wx/msw/wx.rc"
 

utils/HelpGen/src/makefile.nt

@@ -1,66 +0,0 @@
-#
-# File:		makefile.nt
-# Author:	Julian Smart
-# Created:	1993
-# Updated:	
-# Copyright:	(c) 1993, AIAI, University of Edinburgh
-#
-# "%W% %G%"
-#
-# Makefile : Builds minimal example (MS VC++).
-# Use FINAL=1 argument to nmake to build final version with no debugging
-# info
-
-# Set WXDIR for your system
-WXDIR = $(WXWIN)
-
-WXUSINGDLL=0
-
-!include $(WXDIR)\src\ntwxwin.mak
-
-THISDIR = $(WXDIR)\utils\HelpGen\src
-PROGRAM=HelpGen
-EXTRAINC=-I..\include
-
-OBJECTS = $(PROGRAM).obj cjparser.obj ifcontext.obj markup.obj\
-  scriptbinder.obj srcparser.obj sourcepainter.obj
-
-$(PROGRAM):    $(PROGRAM).exe
-
-all:    wx $(PROGRAM).exe
-
-wx:
-        cd $(WXDIR)\src\msw
-        nmake -f makefile.nt FINAL=$(FINAL)
-        cd $(THISDIR)
-
-wxclean:
-        cd $(WXDIR)\src\msw
-        nmake -f makefile.nt clean
-        cd $(THISDIR)
-
-$(PROGRAM).exe:      $(DUMMYOBJ) $(WXLIB) $(OBJECTS) $(PROGRAM).res
-	$(link) @<<
--out:$(PROGRAM).exe
-$(LINKFLAGS)
-$(DUMMYOBJ) $(OBJECTS) $(PROGRAM).res
-$(LIBS)
-<<
-
-
-$(PROGRAM).obj:      $(PROGRAM).$(SRCSUFF) $(DUMMYOBJ)
-        $(cc) @<<
-$(CPPFLAGS) /c /Tp $*.$(SRCSUFF)
-<<
-
-$(PROGRAM).res :      $(PROGRAM).rc $(WXDIR)\include\wx\msw\wx.rc
-    $(rc) -r /i$(WXDIR)\include -fo$@ $(PROGRAM).rc
-
-
-clean:
-        -erase *.obj
-        -erase *.exe
-        -erase *.res
-        -erase *.map
-        -erase *.sbr
-        -erase *.pdb

utils/HelpGen/src/sourcepainter.cpp

@@ -25,7 +25,7 @@
 	#include <map>
 #else
 
-	#include <wxstlac.h>
+	#include "wxstlac.h"
 
 #endif