speed optimizations: some functions now use wxString::Alloc, wxTextFile::Read

[wxWidgets.git] / src / common / postscrp.cpp

diff --git a/src/common/postscrp.cpp b/src/common/postscrp.cpp
index 376acc9dd9a8548db6fe7990949728aa4cfdeb73..3ab71e83d845437456ace1e92caa0bb4366be076 100644 (file)
--- a/src/common/postscrp.cpp
+++ b/src/common/postscrp.cpp
@@ -44,7 +44,7 @@
 
 #include "wx/dcmemory.h"
 
 
 #include "wx/dcmemory.h"
 

-#ifdef __WINDOWS__
+#ifdef __WXMSW__

 #include "wx/msw/private.h"
 #endif
 
 #include "wx/msw/private.h"
 #endif
 


@@ -62,7 +62,7 @@
 #include <limits.h>
 #include <assert.h>
 
 #include <limits.h>
 #include <assert.h>
 

-#ifdef __GTK__
+#ifdef __WXGTK__

 
 #include "gdk/gdkx.h"        // GDK_DISPLAY
 #include "gdk/gdkprivate.h"  // XImage
 
 #include "gdk/gdkx.h"        // GDK_DISPLAY
 #include "gdk/gdkprivate.h"  // XImage


@@ -71,7 +71,7 @@
 
 #endif
 
 
 #endif
 

-#ifdef __WINDOWS__
+#ifdef __WXMSW__

 
 #ifdef DrawText
 #undef DrawText
 
 #ifdef DrawText
 #undef DrawText


@@ -105,7 +105,7 @@
 // SGI's Display Postscript Previewer
 //# define PS_VIEWER_PROG "dps"
 # define PS_VIEWER_PROG "xpsview"
 // SGI's Display Postscript Previewer
 //# define PS_VIEWER_PROG "dps"
 # define PS_VIEWER_PROG "xpsview"

-#elif defined(__X__) || defined(__GTK__)
+#elif defined(__X__) || defined(__WXGTK__)

 // Front-end to ghostscript
 # define PS_VIEWER_PROG "ghostview"
 #else
 // Front-end to ghostscript
 # define PS_VIEWER_PROG "ghostview"
 #else


@@ -175,7 +175,7 @@ wxPostScriptDC::wxPostScriptDC (void)
 
   m_pstream = NULL;
 
 
   m_pstream = NULL;
 

-#ifdef __WINDOWS__
+#ifdef __WXMSW__

   // Can only send to file in Windows
   wxThePrintSetupData->SetPrinterMode(PS_FILE);
 #endif
   // Can only send to file in Windows
   wxThePrintSetupData->SetPrinterMode(PS_FILE);
 #endif


@@ -205,7 +205,7 @@ bool wxPostScriptDC::Create(const wxString& file, bool interactive, wxWindow *pa
   m_filename = file;
   m_pstream = NULL;
 
   m_filename = file;
   m_pstream = NULL;
 

-#ifdef __WINDOWS__
+#ifdef __WXMSW__

   // Can only send to file in Windows
   wxThePrintSetupData->SetPrinterMode(PS_FILE);
 #endif
   // Can only send to file in Windows
   wxThePrintSetupData->SetPrinterMode(PS_FILE);
 #endif


@@ -669,7 +669,7 @@ void wxPostScriptDC::DrawEllipse (long x, long y, long width, long height)
 
 void wxPostScriptDC::DrawIcon (const wxIcon& icon, long x, long y)
 {
 
 void wxPostScriptDC::DrawIcon (const wxIcon& icon, long x, long y)
 {

-#if defined(__X__) || defined(__GTK__)
+#if defined(__X__) || defined(__WXGTK__)

   wxMemoryDC memDC;
   memDC.SelectObject(icon);
   Blit(x, y, icon.GetWidth(), icon.GetHeight(), &memDC, 0, 0);
   wxMemoryDC memDC;
   memDC.SelectObject(icon);
   Blit(x, y, icon.GetWidth(), icon.GetHeight(), &memDC, 0, 0);


@@ -1272,7 +1272,7 @@ void wxPostScriptDC::EndDoc (void)
   wxRemoveFile (wxThePrintSetupData->GetPrinterFile());
   wxRenameFile(tmp_file, wxThePrintSetupData->GetPrinterFile());
 
   wxRemoveFile (wxThePrintSetupData->GetPrinterFile());
   wxRenameFile(tmp_file, wxThePrintSetupData->GetPrinterFile());
 

-#if defined(__X__) || defined(__GTK__)
+#if defined(__X__) || defined(__WXGTK__)

   if (m_ok)
     {
       switch (wxThePrintSetupData->GetPrinterMode()) {
   if (m_ok)
     {
       switch (wxThePrintSetupData->GetPrinterMode()) {


@@ -1406,7 +1406,7 @@ Blit (long xdest, long ydest, long fwidth, long fheight,
 {
   long width, height, x, y;
 
 {
   long width, height, x, y;
 

-#if !defined(__X__) && !defined(__GTK__)
+#if !defined(__X__) && !defined(__WXGTK__)

   return FALSE;
 #endif
 
   return FALSE;
 #endif
 


@@ -1428,7 +1428,7 @@ Blit (long xdest, long ydest, long fwidth, long fheight,
   *m_pstream << "  currentfile DataString readhexstring pop\n";
   *m_pstream << "} bind image\n";
 
   *m_pstream << "  currentfile DataString readhexstring pop\n";
   *m_pstream << "} bind image\n";
 

-#if defined(__X__) || defined(__GTK__)
+#if defined(__X__) || defined(__WXGTK__)

 
   /* Output data as hex digits: */
   Display *d;
 
   /* Output data as hex digits: */
   Display *d;


@@ -1437,7 +1437,7 @@ Blit (long xdest, long ydest, long fwidth, long fheight,
   long j, i;
   char s[3];
   
   long j, i;
   char s[3];
   

-#ifdef __GTK__
+#ifdef __WXGTK__

 
   d = gdk_display;
   cm = ((GdkColormapPrivate*)gdk_colormap_get_system())->xcolormap;
 
   d = gdk_display;
   cm = ((GdkColormapPrivate*)gdk_colormap_get_system())->xcolormap;


@@ -1446,7 +1446,7 @@ Blit (long xdest, long ydest, long fwidth, long fheight,
 
 #else  
 
 
 #else  
 

-#ifdef __MOTIF__
+#ifdef __WXMOTIF__

   d = source->display;
 #else
   d = wxGetDisplay();
   d = source->display;
 #else
   d = wxGetDisplay();


@@ -1703,7 +1703,7 @@ void wxPostScriptDC::GetTextExtent (const wxString& string, long *x, long *y,
         }
             // JC 1.) check for UnderlinePosition
         else if(strncmp(line,"UnderlinePosition",17)==0){
         }
             // JC 1.) check for UnderlinePosition
         else if(strncmp(line,"UnderlinePosition",17)==0){

-          if((sscanf(line,"%s%f",upString,&UnderlinePosition)!=2)
+          if((sscanf(line,"%s%lf",upString,&UnderlinePosition)!=2)

             || (strcmp(upString,"UnderlinePosition")!=0)) {
            wxDebugMsg("AFM-file '%s': line '%s' has error (bad UnderlinePosition)\n",
                       afmName,line);
             || (strcmp(upString,"UnderlinePosition")!=0)) {
            wxDebugMsg("AFM-file '%s': line '%s' has error (bad UnderlinePosition)\n",
                       afmName,line);


@@ -1711,7 +1711,7 @@ void wxPostScriptDC::GetTextExtent (const wxString& string, long *x, long *y,
         }
        // JC 2.) check for UnderlineThickness
         else if(strncmp(line,"UnderlineThickness",18)==0){
         }
        // JC 2.) check for UnderlineThickness
         else if(strncmp(line,"UnderlineThickness",18)==0){

-          if((sscanf(line,"%s%f",utString,&UnderlineThickness)!=2)
+           if((sscanf(line,"%s%lf",utString,&UnderlineThickness)!=2)

             || (strcmp(utString,"UnderlineThickness")!=0)) {
            wxDebugMsg("AFM-file '%s': line '%s' has error (bad UnderlineThickness)\n",
                       afmName,line);
             || (strcmp(utString,"UnderlineThickness")!=0)) {
            wxDebugMsg("AFM-file '%s': line '%s' has error (bad UnderlineThickness)\n",
                       afmName,line);


@@ -2037,7 +2037,7 @@ void wxPostScriptDC::CalcBoundingBox(long x, long y)
 IMPLEMENT_CLASS(wxPostScriptPrintDialog, wxDialog)
 
 wxPostScriptPrintDialog::wxPostScriptPrintDialog (wxWindow *parent, const wxString& title,
 IMPLEMENT_CLASS(wxPostScriptPrintDialog, wxDialog)
 
 wxPostScriptPrintDialog::wxPostScriptPrintDialog (wxWindow *parent, const wxString& title,

-                   const wxPoint& pos, const wxSize& size, const long style):
+                   const wxPoint& pos, const wxSize& size, long style):

 wxDialog(parent, -1, title, pos, size, style)
 {
   wxBeginBusyCursor();
 wxDialog(parent, -1, title, pos, size, style)
 {
   wxBeginBusyCursor();


@@ -2065,7 +2065,7 @@ wxDialog(parent, -1, title, pos, size, style)
 
   wxRadioBox *radio0 = new wxRadioBox(this, wxID_PRINTER_ORIENTATION, "Orientation: ", wxPoint(5, yPos), wxSize(-1,-1),
                2,orientation,2,0);
 
   wxRadioBox *radio0 = new wxRadioBox(this, wxID_PRINTER_ORIENTATION, "Orientation: ", wxPoint(5, yPos), wxSize(-1,-1),
                2,orientation,2,0);

-  radio0->SetSelection((int)wxThePrintSetupData->GetPrinterOrientation());
+  radio0->SetSelection((int)wxThePrintSetupData->GetPrinterOrientation() - 1);

 
   // @@@ Configuration hook
   if (wxThePrintSetupData->GetPrintPreviewCommand() == NULL)
 
   // @@@ Configuration hook
   if (wxThePrintSetupData->GetPrintPreviewCommand() == NULL)


@@ -2082,7 +2082,7 @@ wxDialog(parent, -1, title, pos, size, style)
   wxRadioBox *radio1 = new wxRadioBox(this, wxID_PRINTER_MODES, "PostScript:",
     wxPoint(150, yPos), wxSize(-1,-1), features, print_modes, features, 0);
 
   wxRadioBox *radio1 = new wxRadioBox(this, wxID_PRINTER_MODES, "PostScript:",
     wxPoint(150, yPos), wxSize(-1,-1), features, print_modes, features, 0);
 

-#ifdef __WINDOWS__
+#ifdef __WXMSW__

   radio1->Enable(0, FALSE);
   if (wxThePrintSetupData->GetPrintPreviewCommand() && *wxThePrintSetupData->GetPrintPreviewCommand())
     radio1->Enable(2, FALSE);
   radio1->Enable(0, FALSE);
   if (wxThePrintSetupData->GetPrintPreviewCommand() && *wxThePrintSetupData->GetPrintPreviewCommand())
     radio1->Enable(2, FALSE);


@@ -2109,11 +2109,11 @@ wxDialog(parent, -1, title, pos, size, style)
   yPos += 25;
 
   (void) new wxStaticText(this, -1, "X Translation", wxPoint(5, yPos));
   yPos += 25;
 
   (void) new wxStaticText(this, -1, "X Translation", wxPoint(5, yPos));

-  sprintf (buf, "%.2f", wx_printer_translate_x);
+  sprintf (buf, "%.2ld", wx_printer_translate_x);

   /* wxTextCtrl *text3 = */ (void) new wxTextCtrl(this, wxID_PRINTER_X_TRANS, buf, wxPoint(100, -1), wxSize(100, -1));
 
   (void) new wxStaticText(this, -1, "Y Translation", wxPoint(120, yPos));
   /* wxTextCtrl *text3 = */ (void) new wxTextCtrl(this, wxID_PRINTER_X_TRANS, buf, wxPoint(100, -1), wxSize(100, -1));
 
   (void) new wxStaticText(this, -1, "Y Translation", wxPoint(120, yPos));

-  sprintf (buf, "%.2f", wx_printer_translate_y);
+  sprintf (buf, "%.2ld", wx_printer_translate_y);

   /* wxTextCtrl *text4 = */ (void) new wxTextCtrl(this, wxID_PRINTER_Y_TRANS, buf, wxPoint(230, -1), wxSize(100, -1));
 
   Fit ();
   /* wxTextCtrl *text4 = */ (void) new wxTextCtrl(this, wxID_PRINTER_Y_TRANS, buf, wxPoint(230, -1), wxSize(100, -1));
 
   Fit ();


@@ -2144,7 +2144,7 @@ int wxPostScriptPrintDialog::ShowModal (void)
       wxThePrintSetupData->SetPrinterCommand(WXSTRINGCAST text_prt->GetValue ());
 #endif
 
       wxThePrintSetupData->SetPrinterCommand(WXSTRINGCAST text_prt->GetValue ());
 #endif
 

-      wxThePrintSetupData->SetPrinterOrientation((radio0->GetSelection() == PS_LANDSCAPE ? PS_LANDSCAPE : PS_PORTRAIT));
+      wxThePrintSetupData->SetPrinterOrientation((radio0->GetSelection() == 1 ? PS_LANDSCAPE : PS_PORTRAIT));

 
       // C++ wants this
       switch ( radio1->GetSelection() ) {
 
       // C++ wants this
       switch ( radio1->GetSelection() ) {


@@ -2491,12 +2491,12 @@ void wxInitializePrintSetupData(bool init)
     wxThePrintSetupData->SetPrinterOptions("/nonotify/queue=psqueue");
     wxThePrintSetupData->SetAFMPath("sys$ps_font_metrics:");
 #endif
     wxThePrintSetupData->SetPrinterOptions("/nonotify/queue=psqueue");
     wxThePrintSetupData->SetAFMPath("sys$ps_font_metrics:");
 #endif

-#ifdef __WINDOWS__
+#ifdef __WXMSW__

     wxThePrintSetupData->SetPrinterCommand("print");
     wxThePrintSetupData->SetAFMPath("c:\\windows\\system\\");
     wxThePrintSetupData->SetPrinterOptions(NULL);
 #endif
     wxThePrintSetupData->SetPrinterCommand("print");
     wxThePrintSetupData->SetAFMPath("c:\\windows\\system\\");
     wxThePrintSetupData->SetPrinterOptions(NULL);
 #endif

-#if !defined(__VMS__) && !defined(__WINDOWS__)
+#if !defined(__VMS__) && !defined(__WXMSW__)

     wxThePrintSetupData->SetPrinterCommand("lpr");
     wxThePrintSetupData->SetPrinterOptions(NULL);
     wxThePrintSetupData->SetAFMPath(NULL);
     wxThePrintSetupData->SetPrinterCommand("lpr");
     wxThePrintSetupData->SetPrinterOptions(NULL);
     wxThePrintSetupData->SetAFMPath(NULL);