Applied rowspan patch #15276 (dghart)

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

diff --git a/include/wx/print.h b/include/wx/print.h
index 801dea98ae5ba2681f9cc5dbef2604e9865ae074..12160a8e1a56afb7589f33b4db4666b3531514c4 100644 (file)
--- a/include/wx/print.h
+++ b/include/wx/print.h
@@ -1,41 +1,39 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        wx/print.h
+// Purpose:     Base header for printer classes
+// Author:      Julian Smart
+// Modified by:
+// Created:
+// RCS-ID:      $Id$
+// Copyright:   (c) Julian Smart
+// Licence:     wxWindows Licence
+/////////////////////////////////////////////////////////////////////////////
+

 #ifndef _WX_PRINT_H_BASE_
 #define _WX_PRINT_H_BASE_
 
 #ifndef _WX_PRINT_H_BASE_
 #define _WX_PRINT_H_BASE_
 

-#if defined(__WXMSW__)
-#include "wx/msw/printwin.h"
+#include "wx/defs.h"

 
 

-#ifndef wxPrinter
-#define wxPrinter wxWindowsPrinter
-#endif
-#ifndef wxPrintPreview
-#define wxPrintPreview wxWindowsPrintPreview
-#endif
+#if wxUSE_PRINTING_ARCHITECTURE
+
+#if defined(__WXMSW__) && !defined(__WXUNIVERSAL__)
+
+#include "wx/msw/printwin.h"

 
 #elif defined(__WXMAC__)
 
 
 #elif defined(__WXMAC__)
 

-#include "wx/mac/printmac.h"
+#include "wx/osx/printmac.h"

 
 

-#ifndef wxPrinter
-#define wxPrinter wxMacPrinter
-#endif
-#ifndef wxPrintPreview
-#define wxPrintPreview wxMacPrintPreview
-#endif
+#elif defined(__WXPM__)
+
+#include "wx/os2/printos2.h"

 
 #else
 
 #else

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

 
 

-#ifndef wxPrinter
-#define wxPrinter wxPostScriptPrinter
-#define sm_classwxPrinter sm_classwxPostScriptPrinter
-#endif
-#ifndef wxPrintPreview
-#define wxPrintPreview wxPostScriptPrintPreview
-#define sm_classwxPrintPreview sm_classwxPostScriptPrintPreview
-#endif
+#include "wx/generic/printps.h"

 
 #endif
 
 
 #endif
 

-
+#endif // wxUSE_PRINTING_ARCHITECTURE

 #endif
     // _WX_PRINT_H_BASE_
 #endif
     // _WX_PRINT_H_BASE_