merged 2.2 branch

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@7748 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Bryan Petty
2000-07-15 19:51:35 +00:00
parent 8a693e6e04
commit f6bcfd974e
1835 changed files with 237729 additions and 67990 deletions

View File

@@ -105,7 +105,11 @@ void ShowOptions(void);
#ifdef NO_GUI
extern char *wxBuffer; // we must init it, otherwise tex2rtf will crash
#if wxUSE_GUI || !defined(__UNIX__)
// wxBase for Unix does not have wxBuffer
extern
#endif
char *wxBuffer; // we must init it, otherwise tex2rtf will crash
int main(int argc, char **argv)
#else
@@ -170,7 +174,8 @@ bool MyApp::OnInit()
if (!InputFile || !OutputFile)
isInteractive = TRUE;
for (int i = n; i < argc;)
int i;
for (i = n; i < argc;)
{
if (strcmp(argv[i], "-winhelp") == 0)
{
@@ -497,6 +502,7 @@ void MyFrame::OnExit(wxCommandEvent& event)
void MyFrame::OnGo(wxCommandEvent& event)
{
passNumber = 1;
menuBar->EnableTop(0, FALSE);
menuBar->EnableTop(1, FALSE);
menuBar->EnableTop(2, FALSE);
@@ -826,7 +832,7 @@ bool Go(void)
char buf[100];
#ifndef NO_GUI
long tim = wxGetElapsedTime();
sprintf(buf, "Finished in %ld seconds.", (long)(tim/1000.0));
sprintf(buf, "Finished PASS #%d in %ld seconds.\n", passNumber, (long)(tim/1000.0));
OnInform(buf);
if (isInteractive)
{