Various changes for Salford C++, and commited fileconf.h/fileconf.cpp changes

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

diff --git a/src/common/postscrp.cpp b/src/common/postscrp.cpp
index 6dc8464b653d8ef3956f75e9d2fe800062a1373a..2987647f360effa4e8b84b334589f9aeb62053d1 100644 (file)
--- a/src/common/postscrp.cpp
+++ b/src/common/postscrp.cpp
@@ -124,6 +124,15 @@
 
 wxPrintSetupData *wxThePrintSetupData = (wxPrintSetupData *) NULL;
 
+#if !USE_SHARED_LIBRARY
+IMPLEMENT_DYNAMIC_CLASS(wxPostScriptModule, wxModule)
+IMPLEMENT_DYNAMIC_CLASS(wxPostScriptDC, wxDC)
+IMPLEMENT_DYNAMIC_CLASS(wxPrintSetupData, wxObject)
+IMPLEMENT_DYNAMIC_CLASS(wxPrintPaperType, wxObject)
+#endif
+
+#ifndef __WXGTK__
+
 // these should move into wxPostscriptDC:
 double UnderlinePosition = 0.0F;
 double UnderlineThickness = 0.0F;
@@ -164,13 +173,6 @@ static const char *wxPostScriptHeaderSpline = (char *) NULL;
 static char *fileBuffer = NULL;
 #endif
 
-#if !USE_SHARED_LIBRARY
-IMPLEMENT_DYNAMIC_CLASS(wxPostScriptModule, wxModule)
-IMPLEMENT_DYNAMIC_CLASS(wxPostScriptDC, wxDC)
-IMPLEMENT_DYNAMIC_CLASS(wxPrintSetupData, wxObject)
-IMPLEMENT_DYNAMIC_CLASS(wxPrintPaperType, wxObject)
-#endif
-
 wxPostScriptDC::wxPostScriptDC ()
 {
 //  m_yOrigin = 792;                       // For EPS output
@@ -2052,6 +2054,9 @@ void wxPostScriptDC::CalcBoundingBox(long x, long y)
     if (device_y > m_maxY) m_maxY = device_y;
 }
 
+#endif
+       //  __WXGTK__
+
 IMPLEMENT_CLASS(wxPostScriptPrintDialog, wxDialog)
 
 wxPostScriptPrintDialog::wxPostScriptPrintDialog (wxWindow *parent, const wxString& title,
@@ -2594,6 +2599,15 @@ void wxPrintPaperDatabase::CreateDatabase()
   AddPaperType(_("A3 297 x 420 mm"), 297, 420,         842, 1191);
   AddPaperType(_("Letter 8 1/2 x 11 in"), 216, 279,    612, 791);
   AddPaperType(_("Legal 8 1/2 x 14 in"), 216, 356,     612, 1009);
+  
+/*
+  This is for 100 ppi
+
+  AddPaperType(_("A4 210 x 297 mm"), 210, 297,         210*4, 297*4 );
+  AddPaperType(_("A3 297 x 420 mm"), 297, 420,         297*4, 420*4 );
+  AddPaperType(_("Letter 8 1/2 x 11 in"), 216, 279,    216*4, 279*4 );
+  AddPaperType(_("Legal 8 1/2 x 14 in"), 216, 356,     216*4, 356*4 );
+*/
 }
 
 void wxPrintPaperDatabase::ClearDatabase()