From 28468136d08dfa16a4052770a6c66e2c60663941 Mon Sep 17 00:00:00 2001 From: Julian Smart Date: Mon, 13 Sep 1999 14:29:41 +0000 Subject: [PATCH] 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 | 23 ++++++- utils/HelpGen/src/HelpGen.rc | 1 - utils/HelpGen/{include => src}/cjparser.h | 0 utils/HelpGen/{include => src}/docripper.h | 0 utils/HelpGen/{include => src}/ifcontext.h | 0 utils/HelpGen/src/makefile.nt | 66 ------------------- utils/HelpGen/{include => src}/markup.h | 0 utils/HelpGen/{include => src}/scriptbinder.h | 0 utils/HelpGen/src/sourcepainter.cpp | 2 +- .../HelpGen/{include => src}/sourcepainter.h | 0 utils/HelpGen/{include => src}/srcparser.h | 0 utils/HelpGen/{include => src}/wxstlac.h | 0 utils/HelpGen/{include => src}/wxstllst.h | 0 utils/HelpGen/{include => src}/wxstlvec.h | 0 14 files changed, 22 insertions(+), 70 deletions(-) rename utils/HelpGen/{include => src}/cjparser.h (100%) rename utils/HelpGen/{include => src}/docripper.h (100%) rename utils/HelpGen/{include => src}/ifcontext.h (100%) delete mode 100644 utils/HelpGen/src/makefile.nt rename utils/HelpGen/{include => src}/markup.h (100%) rename utils/HelpGen/{include => src}/scriptbinder.h (100%) rename utils/HelpGen/{include => src}/sourcepainter.h (100%) rename utils/HelpGen/{include => src}/srcparser.h (100%) rename utils/HelpGen/{include => src}/wxstlac.h (100%) rename utils/HelpGen/{include => src}/wxstllst.h (100%) rename utils/HelpGen/{include => src}/wxstlvec.h (100%) diff --git a/utils/HelpGen/src/HelpGen.cpp b/utils/HelpGen/src/HelpGen.cpp index 64d917bd4e..33ac212e03 100644 --- a/utils/HelpGen/src/HelpGen.cpp +++ b/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 diff --git a/utils/HelpGen/src/HelpGen.rc b/utils/HelpGen/src/HelpGen.rc index 626b82f58a..82bdf07561 100644 --- a/utils/HelpGen/src/HelpGen.rc +++ b/utils/HelpGen/src/HelpGen.rc @@ -1,3 +1,2 @@ -/* mondrian ICON "mondrian.ico" */ #include "wx/msw/wx.rc" diff --git a/utils/HelpGen/include/cjparser.h b/utils/HelpGen/src/cjparser.h similarity index 100% rename from utils/HelpGen/include/cjparser.h rename to utils/HelpGen/src/cjparser.h diff --git a/utils/HelpGen/include/docripper.h b/utils/HelpGen/src/docripper.h similarity index 100% rename from utils/HelpGen/include/docripper.h rename to utils/HelpGen/src/docripper.h diff --git a/utils/HelpGen/include/ifcontext.h b/utils/HelpGen/src/ifcontext.h similarity index 100% rename from utils/HelpGen/include/ifcontext.h rename to utils/HelpGen/src/ifcontext.h diff --git a/utils/HelpGen/src/makefile.nt b/utils/HelpGen/src/makefile.nt deleted file mode 100644 index d1f107585e..0000000000 --- a/utils/HelpGen/src/makefile.nt +++ /dev/null @@ -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 diff --git a/utils/HelpGen/include/markup.h b/utils/HelpGen/src/markup.h similarity index 100% rename from utils/HelpGen/include/markup.h rename to utils/HelpGen/src/markup.h diff --git a/utils/HelpGen/include/scriptbinder.h b/utils/HelpGen/src/scriptbinder.h similarity index 100% rename from utils/HelpGen/include/scriptbinder.h rename to utils/HelpGen/src/scriptbinder.h diff --git a/utils/HelpGen/src/sourcepainter.cpp b/utils/HelpGen/src/sourcepainter.cpp index 9e24ea95dd..fbabb66446 100644 --- a/utils/HelpGen/src/sourcepainter.cpp +++ b/utils/HelpGen/src/sourcepainter.cpp @@ -25,7 +25,7 @@ #include #else - #include + #include "wxstlac.h" #endif diff --git a/utils/HelpGen/include/sourcepainter.h b/utils/HelpGen/src/sourcepainter.h similarity index 100% rename from utils/HelpGen/include/sourcepainter.h rename to utils/HelpGen/src/sourcepainter.h diff --git a/utils/HelpGen/include/srcparser.h b/utils/HelpGen/src/srcparser.h similarity index 100% rename from utils/HelpGen/include/srcparser.h rename to utils/HelpGen/src/srcparser.h diff --git a/utils/HelpGen/include/wxstlac.h b/utils/HelpGen/src/wxstlac.h similarity index 100% rename from utils/HelpGen/include/wxstlac.h rename to utils/HelpGen/src/wxstlac.h diff --git a/utils/HelpGen/include/wxstllst.h b/utils/HelpGen/src/wxstllst.h similarity index 100% rename from utils/HelpGen/include/wxstllst.h rename to utils/HelpGen/src/wxstllst.h diff --git a/utils/HelpGen/include/wxstlvec.h b/utils/HelpGen/src/wxstlvec.h similarity index 100% rename from utils/HelpGen/include/wxstlvec.h rename to utils/HelpGen/src/wxstlvec.h -- 2.50.0