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 e92e2f52f405ea55704c9ed8c725b6482e935432..2ba6f3a2f01bd53c55b332c7fbd706d7d44c38a1 100644 (file)
--- a/include/wx/printdlg.h
+++ b/include/wx/printdlg.h
@@ -1,7 +1,9 @@
 #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"
 #include "wx/msw/printdlg.h"
 #elif defined(__WXMOTIF__)
 #include "wx/generic/prntdlgg.h"


@@ -9,23 +11,20 @@
 #include "wx/generic/prntdlgg.h"
 #elif defined(__WXX11__)
 #include "wx/generic/prntdlgg.h"
 #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"
 #elif defined(__WXMAC__)
 #include "wx/mac/printdlg.h"
 #elif defined(__WXPM__)
 #include "wx/generic/prntdlgg.h"

-#elif defined(__WXSTUBS__)
-#include "wx/generic/prntdlgg.h"

 #endif
 
 #endif
 

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

 #define wxPrintDialog wxGenericPrintDialog
 #define wxPrintDialog wxGenericPrintDialog

-#define sm_classwxPrintDialog sm_classwxGenericPrintDialog

 
 #define wxPrintSetupDialog wxGenericPrintSetupDialog
 
 #define wxPrintSetupDialog wxGenericPrintSetupDialog

-#define sm_classwxPrintSetupDialog sm_classwxGenericPrintSetupDialog

 
 #define wxPageSetupDialog wxGenericPageSetupDialog
 
 #define wxPageSetupDialog wxGenericPageSetupDialog

-#define sm_classwxPageSetupDialog sm_classwxGenericPageSetupDialog

 #endif
 
 #endif
 #endif
 
 #endif