From fe27303f7a92fb4db9490f9d2301cc5589063bd7 Mon Sep 17 00:00:00 2001 From: Robert Roebling Date: Sun, 7 Nov 2004 10:20:14 +0000 Subject: [PATCH] Forgot to commit these. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30335 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/common/appcmn.cpp | 3 --- src/generic/prntdlgg.cpp | 5 +++++ 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/common/appcmn.cpp b/src/common/appcmn.cpp index 0c15d2a85d..4b5a93d453 100644 --- a/src/common/appcmn.cpp +++ b/src/common/appcmn.cpp @@ -46,7 +46,6 @@ #include "wx/thread.h" #include "wx/utils.h" #include "wx/ptr_scpd.h" -#include "wx/prntbase.h" #if defined(__WXMSW__) && !defined(__PALMOS__) #include "wx/msw/private.h" // includes windows.h for LOGFONT @@ -141,8 +140,6 @@ void wxAppBase::CleanUp() delete wxTopLevelWindows.GetFirst()->GetData(); } - wxPrintFactory::SetPrintFactory( NULL ); - // undo everything we did in Initialize() above wxBitmap::CleanUpHandlers(); diff --git a/src/generic/prntdlgg.cpp b/src/generic/prntdlgg.cpp index e201b9d82c..5d24eb9e7d 100644 --- a/src/generic/prntdlgg.cpp +++ b/src/generic/prntdlgg.cpp @@ -829,6 +829,10 @@ void wxGenericPageSetupDialog::OnPrinter(wxCommandEvent& WXUNUSED(event)) TransferDataFromWindow(); // Transfer the current print settings from this dialog to the page setup dialog. + +#if 0 + // Use print factory later + wxPrintDialogData data; data = GetPageSetupData().GetPrintData(); data.SetSetupDialog(true); @@ -842,6 +846,7 @@ void wxGenericPageSetupDialog::OnPrinter(wxCommandEvent& WXUNUSED(event)) // Now update the dialog in case the page setup dialog changed some of our settings. TransferDataToWindow(); +#endif } wxGenericPageSetupDialog::wxGenericPageSetupDialog( wxWindow *parent, -- 2.45.2