Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Return wxPrintAbortDialog from CreateAbortWindow().

Browse Source 
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
This commit is contained in:
Václav Slavík
2012-08-09 15:52:08 +00:00
parent 1a19b3210d
commit 446659cac6
4 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
include/wx/prntbase.h
View File

@@ -40,6 +40,7 @@ class WXDLLIMPEXP_FWD_CORE wxPreviewFrame;
class WXDLLIMPEXP_FWD_CORE wxPrintFactory; class WXDLLIMPEXP_FWD_CORE wxPrintFactory;
class WXDLLIMPEXP_FWD_CORE wxPrintNativeDataBase; class WXDLLIMPEXP_FWD_CORE wxPrintNativeDataBase;
class WXDLLIMPEXP_FWD_CORE wxPrintPreview; class WXDLLIMPEXP_FWD_CORE wxPrintPreview;
class WXDLLIMPEXP_FWD_CORE wxPrintAbortDialog;
class wxPrintPageMaxCtrl; class wxPrintPageMaxCtrl;
class wxPrintPageTextCtrl; class wxPrintPageTextCtrl;
@@ -188,7 +189,7 @@ public:
wxPrinterBase(wxPrintDialogData *data = NULL); wxPrinterBase(wxPrintDialogData *data = NULL);
virtual ~wxPrinterBase(); 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 void ReportError(wxWindow *parent, wxPrintout *printout, const wxString& message);
virtual wxPrintDialogData& GetPrintDialogData() const; virtual wxPrintDialogData& GetPrintDialogData() const;
@@ -228,7 +229,7 @@ public:
wxPrinter(wxPrintDialogData *data = NULL); wxPrinter(wxPrintDialogData *data = NULL);
virtual ~wxPrinter(); 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 void ReportError(wxWindow *parent, wxPrintout *printout, const wxString& message);
virtual bool Setup(wxWindow *parent); virtual bool Setup(wxWindow *parent);

2
interface/wx/print.h
View File

@@ -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.

4
src/common/prntbase.cpp
View File

@@ -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 );
} }

2
src/msw/printwin.cpp
View File

@@ -167,7 +167,7 @@ bool wxWindowsPrinter::Print(wxWindow *parent, wxPrintout *printout, bool prompt
m_printDialogData.SetMinPage(minPage); m_printDialogData.SetMinPage(minPage);
m_printDialogData.SetMaxPage(maxPage); m_printDialogData.SetMaxPage(maxPage);
wxWindow *win = CreateAbortWindow(parent, printout); wxPrintAbortDialog *win = CreateAbortWindow(parent, printout);
wxYield(); wxYield();
::SetAbortProc(GetHdcOf(*impl), wxAbortProc); ::SetAbortProc(GetHdcOf(*impl), wxAbortProc);