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

diff --git a/src/generic/printps.cpp b/src/generic/printps.cpp
index feeea975c4d91eb0e483ecf8299ed1ef62dcbee8..3ded1231013735774e6f850ab43cc3d48df43249 100644 (file)
--- 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 a053eb7d805f6401486e0575c8d7c1a59ec0f558..5befe63b86d1d56e78c353a701395f379eb385f2 100644 (file)
--- 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 a053eb7d805f6401486e0575c8d7c1a59ec0f558..5befe63b86d1d56e78c353a701395f379eb385f2 100644 (file)
--- 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;
 }
 
 /*