Diff for /Amaya/amaya/HTMLbook.c between versions 1.102 and 1.103

version 1.102, 2003/12/11 16:25:13 version 1.103, 2003/12/16 12:10:05
Line 63  static int              PagePerSheet; Line 63  static int              PagePerSheet;
 #include "HTMLhistory_f.h"  #include "HTMLhistory_f.h"
 #include "UIcss_f.h"  #include "UIcss_f.h"
   
 #ifdef _WINDOWS   #ifdef _WINGUI 
 #include "wininclude.h"  #include "wininclude.h"
 #endif /* _WINDOWS */  #endif /* _WINGUI */
   
 static ThotBool GetIncludedDocuments (Element el, Element link,  static ThotBool GetIncludedDocuments (Element el, Element link,
                                       Document doc, IncludeCtxt *prev);                                        Document doc, IncludeCtxt *prev);
Line 533  static void PrintDocument (Document doc, Line 533  static void PrintDocument (Document doc,
    ----------------------------------------------------------------------*/       ----------------------------------------------------------------------*/  
 void PrintAs (Document doc, View view)  void PrintAs (Document doc, View view)
 {  {
 #ifdef _WINDOWS  #ifdef _WINGUI
   DocPrint = doc;    DocPrint = doc;
   ReusePrinterDC ();    ReusePrinterDC ();
 #else /* _WINDOWS */  #else /* _WINGUI */
   PrintDocument (doc, view);    PrintDocument (doc, view);
 #endif /* _WINDOWS */  #endif /* _WINGUI */
 }  }
   
 /*----------------------------------------------------------------------  /*----------------------------------------------------------------------
Line 636  void CallbackPrint (int ref, int typedat Line 636  void CallbackPrint (int ref, int typedat
           if (PaperPrint == PP_PS)            if (PaperPrint == PP_PS)
             {              {
               PaperPrint = PP_PRINTER;                PaperPrint = PP_PRINTER;
 #ifndef _WINDOWS  #ifndef _WINGUI
               TtaSetTextForm (BasePrint + PPrinterName, PPrinter);                TtaSetTextForm (BasePrint + PPrinterName, PPrinter);
 #endif /* !_WINDOWS */  #endif /* !_WINGUI */
               TtaSetPrintParameter (PP_Destination, PaperPrint);                TtaSetPrintParameter (PP_Destination, PaperPrint);
             }              }
           break;            break;
Line 646  void CallbackPrint (int ref, int typedat Line 646  void CallbackPrint (int ref, int typedat
           if (PaperPrint == PP_PRINTER)            if (PaperPrint == PP_PRINTER)
             {              {
               PaperPrint = PP_PS;                PaperPrint = PP_PS;
 #ifndef _WINDOWS  #ifndef _WINGUI
               TtaSetTextForm (BasePrint + PPrinterName, PSfile);                TtaSetTextForm (BasePrint + PPrinterName, PSfile);
 #endif /* !_WINDOWS */  #endif /* !_WINGUI */
               TtaSetPrintParameter (PP_Destination, PaperPrint);                TtaSetPrintParameter (PP_Destination, PaperPrint);
             }              }
           break;            break;
Line 707  void InitPrint (void) Line 707  void InitPrint (void)
   ----------------------------------------------------------------------*/    ----------------------------------------------------------------------*/
 void SetupAndPrint (Document doc, View view)  void SetupAndPrint (Document doc, View view)
 {  {
 #ifndef _WINDOWS  #ifndef _WINGUI
   char           bufMenu[MAX_LENGTH];    char           bufMenu[MAX_LENGTH];
   int            i;    int            i;
 #endif /* _WINDOWS */  #endif /* _WINGUI */
   ThotBool       textFile;    ThotBool       textFile;
   
   textFile = (DocumentTypes[doc] == docText || DocumentTypes[doc] == docCSS);    textFile = (DocumentTypes[doc] == docText || DocumentTypes[doc] == docCSS);
   /* Print form */    /* Print form */
   CheckPrintingDocument (doc);    CheckPrintingDocument (doc);
   
 #ifndef _WINDOWS  #ifndef _WINGUI
   TtaNewSheet (BasePrint + FormPrint, TtaGetViewFrame (doc, view),     TtaNewSheet (BasePrint + FormPrint, TtaGetViewFrame (doc, view), 
                TtaGetMessage (LIB, TMSG_LIB_PRINT), 1,                 TtaGetMessage (LIB, TMSG_LIB_PRINT), 1,
                TtaGetMessage (AMAYA, AM_BUTTON_PRINT), FALSE, 3, 'L', D_CANCEL);                 TtaGetMessage (AMAYA, AM_BUTTON_PRINT), FALSE, 3, 'L', D_CANCEL);
Line 812  void SetupAndPrint (Document doc, View v Line 812  void SetupAndPrint (Document doc, View v
       TtaRedrawMenuEntry (BasePrint + PrintOptions, 1, NULL, (ThotColor)-1, FALSE);        TtaRedrawMenuEntry (BasePrint + PrintOptions, 1, NULL, (ThotColor)-1, FALSE);
       TtaRedrawMenuEntry (BasePrint + PrintOptions, 2, NULL, (ThotColor)-1, FALSE);        TtaRedrawMenuEntry (BasePrint + PrintOptions, 2, NULL, (ThotColor)-1, FALSE);
     }      }
 #else  /* _WINDOWS */  #else  /* _WINGUI */
   CreatePrintDlgWindow (TtaGetViewFrame (doc, view), PSfile);    CreatePrintDlgWindow (TtaGetViewFrame (doc, view), PSfile);
 #endif /* _WINDOWS */  #endif /* _WINGUI */
 }  }
   
 /*----------------------------------------------------------------------  /*----------------------------------------------------------------------

Removed from v.1.102  
changed lines
  Added in v.1.103


Webmaster