fix some links

[wxWidgets.git] / src / gtk / print.cpp

diff --git a/src/gtk/print.cpp b/src/gtk/print.cpp
index 876888780b36f6290e43acfe3ecb521fbb3f948f..7f7722f73ae390f326ff9ef9cfacd97e44b87fa3 100644 (file)
--- a/src/gtk/print.cpp
+++ b/src/gtk/print.cpp
@@ -2269,8 +2269,6 @@ void wxGtkPrintPreview::Init(wxPrintout * WXUNUSED(printout),
                              wxPrintout * WXUNUSED(printoutForPrinting),
                              wxPrintData *data)
 {
                              wxPrintout * WXUNUSED(printoutForPrinting),
                              wxPrintData *data)
 {

-    DetermineScaling();
-

     // convert wxPrintQuality to resolution (input pointer can be NULL)
     wxPrintQuality quality = data ? data->GetQuality() : wxPRINT_QUALITY_MEDIUM;
     switch ( quality )
     // convert wxPrintQuality to resolution (input pointer can be NULL)
     wxPrintQuality quality = data ? data->GetQuality() : wxPRINT_QUALITY_MEDIUM;
     switch ( quality )


@@ -2279,7 +2277,22 @@ void wxGtkPrintPreview::Init(wxPrintout * WXUNUSED(printout),
             m_resolution = 1200;
             break;
 
             m_resolution = 1200;
             break;
 

+        case wxPRINT_QUALITY_LOW:
+            m_resolution = 300;
+            break;
+
+        case wxPRINT_QUALITY_DRAFT:
+            m_resolution = 150;
+            break;
+

         default:
         default:

+            if ( quality > 0 )
+            {
+                // positive values directly indicate print resolution
+                m_resolution = quality;
+                break;
+            }
+

             wxFAIL_MSG( "unknown print quality" );
             // fall through
 
             wxFAIL_MSG( "unknown print quality" );
             // fall through
 


@@ -2287,14 +2300,9 @@ void wxGtkPrintPreview::Init(wxPrintout * WXUNUSED(printout),
             m_resolution = 600;
             break;
 
             m_resolution = 600;
             break;
 

-        case wxPRINT_QUALITY_LOW:
-            m_resolution = 300;
-            break;
-
-        case wxPRINT_QUALITY_DRAFT:
-            m_resolution = 150;
-            break;

     }
     }

+
+    DetermineScaling();

 }
 
 wxGtkPrintPreview::wxGtkPrintPreview(wxPrintout *printout,
 }
 
 wxGtkPrintPreview::wxGtkPrintPreview(wxPrintout *printout,