separate progress report from having Windows GUI

src/frontend/inp.c

@@ -492,7 +492,7 @@ inp_spsource(FILE *fp, bool comfile, char *filename, bool intfile)
            Go on if there is something left after the controls.*/
         if (deck->li_next) {
             fprintf(cp_out, "\nCircuit: %s\n\n", tt);
-#ifdef HAS_WINGUI
+#ifdef HAS_PROGREP
             SetAnalyse("Prepare Deck", 0);
 #endif
             /* Now expand subcircuit macros and substitute numparams.*/

src/frontend/measure.c

@@ -221,7 +221,7 @@ do_measure(
     wordlist    *measure_word_list;
     int         precision = measure_get_precision();
 
-#ifdef HAS_WINGUI
+#ifdef HAS_PROGREP
     if (!chk_only)
         SetAnalyse("meas", 0);
 #endif

src/frontend/spec.c

@@ -264,7 +264,7 @@ com_spec(wordlist *wl)
                 fdvec[i][j].cx_imag += value*sina;
             }
         }
-#ifdef HAS_WINGUI
+#ifdef HAS_PROGREP
         SetAnalyse("spec", (int)(j * 1000./ fpts));
 #endif
     }

src/spicelib/analysis/acan.c

@@ -341,7 +341,7 @@ ACan(CKTcircuit *ckt, int restart)
         case OCTAVE:
 
 /* inserted again 14.12.2001  */
-#ifdef HAS_WINGUI
+#ifdef HAS_PROGREP
             {
                 double endfreq   = job->ACstopFreq;
                 double startfreq = job->ACstartFreq;
@@ -360,7 +360,7 @@ ACan(CKTcircuit *ckt, int restart)
         break;
         case LINEAR:
 
-#ifdef HAS_WINGUI
+#ifdef HAS_PROGREP
 			 {
 				 double endfreq   = job->ACstopFreq;
 				 double startfreq = job->ACstartFreq;

src/spicelib/analysis/cktop.c

@@ -22,7 +22,7 @@ CKTop (CKTcircuit * ckt, long int firstmode, long int continuemode,
        int iterlim)
 {
   int converged;
-#ifdef HAS_WINGUI
+#ifdef HAS_PROGREP
         SetAnalyse("op", 0);
 #endif
 ckt->CKTmode = firstmode;

src/spicelib/analysis/cktsetup.c

@@ -68,7 +68,7 @@ CKTsetup(CKTcircuit *ckt)
 #endif
 
     for (i=0;i<DEVmaxnum;i++) {
-#ifdef HAS_WINGUI
+#ifdef HAS_PROGREP
         SetAnalyse( "Device Setup", 0 );
 #endif
         if ( DEVices[i] && DEVices[i]->DEVsetup && ckt->CKThead[i] ) {

src/spicelib/analysis/dcpss.c

@@ -1147,7 +1147,7 @@ resume:
         }
     }
 #endif
-#ifdef HAS_WINGUI
+#ifdef HAS_PROGREP
     if (ckt->CKTtime == 0.)
         SetAnalyse( "tran init", 0);
     else if ((pss_state != PSS) && (shooting_cycle_counter > 0))

src/spicelib/analysis/dctran.c

@@ -504,7 +504,7 @@ resume:
         }
     }
 #endif
-#ifdef HAS_WINGUI
+#ifdef HAS_PROGREP
     if (ckt->CKTtime == 0.)
         SetAnalyse( "tran init", 0);
     else

src/spicelib/analysis/dctrcurv.c

@@ -24,7 +24,7 @@ Modified: 1999 Paolo Nenzi
 
 #include "ngspice/devdefs.h"
 
-#ifdef HAS_WINGUI
+#ifdef HAS_PROGREP
 static double actval, actdiff; 
 #endif
 
@@ -166,7 +166,7 @@ DCtrCurv(CKTcircuit *ckt, int restart)
 found:;
     }
 
-#ifdef HAS_WINGUI
+#ifdef HAS_PROGREP
     actval = job->TRCVvStart[job->TRCVnestLevel];
     actdiff = job->TRCVvStart[job->TRCVnestLevel] - job->TRCVvStop[job->TRCVnestLevel];
 #endif
@@ -518,7 +518,7 @@ nextstep:;
             job->TRCVnestState = i;
             return(E_PAUSE);
         }
-#ifdef HAS_WINGUI
+#ifdef HAS_PROGREP
         if (i == job->TRCVnestLevel) {
             actval += job->TRCVvStep[job->TRCVnestLevel];
             SetAnalyse( "dc", abs((int)(actval * 1000. / actdiff)));

src/spicelib/parser/inppas2.c

@@ -32,7 +32,7 @@ void INPpas2(CKTcircuit *ckt, card * data, INPtables * tab, TSKtask *task)
     char *gname;
     CKTnode *gnode;
     int error;			/* used by the macros defined above */
-#ifdef HAS_WINGUI
+#ifdef HAS_PROGREP
     int linecount = 0, actcount = 0;
 #endif
 
@@ -68,7 +68,7 @@ void INPpas2(CKTcircuit *ckt, card * data, INPtables * tab, TSKtask *task)
 #endif
 
 
-#ifdef HAS_WINGUI
+#ifdef HAS_PROGREP
     for (current = data; current != NULL; current = current->nextcard)
         linecount++;
 #endif
@@ -80,7 +80,7 @@ void INPpas2(CKTcircuit *ckt, card * data, INPtables * tab, TSKtask *task)
 	printf("In INPpas2, examining card %s . . .\n", current->line);
 #endif
 
-#ifdef HAS_WINGUI
+#ifdef HAS_PROGREP
    if (linecount > 0) {     
         SetAnalyse( "Circuit2", (int) (1000.*actcount/linecount));
         actcount++;