X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/891daf8c1ed66bd9396fb9e4eb9f15da85823c9a..84aa68c427aab0b6604c68aa6b228714ef48b66c:/src/common/prntbase.cpp diff --git a/src/common/prntbase.cpp b/src/common/prntbase.cpp index 0dd2488919..6afdf78053 100644 --- a/src/common/prntbase.cpp +++ b/src/common/prntbase.cpp @@ -134,7 +134,7 @@ wxPrintPreviewBase *wxNativePrintFactory::CreatePrintPreview( wxPrintout *previe #endif } -wxPrintDialogBase *wxNativePrintFactory::CreatePrintDialog( wxWindow *parent, +wxPrintDialogBase *wxNativePrintFactory::CreatePrintDialog( wxWindow *parent, wxPrintDialogData *data ) { #if defined(__WXMSW__) && !defined(__WXUNIVERSAL__) @@ -146,7 +146,7 @@ wxPrintDialogBase *wxNativePrintFactory::CreatePrintDialog( wxWindow *parent, #endif } -wxPrintDialogBase *wxNativePrintFactory::CreatePrintDialog( wxWindow *parent, +wxPrintDialogBase *wxNativePrintFactory::CreatePrintDialog( wxWindow *parent, wxPrintData *data ) { #if defined(__WXMSW__) && !defined(__WXUNIVERSAL__) @@ -158,7 +158,7 @@ wxPrintDialogBase *wxNativePrintFactory::CreatePrintDialog( wxWindow *parent, #endif } -wxPageSetupDialogBase *wxNativePrintFactory::CreatePageSetupDialog( wxWindow *parent, +wxPageSetupDialogBase *wxNativePrintFactory::CreatePageSetupDialog( wxWindow *parent, wxPageSetupDialogData *data ) { #if defined(__WXMSW__) && !defined(__WXUNIVERSAL__) @@ -183,10 +183,10 @@ bool wxNativePrintFactory::HasPrintSetupDialog() // the printer from the wxPrintDialog anyway. return true; #endif - + } -wxDialog *wxNativePrintFactory::CreatePrintSetupDialog( wxWindow *parent, +wxDialog *wxNativePrintFactory::CreatePrintSetupDialog( wxWindow *parent, wxPrintData *data ) { #if defined(__WXMSW__) && !defined(__WXUNIVERSAL__) @@ -209,7 +209,7 @@ wxDialog *wxNativePrintFactory::CreatePrintSetupDialog( wxWindow *parent, bool wxNativePrintFactory::HasOwnPrintToFile() { // Only relevant for PostScript and here the - // setup dialog provides no "print to file" + // setup dialog provides no "print to file" // option. In the GNOME setup dialog, the // setup dialog has its own print to file. return false; @@ -224,7 +224,7 @@ bool wxNativePrintFactory::HasPrinterLine() wxString wxNativePrintFactory::CreatePrinterLine() { // Only relevant for PostScript for now - + // We should query "lpstat -d" here return _("Generic PostScript"); } @@ -232,13 +232,13 @@ wxString wxNativePrintFactory::CreatePrinterLine() bool wxNativePrintFactory::HasStatusLine() { // Only relevant for PostScript for now - return true; + return true; } wxString wxNativePrintFactory::CreateStatusLine() { // Only relevant for PostScript for now - + // We should query "lpstat -r" or "lpstat -p" here return _("Ready"); } @@ -261,8 +261,8 @@ wxPrintNativeDataBase *wxNativePrintFactory::CreatePrintNativeData() IMPLEMENT_ABSTRACT_CLASS(wxPrintNativeDataBase, wxObject) wxPrintNativeDataBase::wxPrintNativeDataBase() -{ - m_ref = 1; +{ + m_ref = 1; } //---------------------------------------------------------------------------- @@ -275,7 +275,7 @@ public: wxPrintFactoryModule() {} bool OnInit() { return true; } void OnExit() { wxPrintFactory::SetPrintFactory( NULL ); } - + private: DECLARE_DYNAMIC_CLASS(wxPrintFactoryModule) }; @@ -386,7 +386,7 @@ wxPrintDialogData& wxPrinter::GetPrintDialogData() const IMPLEMENT_ABSTRACT_CLASS(wxPrintDialogBase, wxDialog) wxPrintDialogBase::wxPrintDialogBase(wxWindow *parent, - wxWindowID id, + wxWindowID id, const wxString &title, const wxPoint &pos, const wxSize &size, @@ -444,7 +444,7 @@ wxDC *wxPrintDialog::GetPrintDC() IMPLEMENT_ABSTRACT_CLASS(wxPageSetupDialogBase, wxDialog) wxPageSetupDialogBase::wxPageSetupDialogBase(wxWindow *parent, - wxWindowID id, + wxWindowID id, const wxString &title, const wxPoint &pos, const wxSize &size, @@ -1006,7 +1006,7 @@ void wxPreviewFrame::CreateControlBar() if (m_printPreview->GetPrintoutForPrinting()) buttons |= wxPREVIEW_PRINT; - m_controlBar = new wxPreviewControlBar(m_printPreview, buttons, this, wxPoint(0, 0), wxSize(400, 40)); + m_controlBar = new wxPreviewControlBar(m_printPreview, buttons, this, wxPoint(0,0), wxSize(400, 40)); m_controlBar->CreateButtons(); }