Reverted part of patch #876969 ("Fixes to Borland warnings"), resulted in bugs when...

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

diff --git a/include/wx/printdlg.h b/include/wx/printdlg.h
index bd0e58ccd09b5024cefdfce0ee6ed31edea38da1..2ba6f3a2f01bd53c55b332c7fbd706d7d44c38a1 100644 (file)
--- a/include/wx/printdlg.h
+++ b/include/wx/printdlg.h
@@ -1,13 +1,31 @@
-#ifndef __PRINTDLGH_BASE__
-#define __PRINTDLGH_BASE__
+#ifndef _WX_PRINTDLG_H_BASE_
+#define _WX_PRINTDLG_H_BASE_
 
-#if defined(__WXMSW__)
+#if defined(__WXUNIVERSAL__) && (!defined(__WXMSW__) || wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW)
+#include "wx/generic/prntdlgg.h"
+#elif defined(__WXMSW__)
 #include "wx/msw/printdlg.h"
 #elif defined(__WXMOTIF__)
 #include "wx/generic/prntdlgg.h"
 #elif defined(__WXGTK__)
 #include "wx/generic/prntdlgg.h"
+#elif defined(__WXX11__)
+#include "wx/generic/prntdlgg.h"
+#elif defined(__WXMGL__)
+#include "wx/generic/prntdlgg.h"
+#elif defined(__WXMAC__)
+#include "wx/mac/printdlg.h"
+#elif defined(__WXPM__)
+#include "wx/generic/prntdlgg.h"
+#endif
+
+#if (defined(__WXUNIVERSAL__) && (!defined(__WXMSW__) || wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW) ) || (!defined(__WXMSW__) && !defined(__WXMAC__))
+#define wxPrintDialog wxGenericPrintDialog
+
+#define wxPrintSetupDialog wxGenericPrintSetupDialog
+
+#define wxPageSetupDialog wxGenericPageSetupDialog
 #endif
 
 #endif
-    // __PRINTDLGH_BASE__
+    // _WX_PRINTDLG_H_BASE_