Add lambda-friendly wxDialog::ShowWindowModalThenDo().

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

diff --git a/include/wx/print.h b/include/wx/print.h
index 7bfd959b657b0692ba62ab108e3fa6c45631da71..56ebcf659788b68214345254ccb888dc8d0474c9 100644 (file)
--- a/include/wx/print.h
+++ b/include/wx/print.h
@@ -1,39 +1,38 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        wx/print.h
+// Purpose:     Base header for printer classes
+// Author:      Julian Smart
+// Modified by:
+// Created:
+// Copyright:   (c) Julian Smart
+// Licence:     wxWindows Licence
+/////////////////////////////////////////////////////////////////////////////
+
 #ifndef _WX_PRINT_H_BASE_
 #define _WX_PRINT_H_BASE_
 
-#if defined(__WXMSW__) && (!defined(__WXUNIVERSAL__) || !wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW)
-#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__)
 
-#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
-#include "wx/generic/printps.h"
 
-#ifndef wxPrinter
-#define wxPrinter wxPostScriptPrinter
-#endif
-#ifndef wxPrintPreview
-#define wxPrintPreview wxPostScriptPrintPreview
-#endif
+#include "wx/generic/printps.h"
 
 #endif
 
-
+#endif // wxUSE_PRINTING_ARCHITECTURE
 #endif
     // _WX_PRINT_H_BASE_