Return wxPrintAbortDialog from CreateAbortWindow().

Instead of returning a generic wxWindow*, return the type actually used.
It was part of the public header already, but not used in any publicly
visible way.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@72306 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/prntbase.h b/include/wx/prntbase.h
index c40358006d19dda3eeaff5dae4e49e9a644c083e..8ae728d004f476843ae3d8933aa1a7ba47a79516 100644 (file)
--- a/include/wx/prntbase.h
+++ b/include/wx/prntbase.h
@@ -40,6 +40,7 @@ class WXDLLIMPEXP_FWD_CORE wxPreviewFrame;
 class WXDLLIMPEXP_FWD_CORE wxPrintFactory;
 class WXDLLIMPEXP_FWD_CORE wxPrintNativeDataBase;
 class WXDLLIMPEXP_FWD_CORE wxPrintPreview;
 class WXDLLIMPEXP_FWD_CORE wxPrintFactory;
 class WXDLLIMPEXP_FWD_CORE wxPrintNativeDataBase;
 class WXDLLIMPEXP_FWD_CORE wxPrintPreview;

+class WXDLLIMPEXP_FWD_CORE wxPrintAbortDialog;

 class wxPrintPageMaxCtrl;
 class wxPrintPageTextCtrl;
 
 class wxPrintPageMaxCtrl;
 class wxPrintPageTextCtrl;
 


@@ -188,7 +189,7 @@ public:
     wxPrinterBase(wxPrintDialogData *data = NULL);
     virtual ~wxPrinterBase();
 
     wxPrinterBase(wxPrintDialogData *data = NULL);
     virtual ~wxPrinterBase();
 

-    virtual wxWindow *CreateAbortWindow(wxWindow *parent, wxPrintout *printout);
+    virtual wxPrintAbortDialog *CreateAbortWindow(wxWindow *parent, wxPrintout *printout);

     virtual void ReportError(wxWindow *parent, wxPrintout *printout, const wxString& message);
 
     virtual wxPrintDialogData& GetPrintDialogData() const;
     virtual void ReportError(wxWindow *parent, wxPrintout *printout, const wxString& message);
 
     virtual wxPrintDialogData& GetPrintDialogData() const;


@@ -228,7 +229,7 @@ public:
     wxPrinter(wxPrintDialogData *data = NULL);
     virtual ~wxPrinter();
 
     wxPrinter(wxPrintDialogData *data = NULL);
     virtual ~wxPrinter();
 

-    virtual wxWindow *CreateAbortWindow(wxWindow *parent, wxPrintout *printout);
+    virtual wxPrintAbortDialog *CreateAbortWindow(wxWindow *parent, wxPrintout *printout);

     virtual void ReportError(wxWindow *parent, wxPrintout *printout, const wxString& message);
 
     virtual bool Setup(wxWindow *parent);
     virtual void ReportError(wxWindow *parent, wxPrintout *printout, const wxString& message);
 
     virtual bool Setup(wxWindow *parent);

diff --git a/interface/wx/print.h b/interface/wx/print.h
index b0f5a70c52d3ecbb35054be30fb5ea779f8a4846..ded2daea962f994801762e41fe338594e6f35ced 100644 (file)
--- a/interface/wx/print.h
+++ b/interface/wx/print.h
@@ -465,7 +465,7 @@ public:
     /**
         Creates the default printing abort window, with a cancel button.
     */
     /**
         Creates the default printing abort window, with a cancel button.
     */

-    virtual wxWindow* CreateAbortWindow(wxWindow* parent, wxPrintout* printout);
+    virtual wxPrintAbortDialog* CreateAbortWindow(wxWindow* parent, wxPrintout* printout);

 
     /**
         Returns @true if the user has aborted the print job.
 
     /**
         Returns @true if the user has aborted the print job.

diff --git a/src/common/prntbase.cpp b/src/common/prntbase.cpp
index fb640b2af5734c6b7ceda64f283ef5c1d097f47b..76e64e19ec5a409080ea09881fb7fca17131eea2 100644 (file)
--- a/src/common/prntbase.cpp
+++ b/src/common/prntbase.cpp
@@ -321,7 +321,7 @@ wxPrinterBase::~wxPrinterBase()
 {
 }
 
 {
 }
 

-wxWindow *wxPrinterBase::CreateAbortWindow(wxWindow *parent, wxPrintout * printout)
+wxPrintAbortDialog *wxPrinterBase::CreateAbortWindow(wxWindow *parent, wxPrintout * printout)

 {
     return new wxPrintAbortDialog(parent, printout->GetTitle());
 }
 {
     return new wxPrintAbortDialog(parent, printout->GetTitle());
 }


@@ -352,7 +352,7 @@ wxPrinter::~wxPrinter()
     delete m_pimpl;
 }
 
     delete m_pimpl;
 }
 

-wxWindow *wxPrinter::CreateAbortWindow(wxWindow *parent, wxPrintout *printout)
+wxPrintAbortDialog *wxPrinter::CreateAbortWindow(wxWindow *parent, wxPrintout *printout)

 {
     return m_pimpl->CreateAbortWindow( parent, printout );
 }
 {
     return m_pimpl->CreateAbortWindow( parent, printout );
 }

diff --git a/src/msw/printwin.cpp b/src/msw/printwin.cpp
index 9018f7de7031374093ceeb7ce31959bd100d4023..3648192fc81900ccf418975f184cbe9729a7ec61 100644 (file)
--- a/src/msw/printwin.cpp
+++ b/src/msw/printwin.cpp
@@ -167,7 +167,7 @@ bool wxWindowsPrinter::Print(wxWindow *parent, wxPrintout *printout, bool prompt
     m_printDialogData.SetMinPage(minPage);
     m_printDialogData.SetMaxPage(maxPage);
 
     m_printDialogData.SetMinPage(minPage);
     m_printDialogData.SetMaxPage(maxPage);
 

-    wxWindow *win = CreateAbortWindow(parent, printout);
+    wxPrintAbortDialog *win = CreateAbortWindow(parent, printout);

     wxYield();
 
     ::SetAbortProc(GetHdcOf(*impl), wxAbortProc);
     wxYield();
 
     ::SetAbortProc(GetHdcOf(*impl), wxAbortProc);