moved SetBestSize() to .cpp file; set min size from it

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

diff --git a/include/wx/printdlg.h b/include/wx/printdlg.h
index 859646589b057a3e1b7a91cdbcdcf78e86f3e991..2ba6f3a2f01bd53c55b332c7fbd706d7d44c38a1 100644 (file)
--- a/include/wx/printdlg.h
+++ b/include/wx/printdlg.h
@@ -1,7 +1,7 @@
 #ifndef _WX_PRINTDLG_H_BASE_
 #define _WX_PRINTDLG_H_BASE_
 
 #ifndef _WX_PRINTDLG_H_BASE_
 #define _WX_PRINTDLG_H_BASE_
 

-#if defined(__WXUNIVERSAL__) /* && !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"
 #include "wx/generic/prntdlgg.h"
 #elif defined(__WXMSW__)
 #include "wx/msw/printdlg.h"


@@ -19,15 +19,12 @@
 #include "wx/generic/prntdlgg.h"
 #endif
 
 #include "wx/generic/prntdlgg.h"
 #endif
 

-#if (defined(__WXUNIVERSAL__) /* && !defined(__WXMSW__) */ ) || (!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