Rework comment a bit to accurately reflect situation on 10.2 - it doesn't crash,...

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

diff --git a/src/generic/dcpsg.cpp b/src/generic/dcpsg.cpp
index b83d33c47ef3b6490f2d8241fb673d791915709b..545d25a5c54c2a8a8ac61f185fb4f256edac6cb7 100644 (file)
--- a/src/generic/dcpsg.cpp
+++ b/src/generic/dcpsg.cpp
@@ -36,6 +36,7 @@
 #include "wx/log.h"
 #include "wx/generic/dcpsg.h"
 #include "wx/prntbase.h"
 #include "wx/log.h"
 #include "wx/generic/dcpsg.h"
 #include "wx/prntbase.h"

+#include "wx/generic/prntdlgg.h"

 #include "wx/paper.h"
 #include "wx/filefn.h"
 #if WXWIN_COMPATIBILITY_2_2
 #include "wx/paper.h"
 #include "wx/filefn.h"
 #if WXWIN_COMPATIBILITY_2_2


@@ -1297,9 +1298,9 @@ static void InitializePangoContext(PangoContext *context)
 #else
     // FIXME: assuming LTR is incorrect!
     pango_context_set_base_dir(context, PANGO_DIRECTION_LTR);
 #else
     // FIXME: assuming LTR is incorrect!
     pango_context_set_base_dir(context, PANGO_DIRECTION_LTR);

-    wxString lang = wxLocale::GetCanonicalName();
+    wxString lang = wxGetLocale()->GetCanonicalName();

     pango_context_set_language(context,
     pango_context_set_language(context,

-                               pango_language_from_string(lang::ToAscii()));
+                               pango_language_from_string(lang.ToAscii()));

 #endif
 }
 #endif
 #endif
 }
 #endif


@@ -1799,8 +1800,11 @@ wxSize wxPostScriptDC::GetPPI(void) const
 bool wxPostScriptDC::StartDoc( const wxString& message )
 {
     wxCHECK_MSG( m_ok, false, wxT("invalid postscript dc") );
 bool wxPostScriptDC::StartDoc( const wxString& message )
 {
     wxCHECK_MSG( m_ok, false, wxT("invalid postscript dc") );

+    
+    wxPostScriptPrintNativeData *data = 
+        (wxPostScriptPrintNativeData *) m_printData.GetNativeData();

 
 

-    if ( m_printData.GetPrintMode() != wxPRINT_MODE_STREAM )
+    if (data->GetPrintMode() != wxPRINT_MODE_STREAM )

     {
         if (m_printData.GetFilename() == wxEmptyString)
         {
     {
         if (m_printData.GetFilename() == wxEmptyString)
         {


@@ -1963,13 +1967,16 @@ void wxPostScriptDC::EndDoc ()
     PsPrintf( wxT("%% %d %d lineto closepath stroke\n"), llx, ury );
 #endif
 
     PsPrintf( wxT("%% %d %d lineto closepath stroke\n"), llx, ury );
 #endif
 

-#if defined(__X__) || defined(__WXGTK__)
-    if (m_ok && (m_printData.GetPrintMode() == wxPRINT_MODE_PRINTER))
+#ifndef __WXMSW__
+    wxPostScriptPrintNativeData *data = 
+        (wxPostScriptPrintNativeData *) m_printData.GetNativeData();
+
+    if (m_ok && (data->GetPrintMode() == wxPRINT_MODE_PRINTER))

     {
         wxString command;
     {
         wxString command;

-        command += m_printData.GetPrinterCommand();
+        command += data->GetPrinterCommand();

         command += wxT(" ");
         command += wxT(" ");

-        command += m_printData.GetPrinterOptions();
+        command += data->GetPrinterOptions();

         command += wxT(" ");
         command += m_printData.GetFilename();
 
         command += wxT(" ");
         command += m_printData.GetFilename();
 


@@ -1998,11 +2005,14 @@ void wxPostScriptDC::StartPage()
     wxCoord translate_x, translate_y;
     double scale_x, scale_y;
 
     wxCoord translate_x, translate_y;
     double scale_x, scale_y;
 

-    translate_x = (wxCoord)m_printData.GetPrinterTranslateX();
-    translate_y = (wxCoord)m_printData.GetPrinterTranslateY();
+    wxPostScriptPrintNativeData *data = 
+        (wxPostScriptPrintNativeData *) m_printData.GetNativeData();
+
+    translate_x = (wxCoord)data->GetPrinterTranslateX();
+    translate_y = (wxCoord)data->GetPrinterTranslateY();

 
 

-    scale_x = m_printData.GetPrinterScaleX();
-    scale_y = m_printData.GetPrinterScaleY();
+    scale_x = data->GetPrinterScaleX();
+    scale_y = data->GetPrinterScaleY();

 
     if (m_printData.GetOrientation() == wxLANDSCAPE)
     {
 
     if (m_printData.GetOrientation() == wxLANDSCAPE)
     {


@@ -2245,11 +2255,14 @@ void wxPostScriptDC::DoGetTextExtent(const wxString& string,
 
         FILE *afmFile = NULL;
 
 
         FILE *afmFile = NULL;
 

+        wxPostScriptPrintNativeData *data = 
+            (wxPostScriptPrintNativeData *) m_printData.GetNativeData();
+            

         // Get the directory of the AFM files
         wxString afmName;
         // Get the directory of the AFM files
         wxString afmName;

-        if (!m_printData.GetFontMetricPath().IsEmpty())
+        if (!data->GetFontMetricPath().IsEmpty())

         {
         {

-            afmName = m_printData.GetFontMetricPath();
+            afmName = data->GetFontMetricPath();

             afmName << wxFILE_SEP_PATH << name;
             afmFile = wxFopen(afmName,wxT("r"));
         }
             afmName << wxFILE_SEP_PATH << name;
             afmFile = wxFopen(afmName,wxT("r"));
         }


@@ -2465,13 +2478,16 @@ void wxPostScriptDC::PsPrintf( const wxChar* fmt, ... )
 
 void wxPostScriptDC::PsPrint( const char* psdata )
 {
 
 void wxPostScriptDC::PsPrint( const char* psdata )
 {

-    switch( m_printData.GetPrintMode() )
+    wxPostScriptPrintNativeData *data = 
+        (wxPostScriptPrintNativeData *) m_printData.GetNativeData();
+
+    switch(data->GetPrintMode())

     {
 #if wxUSE_STREAMS
         // append to output stream
         case wxPRINT_MODE_STREAM:
             {
     {
 #if wxUSE_STREAMS
         // append to output stream
         case wxPRINT_MODE_STREAM:
             {

-                wxOutputStream* outputstream = m_printData.GetOutputStream();
+                wxOutputStream* outputstream = data->GetOutputStream();

                 wxCHECK_RET( outputstream, wxT("invalid outputstream") );
                 outputstream->Write( psdata, strlen( psdata ) );
             }
                 wxCHECK_RET( outputstream, wxT("invalid outputstream") );
                 outputstream->Write( psdata, strlen( psdata ) );
             }


@@ -2487,13 +2503,16 @@ void wxPostScriptDC::PsPrint( const char* psdata )
 
 void wxPostScriptDC::PsPrint( int ch )
 {
 
 void wxPostScriptDC::PsPrint( int ch )
 {

-    switch( m_printData.GetPrintMode() )
+    wxPostScriptPrintNativeData *data = 
+        (wxPostScriptPrintNativeData *) m_printData.GetNativeData();
+
+    switch (data->GetPrintMode())

     {
 #if wxUSE_STREAMS
         // append to output stream
         case wxPRINT_MODE_STREAM:
             {
     {
 #if wxUSE_STREAMS
         // append to output stream
         case wxPRINT_MODE_STREAM:
             {

-                wxOutputStream* outputstream = m_printData.GetOutputStream();
+                wxOutputStream* outputstream = data->GetOutputStream();

                 wxCHECK_RET( outputstream, wxT("invalid outputstream") );
                 outputstream->PutC( ch );
             }
                 wxCHECK_RET( outputstream, wxT("invalid outputstream") );
                 outputstream->PutC( ch );
             }