From 04a014a5d69a9345e563b4395768d61fc743b0c3 Mon Sep 17 00:00:00 2001 From: Robert Roebling Date: Fri, 5 Nov 2004 22:25:25 +0000 Subject: [PATCH] I admit I have no good solution for wxPrinter::Setup(wxWindow*) yet. I'd just remove it but I'll think it over if there is or was any use for it. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30307 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/generic/printps.cpp | 6 +++++- src/mac/carbon/printmac.cpp | 3 +++ src/mac/classic/printmac.cpp | 3 +++ 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/src/generic/printps.cpp b/src/generic/printps.cpp index feeea975c4..3ded123101 100644 --- a/src/generic/printps.cpp +++ b/src/generic/printps.cpp @@ -257,6 +257,7 @@ wxDC* wxPostScriptPrinter::PrintDialog(wxWindow *parent) bool wxPostScriptPrinter::Setup(wxWindow *parent) { +#if 0 wxGenericPrintDialog* dialog = new wxGenericPrintDialog(parent, & m_printDialogData); dialog->GetPrintDialogData().SetSetupDialog(true); @@ -268,8 +269,11 @@ bool wxPostScriptPrinter::Setup(wxWindow *parent) } dialog->Destroy(); - + return (ret == wxID_OK); +#endif + + return wxID_CANCEL; } // ---------------------------------------------------------------------------- diff --git a/src/mac/carbon/printmac.cpp b/src/mac/carbon/printmac.cpp index a053eb7d80..5befe63b86 100644 --- a/src/mac/carbon/printmac.cpp +++ b/src/mac/carbon/printmac.cpp @@ -699,6 +699,7 @@ wxDC* wxMacPrinter::PrintDialog(wxWindow *parent) bool wxMacPrinter::Setup(wxWindow *parent) { +#if 0 wxPrintDialog dialog(parent, & m_printDialogData); dialog.GetPrintDialogData().SetSetupDialog(TRUE); @@ -710,6 +711,8 @@ bool wxMacPrinter::Setup(wxWindow *parent) } return (ret == wxID_OK); +#endif + return wxID_CANCEL; } /* diff --git a/src/mac/classic/printmac.cpp b/src/mac/classic/printmac.cpp index a053eb7d80..5befe63b86 100644 --- a/src/mac/classic/printmac.cpp +++ b/src/mac/classic/printmac.cpp @@ -699,6 +699,7 @@ wxDC* wxMacPrinter::PrintDialog(wxWindow *parent) bool wxMacPrinter::Setup(wxWindow *parent) { +#if 0 wxPrintDialog dialog(parent, & m_printDialogData); dialog.GetPrintDialogData().SetSetupDialog(TRUE); @@ -710,6 +711,8 @@ bool wxMacPrinter::Setup(wxWindow *parent) } return (ret == wxID_OK); +#endif + return wxID_CANCEL; } /* -- 2.45.2