X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/12028905135250524409f1e7b9bfa9c55e5ce16b..1f30c17645c56f85178ee780fa330d954e45cea9:/include/wx/prntbase.h diff --git a/include/wx/prntbase.h b/include/wx/prntbase.h index d7ed29ed22..7e5810d95c 100644 --- a/include/wx/prntbase.h +++ b/include/wx/prntbase.h @@ -63,22 +63,22 @@ public: wxPrintDialogData& GetPrintDialogData() const { return (wxPrintDialogData&) m_printDialogData; } bool GetAbort() const { return sm_abortIt; } - + static wxPrinterError GetLastError() { return sm_lastError; } /////////////////////////////////////////////////////////////////////////// // OVERRIDES virtual bool Setup(wxWindow *parent) = 0; - virtual bool Print(wxWindow *parent, wxPrintout *printout, bool prompt = TRUE) = 0; + virtual bool Print(wxWindow *parent, wxPrintout *printout, bool prompt = true) = 0; virtual wxDC* PrintDialog(wxWindow *parent) = 0; protected: wxPrintDialogData m_printDialogData; wxPrintout* m_currentPrintout; - + static wxPrinterError sm_lastError; - + public: static wxWindow* sm_abortWindow; static bool sm_abortIt; @@ -212,6 +212,7 @@ protected: wxPreviewCanvas* m_previewCanvas; wxPreviewControlBar* m_controlBar; wxPrintPreviewBase* m_printPreview; + wxWindowDisabler* m_windowDisabler; private: DECLARE_CLASS(wxPreviewFrame) @@ -406,7 +407,7 @@ public: const wxSize& size = wxDefaultSize, long style = 0, const wxString& name = wxT("dialog")) - : wxDialog(parent, -1, title, pos, size, style, name) + : wxDialog(parent, wxID_ANY, title, pos, size, style, name) { }