better leak error reporting using VC CRT (patch 828250)

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

diff --git a/include/wx/printdlg.h b/include/wx/printdlg.h
index a1455213a13e323d23f2dcb0b53e02e0c7e8b49d..2ba6f3a2f01bd53c55b332c7fbd706d7d44c38a1 100644 (file)
--- a/include/wx/printdlg.h
+++ b/include/wx/printdlg.h
@@ -1,19 +1,31 @@
 #ifndef _WX_PRINTDLG_H_BASE_
 #define _WX_PRINTDLG_H_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"
 #include "wx/msw/printdlg.h"
 #elif defined(__WXMOTIF__)
 #include "wx/generic/prntdlgg.h"
 #elif defined(__WXGTK__)
 #include "wx/generic/prntdlgg.h"

-#elif defined(__WXQT__)
+#elif defined(__WXX11__)

 #include "wx/generic/prntdlgg.h"
 #include "wx/generic/prntdlgg.h"

-#elif defined(__WXMAC__)
+#elif defined(__WXMGL__)

 #include "wx/generic/prntdlgg.h"
 #include "wx/generic/prntdlgg.h"

-#elif defined(__WXSRUBS__)
+#elif defined(__WXMAC__)
+#include "wx/mac/printdlg.h"
+#elif defined(__WXPM__)

 #include "wx/generic/prntdlgg.h"
 #endif
 
 #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
     // _WX_PRINTDLG_H_BASE_
 #endif
     // _WX_PRINTDLG_H_BASE_