VTK wrapper of vtkRenderWindow for wxPython. Tested on MSW so far.

[wxWidgets.git] / src / generic / dcpsg.cpp

diff --git a/src/generic/dcpsg.cpp b/src/generic/dcpsg.cpp
index bc5b46d2d2b96450b4ed26d5405ac145cae3fd1e..bf484f5b9e84406d9bd1cd91dc04010594cbb56d 100644 (file)
--- a/src/generic/dcpsg.cpp
+++ b/src/generic/dcpsg.cpp
@@ -46,6 +46,7 @@
 #include "wx/textctrl.h"
 #include "wx/prntbase.h"
 #include "wx/paper.h"
 #include "wx/textctrl.h"
 #include "wx/prntbase.h"
 #include "wx/paper.h"

+#include "wx/filefn.h"

 
 #include <math.h>
 
 
 #include <math.h>
 


@@ -419,7 +420,7 @@ void wxPostScriptDC::DestroyClippingRegion()
         m_clipping = FALSE;
         fprintf( m_pstream, "grestore\n" );
     }
         m_clipping = FALSE;
         fprintf( m_pstream, "grestore\n" );
     }

-    
+

     wxDC::DestroyClippingRegion();
 }
 
     wxDC::DestroyClippingRegion();
 }
 


@@ -1003,11 +1004,11 @@ void wxPostScriptDC::SetFont( const wxFont& font )
     fprintf( m_pstream, " reencodeISO def\n" );
     fprintf( m_pstream, buffer );
     fprintf( m_pstream, " findfont\n" );
     fprintf( m_pstream, " reencodeISO def\n" );
     fprintf( m_pstream, buffer );
     fprintf( m_pstream, " findfont\n" );

-    #ifdef __WXMSW__
-    fprintf( m_pstream, "%d scalefont setfont\n", YLOG2DEVREL(m_font.GetPointSize()) );
-    #else
-    fprintf( m_pstream, "%d scalefont setfont\n", YLOG2DEVREL(m_font.GetPointSize()) );
-    #endif
+
+    fprintf( m_pstream, "%f scalefont setfont\n", YLOG2DEVREL(m_font.GetPointSize() * 1000) / 1000.0F);
+                // this is a hack - we must scale font size (in pts) according to m_scaleY but
+                // YLOG2DEVREL works with wxCoord type (int or longint). Se we first convert font size
+                // to 1/1000th of pt and then back. 

 }
 
 void wxPostScriptDC::SetPen( const wxPen& pen )
 }
 
 void wxPostScriptDC::SetPen( const wxPen& pen )


@@ -1329,8 +1330,8 @@ void wxPostScriptDC::SetAxisOrientation( bool xLeftRight, bool yBottomUp )
     m_signX = (xLeftRight ? 1 : -1);
     m_signY = (yBottomUp  ? 1 : -1);
 
     m_signX = (xLeftRight ? 1 : -1);
     m_signY = (yBottomUp  ? 1 : -1);
 

-    // FIXME there is no such function in MSW
-#ifndef __WXMSW__
+    // FIXME there is no such function in MSW nor in OS2/PM
+#if !defined(__WXMSW__) && !defined(__WXPM__)

     ComputeScaleAndOrigin();
 #endif
 }
     ComputeScaleAndOrigin();
 #endif
 }


@@ -1808,12 +1809,10 @@ void wxPostScriptDC::DoGetTextExtent(const wxString& string,
         }
 
         /* get the directory of the AFM files */
         }
 
         /* get the directory of the AFM files */

-        char afmName[256];
-        afmName[0] = 0;
-
+        wxString afmName = wxEmptyString;

         if (!m_printData.GetFontMetricPath().IsEmpty())
         {
         if (!m_printData.GetFontMetricPath().IsEmpty())
         {

-            strcpy( afmName, m_printData.GetFontMetricPath().fn_str() );
+            afmName = m_printData.GetFontMetricPath();

         }
 
         /* 2. open and process the file
         }
 
         /* 2. open and process the file


@@ -1832,32 +1831,37 @@ void wxPostScriptDC::DoGetTextExtent(const wxString& string,
 
         /* new elements JC Sun Aug 25 23:21:44 MET DST 1996 */
 
 
         /* new elements JC Sun Aug 25 23:21:44 MET DST 1996 */
 

-        strcat(afmName,name);
-        strcat(afmName,".afm");
-        FILE *afmFile = fopen(afmName,"r");
-
-#ifdef __UNIX__
+        afmName << name << wxT(".afm");
+        FILE *afmFile = wxFopen(afmName,wxT("r"));

         if (afmFile==NULL)
         {
         if (afmFile==NULL)
         {

-            strcpy( afmName, "/usr/local/share/wx/afm/" );
-             strcat(afmName,name);
-             strcat(afmName,".afm");
-             afmFile = fopen(afmName,"r");
+           afmName = wxThePrintSetupData->GetAFMPath();
+           afmName << wxFILE_SEP_PATH << name << wxT(".afm");
+           afmFile = wxFopen(afmName,wxT("r"));

         }
 
         }
 

-        if (afmFile==NULL)
+#ifdef __UNIX__
+#ifndef __VMS__
+       if (afmFile==NULL)
+        /* please do NOT change the line above to "else if (afmFile==NULL)" -
+           - afmFile = fopen() may fail and in that case the next if branch
+           MUST be executed - and it would not if there was "else" */

         {
         {

-            strcpy( afmName, "/usr/share/wx/afm/" );
-            strcat(afmName,name);
-            strcat(afmName,".afm");
-            afmFile = fopen(afmName,"r");
+           afmName = wxINSTALL_PREFIX;
+           afmName <<  wxFILE_SEP_PATH
+                   << wxT("share") << wxFILE_SEP_PATH
+                   << wxT("wx") << wxFILE_SEP_PATH
+                   << wxT("afm") << wxFILE_SEP_PATH
+                   << name << wxT(".afm");
+           afmFile = wxFopen(afmName,wxT("r"));

         }
 #endif
         }
 #endif

-
+#endif
+        

         if (afmFile==NULL)
         {
         if (afmFile==NULL)
         {

-            wxLogDebug( "GetTextExtent: can't open AFM file '%s'\n", afmName );
-            wxLogDebug( "               using approximate values\n");
+            wxLogDebug( wxT("GetTextExtent: can't open AFM file '%hs'\n"), afmName.c_str() );
+            wxLogDebug( wxT("               using approximate values\n"));

             for (int i=0; i<256; i++) lastWidths[i] = 500; /* an approximate value */
             lastDescender = -150; /* dito. */
         }
             for (int i=0; i<256; i++) lastWidths[i] = 500; /* an approximate value */
             lastDescender = -150; /* dito. */
         }


@@ -1879,7 +1883,7 @@ void wxPostScriptDC::DoGetTextExtent(const wxString& string,
                     if ((sscanf(line,"%s%d",descString,&lastDescender)!=2) ||
                             (strcmp(descString,"Descender")!=0))
                     {
                     if ((sscanf(line,"%s%d",descString,&lastDescender)!=2) ||
                             (strcmp(descString,"Descender")!=0))
                     {

-                        wxLogDebug( "AFM-file '%s': line '%s' has error (bad descender)\n", afmName,line );
+                        wxLogDebug( wxT("AFM-file '%hs': line '%hs' has error (bad descender)\n"), afmName.c_str(),line );

                     }
                 }
                 /* JC 1.) check for UnderlinePosition */
                     }
                 }
                 /* JC 1.) check for UnderlinePosition */


@@ -1888,7 +1892,7 @@ void wxPostScriptDC::DoGetTextExtent(const wxString& string,
                     if ((sscanf(line,"%s%lf",upString,&UnderlinePosition)!=2) ||
                             (strcmp(upString,"UnderlinePosition")!=0))
                     {
                     if ((sscanf(line,"%s%lf",upString,&UnderlinePosition)!=2) ||
                             (strcmp(upString,"UnderlinePosition")!=0))
                     {

-                        wxLogDebug( "AFM-file '%s': line '%s' has error (bad UnderlinePosition)\n", afmName, line );
+                        wxLogDebug( wxT("AFM-file '%hs': line '%hs' has error (bad UnderlinePosition)\n"), afmName.c_str(), line );

                     }
                 }
                 /* JC 2.) check for UnderlineThickness */
                     }
                 }
                 /* JC 2.) check for UnderlineThickness */


@@ -1897,7 +1901,7 @@ void wxPostScriptDC::DoGetTextExtent(const wxString& string,
                     if ((sscanf(line,"%s%lf",utString,&UnderlineThickness)!=2) ||
                             (strcmp(utString,"UnderlineThickness")!=0))
                     {
                     if ((sscanf(line,"%s%lf",utString,&UnderlineThickness)!=2) ||
                             (strcmp(utString,"UnderlineThickness")!=0))
                     {

-                        wxLogDebug( "AFM-file '%s': line '%s' has error (bad UnderlineThickness)\n", afmName, line );
+                        wxLogDebug( wxT("AFM-file '%hs': line '%hs' has error (bad UnderlineThickness)\n"), afmName.c_str(), line );

                     }
                 }
                 /* JC 3.) check for EncodingScheme */
                     }
                 }
                 /* JC 3.) check for EncodingScheme */


@@ -1906,12 +1910,12 @@ void wxPostScriptDC::DoGetTextExtent(const wxString& string,
                     if ((sscanf(line,"%s%s",utString,encString)!=2) ||
                             (strcmp(utString,"EncodingScheme")!=0))
                     {
                     if ((sscanf(line,"%s%s",utString,encString)!=2) ||
                             (strcmp(utString,"EncodingScheme")!=0))
                     {

-                        wxLogDebug("AFM-file '%s': line '%s' has error (bad EncodingScheme)\n", afmName, line );
+                        wxLogDebug( wxT("AFM-file '%hs': line '%hs' has error (bad EncodingScheme)\n"), afmName.c_str(), line );

                     }
                     else if (strncmp(encString, "AdobeStandardEncoding", 21))
                     {
                     }
                     else if (strncmp(encString, "AdobeStandardEncoding", 21))
                     {

-                        wxLogDebug( "AFM-file '%s': line '%s' has error (unsupported EncodingScheme %s)\n",
-                                afmName,line, encString);
+                        wxLogDebug( wxT("AFM-file '%hs': line '%hs' has error (unsupported EncodingScheme %hs)\n"),
+                                afmName.c_str(),line, encString);

                     }
                 }
                 /* B.) check for char-width */
                     }
                 }
                 /* B.) check for char-width */


@@ -1919,11 +1923,11 @@ void wxPostScriptDC::DoGetTextExtent(const wxString& string,
                 {
                     if (sscanf(line,"%s%d%s%s%d",cString,&ascii,semiString,WXString,&cWidth)!=5)
                     {
                 {
                     if (sscanf(line,"%s%d%s%s%d",cString,&ascii,semiString,WXString,&cWidth)!=5)
                     {

-                        wxLogDebug("AFM-file '%s': line '%s' has an error (bad character width)\n",afmName,line);
+                        wxLogDebug(wxT("AFM-file '%hs': line '%hs' has an error (bad character width)\n"),afmName.c_str(),line);

                     }
                     if(strcmp(cString,"C")!=0 || strcmp(semiString,";")!=0 || strcmp(WXString,"WX")!=0)
                     {
                     }
                     if(strcmp(cString,"C")!=0 || strcmp(semiString,";")!=0 || strcmp(WXString,"WX")!=0)
                     {

-                        wxLogDebug("AFM-file '%s': line '%s' has a format error\n",afmName,line);
+                        wxLogDebug(wxT("AFM-file '%hs': line '%hs' has a format error\n"),afmName.c_str(),line);

                     }
                     /* printf("            char '%c'=%d has width '%d'\n",ascii,ascii,cWidth); */
                     if (ascii>=0 && ascii<256)
                     }
                     /* printf("            char '%c'=%d has width '%d'\n",ascii,ascii,cWidth); */
                     if (ascii>=0 && ascii<256)


@@ -1933,7 +1937,7 @@ void wxPostScriptDC::DoGetTextExtent(const wxString& string,
                     else
                     {
                         /* MATTHEW: this happens a lot; don't print an error */
                     else
                     {
                         /* MATTHEW: this happens a lot; don't print an error */

-                        /* wxLogDebug("AFM-file '%s': ASCII value %d out of range\n",afmName,ascii); */
+                        /* wxLogDebug("AFM-file '%s': ASCII value %d out of range\n",afmName.c_str(),ascii); */

                     }
                 }
                 /* C.) ignore other entries. */
                     }
                 }
                 /* C.) ignore other entries. */


@@ -1970,16 +1974,16 @@ void wxPostScriptDC::DoGetTextExtent(const wxString& string,
     double widthSum=0;
     wxCoord height=Size; /* by default */
     unsigned char *p;
     double widthSum=0;
     wxCoord height=Size; /* by default */
     unsigned char *p;

-    for(p=(unsigned char *)strbuf; *p; p++)
+    for(p=(unsigned char *)wxMBSTRINGCAST strbuf; *p; p++)

     {
         if(lastWidths[*p]== INT_MIN)
         {
     {
         if(lastWidths[*p]== INT_MIN)
         {

-            wxLogDebug("GetTextExtent: undefined width for character '%c' (%d)\n", *p,*p);
-            widthSum += /*(wxCoord)*/(lastWidths[' ']/1000.0F * Size); /* assume space */
+            wxLogDebug(wxT("GetTextExtent: undefined width for character '%hc' (%d)\n"), *p,*p);
+            widthSum += (lastWidths[' ']/1000.0F * Size); /* assume space */

         }
         else
         {
         }
         else
         {

-            widthSum += /*(wxCoord)*/((lastWidths[*p]/1000.0F)*Size);
+            widthSum += ((lastWidths[*p]/1000.0F)*Size);

         }
     }
 
         }
     }