From 888eaa3d8c2dce98257ab070afef0ee87fc47638 Mon Sep 17 00:00:00 2001 From: Julian Smart Date: Mon, 11 Nov 2002 08:57:55 +0000 Subject: [PATCH] Applied patch [ 631639 ] Print should be generic git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_4_BRANCH@17827 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/print.h | 2 +- include/wx/printdlg.h | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/include/wx/print.h b/include/wx/print.h index 801dea98ae..31c9588da2 100644 --- a/include/wx/print.h +++ b/include/wx/print.h @@ -1,7 +1,7 @@ #ifndef _WX_PRINT_H_BASE_ #define _WX_PRINT_H_BASE_ -#if defined(__WXMSW__) +#if defined(__WXMSW__) && !defined(__WXUNIVERSAL__) #include "wx/msw/printwin.h" #ifndef wxPrinter diff --git a/include/wx/printdlg.h b/include/wx/printdlg.h index 36c7cc1e58..1e72c149f7 100644 --- a/include/wx/printdlg.h +++ b/include/wx/printdlg.h @@ -1,7 +1,9 @@ #ifndef _WX_PRINTDLG_H_BASE_ #define _WX_PRINTDLG_H_BASE_ -#if defined(__WXMSW__) +#if defined(__WXUNIVERSAL__) +#include "wx/generic/prntdlgg.h" +#elif defined(__WXMSW__) #include "wx/msw/printdlg.h" #elif defined(__WXMOTIF__) #include "wx/generic/prntdlgg.h" @@ -19,7 +21,7 @@ #include "wx/generic/prntdlgg.h" #endif -#if !defined(__WXMSW__) && !defined(__WXMAC__) +#if defined(__WXUNIVERSAL__) || (!defined(__WXMSW__) && !defined(__WXMAC__)) #define wxPrintDialog wxGenericPrintDialog #define sm_classwxPrintDialog sm_classwxGenericPrintDialog