Layout fixes due to measuring with the wrong font. Also added

[wxWidgets.git] / include / wx / print.h

diff --git a/include/wx/print.h b/include/wx/print.h
index e0d05230f4e1903a3fed9c18f49c51688e3725a2..7bfd959b657b0692ba62ab108e3fa6c45631da71 100644 (file)
--- a/include/wx/print.h
+++ b/include/wx/print.h
@@ -1,7 +1,7 @@
-#ifndef __PRINTH_BASE__
-#define __PRINTH_BASE__
+#ifndef _WX_PRINT_H_BASE_
+#define _WX_PRINT_H_BASE_

 
 

-#if defined(__WXMSW__)
+#if defined(__WXMSW__) && (!defined(__WXUNIVERSAL__) || !wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW)

 #include "wx/msw/printwin.h"
 
 #ifndef wxPrinter
 #include "wx/msw/printwin.h"
 
 #ifndef wxPrinter


@@ -11,6 +11,17 @@
 #define wxPrintPreview wxWindowsPrintPreview
 #endif
 
 #define wxPrintPreview wxWindowsPrintPreview
 #endif
 

+#elif defined(__WXMAC__)
+
+#include "wx/mac/printmac.h"
+
+#ifndef wxPrinter
+#define wxPrinter wxMacPrinter
+#endif
+#ifndef wxPrintPreview
+#define wxPrintPreview wxMacPrintPreview
+#endif
+

 #else
 #include "wx/generic/printps.h"
 
 #else
 #include "wx/generic/printps.h"
 


@@ -25,4 +36,4 @@
 
 
 #endif
 
 
 #endif

-    // __PRINTH_BASE__
+    // _WX_PRINT_H_BASE_