Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

quote '|' inside regexes (fixes dump mode); fixed crash due to strange HelpGenApp code

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21115 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2003-06-13 17:05:43 +00:00
parent 71b5725f30
commit d5eddfef2e
1 changed files with 13 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
utils/HelpGen/src/HelpGen.cpp
View File

@@ -78,23 +78,6 @@
#undef GetCurrentTime #undef GetCurrentTime
#endif #endif
// -----------------------------------------------------------------------------
// global vars
// -----------------------------------------------------------------------------
class HelpGenApp: public wxApp
{
public:
HelpGenApp() {};
// don't let wxWin parse our cmd line, we do it ourselves
virtual bool OnInit() { return TRUE; }
virtual int OnRun();
};
// IMPLEMENT_APP(HelpGenApp);
// ----------------------------------------------------------------------------- // -----------------------------------------------------------------------------
// private functions // private functions
// ----------------------------------------------------------------------------- // -----------------------------------------------------------------------------
@@ -581,8 +564,16 @@ static void usage()
exit(1); exit(1);
} }
int HelpGenApp::OnRun() int main(int argc, char **argv)
{ {
wxInitializer initializer;
if ( !initializer )
{
fprintf(stderr, "Failed to initialize the wxWindows library, aborting.");
return -1;
}
enum enum
{ {
Mode_None, Mode_None,
@@ -788,21 +779,6 @@ int HelpGenApp::OnRun()
return 0; return 0;
} }
int main(int argc, char **argv)
{
wxInitializer initializer;
if ( !initializer )
{
fprintf(stderr, "Failed to initialize the wxWindows library, aborting.");
return -1;
}
HelpGenApp app;
app.argc = argc;
app.argv = argv;
return app.OnRun();
}
// ----------------------------------------------------------------------------- // -----------------------------------------------------------------------------
// HelpGenVisitor implementation // HelpGenVisitor implementation
// ----------------------------------------------------------------------------- // -----------------------------------------------------------------------------
@@ -2153,7 +2129,7 @@ static void TeXUnfilter(wxString* str)
// undo TeXFilter // undo TeXFilter
static wxRegEx reNonSpecialSpecials("\\\\([#$%&_{}])"), static wxRegEx reNonSpecialSpecials("\\\\([#$%&_{}])"),
reAccents("\\\\verb|([~^])|"); reAccents("\\\\verb\\|([~^])\\|");
reNonSpecialSpecials.ReplaceAll(str, "\\1"); reNonSpecialSpecials.ReplaceAll(str, "\\1");
reAccents.ReplaceAll(str, "\\1"); reAccents.ReplaceAll(str, "\\1");
@@ -2203,6 +2179,9 @@ static const wxString GetVersionString()
/* /*
$Log$ $Log$
Revision 1.23 2003/06/13 17:05:43 VZ
quote '|' inside regexes (fixes dump mode); fixed crash due to strange HelpGenApp code
Revision 1.22 2002/01/21 21:18:50 JS Revision 1.22 2002/01/21 21:18:50 JS
Now adds 'include file' heading Now adds 'include file' heading