projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Removed generic scrolwin.cpp from wxGTK list because of filename duplication
[wxWidgets.git]
/
src
/
msw
/
printwin.cpp
diff --git
a/src/msw/printwin.cpp
b/src/msw/printwin.cpp
index 0f05f726185ca818f3926fa2b8f207af0027acaa..49cf5218ff0ccd6358c9e43ca68c1d1f1ebb250a 100644
(file)
--- a/
src/msw/printwin.cpp
+++ b/
src/msw/printwin.cpp
@@
-30,6
+30,8
@@
#include "wx/defs.h"
#include "wx/defs.h"
+#if wxUSE_PRINTING_ARCHITECTURE
+
#ifndef WX_PRECOMP
#include "wx/window.h"
#include "wx/msw/private.h"
#ifndef WX_PRECOMP
#include "wx/window.h"
#include "wx/msw/private.h"
@@
-66,10
+68,8
@@
LONG APIENTRY _EXPORT wxAbortProc(HDC hPr, int Code);
// wxWin macros
// ---------------------------------------------------------------------------
// wxWin macros
// ---------------------------------------------------------------------------
-#if !USE_SHARED_LIBRARY
IMPLEMENT_DYNAMIC_CLASS(wxWindowsPrinter, wxPrinterBase)
IMPLEMENT_CLASS(wxWindowsPrintPreview, wxPrintPreviewBase)
IMPLEMENT_DYNAMIC_CLASS(wxWindowsPrinter, wxPrinterBase)
IMPLEMENT_CLASS(wxWindowsPrintPreview, wxPrintPreviewBase)
-#endif
// ===========================================================================
// implementation
// ===========================================================================
// implementation
@@
-100,7
+100,10
@@
bool wxWindowsPrinter::Print(wxWindow *parent, wxPrintout *printout, bool prompt
sm_abortWindow = NULL;
if (!printout)
sm_abortWindow = NULL;
if (!printout)
+ {
+ sm_lastError = wxPRINTER_ERROR;
return FALSE;
return FALSE;
+ }
printout->SetIsPreview(FALSE);
printout->SetIsPreview(FALSE);
@@
-115,7
+118,10
@@
bool wxWindowsPrinter::Print(wxWindow *parent, wxPrintout *printout, bool prompt
printout->GetPageInfo(&minPage, &maxPage, &fromPage, &toPage);
if (maxPage == 0)
printout->GetPageInfo(&minPage, &maxPage, &fromPage, &toPage);
if (maxPage == 0)
+ {
+ sm_lastError = wxPRINTER_ERROR;
return FALSE;
return FALSE;
+ }
m_printDialogData.SetMinPage(minPage);
m_printDialogData.SetMaxPage(maxPage);
m_printDialogData.SetMinPage(minPage);
m_printDialogData.SetMaxPage(maxPage);
@@
-175,6
+181,7
@@
bool wxWindowsPrinter::Print(wxWindow *parent, wxPrintout *printout, bool prompt
if (logPPIPrinterX == 0 || logPPIPrinterY == 0)
{
delete dc;
if (logPPIPrinterX == 0 || logPPIPrinterY == 0)
{
delete dc;
+ sm_lastError = wxPRINTER_ERROR;
return FALSE;
}
return FALSE;
}
@@
-222,6
+229,7
@@
bool wxWindowsPrinter::Print(wxWindow *parent, wxPrintout *printout, bool prompt
{
wxEndBusyCursor();
wxLogDebug(wxT("Could not create an abort dialog."));
{
wxEndBusyCursor();
wxLogDebug(wxT("Could not create an abort dialog."));
+ sm_lastError = wxPRINTER_ERROR;
delete dc;
}
delete dc;
}
@@
-231,36
+239,48
@@
bool wxWindowsPrinter::Print(wxWindow *parent, wxPrintout *printout, bool prompt
printout->OnBeginPrinting();
printout->OnBeginPrinting();
-
bool keepGoing = TRUE
;
+
sm_lastError = wxPRINTER_NO_ERROR
;
int copyCount;
int copyCount;
- for (copyCount = 1; copyCount <= m_printDialogData.GetNoCopies(); copyCount ++)
+ for ( copyCount = 1;
+ copyCount <= m_printDialogData.GetNoCopies();
+ copyCount++ )
{
if (!printout->OnBeginDocument(m_printDialogData.GetFromPage(), m_printDialogData.GetToPage()))
{
wxEndBusyCursor();
wxLogError(_("Could not start printing."));
{
if (!printout->OnBeginDocument(m_printDialogData.GetFromPage(), m_printDialogData.GetToPage()))
{
wxEndBusyCursor();
wxLogError(_("Could not start printing."));
+ sm_lastError = wxPRINTER_ERROR;
break;
}
if (sm_abortIt)
break;
}
if (sm_abortIt)
+ {
+ sm_lastError = wxPRINTER_CANCELLED;
break;
break;
+ }
int pn;
int pn;
- for (pn = m_printDialogData.GetFromPage(); keepGoing && (pn <= m_printDialogData.GetToPage()) && printout->HasPage(pn);
- pn++)
+ for ( pn = m_printDialogData.GetFromPage();
+ pn <= m_printDialogData.GetToPage() && printout->HasPage(pn);
+ pn++ )
{
{
- if (
sm_abortIt
)
+ if (
sm_abortIt
)
{
{
-
keepGoing = FALSE
;
+
sm_lastError = wxPRINTER_CANCELLED
;
break;
}
break;
}
- else
+
+ dc->StartPage();
+ bool cont = printout->OnPrintPage(pn);
+ dc->EndPage();
+
+ if ( !cont )
{
{
- dc->StartPage();
- printout->OnPrintPage(pn);
- dc->EndPage();
+ sm_lastError = wxPRINTER_CANCELLED;
+ break;
}
}
}
}
+
printout->OnEndDocument();
}
printout->OnEndDocument();
}
@@
-277,7
+297,7
@@
bool wxWindowsPrinter::Print(wxWindow *parent, wxPrintout *printout, bool prompt
delete dc;
delete dc;
- return
TRUE
;
+ return
(sm_lastError == wxPRINTER_NO_ERROR)
;
}
wxDC* wxWindowsPrinter::PrintDialog(wxWindow *parent)
}
wxDC* wxWindowsPrinter::PrintDialog(wxWindow *parent)
@@
-291,7
+311,13
@@
wxDC* wxWindowsPrinter::PrintDialog(wxWindow *parent)
{
dc = dialog.GetPrintDC();
m_printDialogData = dialog.GetPrintDialogData();
{
dc = dialog.GetPrintDC();
m_printDialogData = dialog.GetPrintDialogData();
+ if (dc == NULL)
+ sm_lastError = wxPRINTER_ERROR;
+ else
+ sm_lastError = wxPRINTER_NO_ERROR;
}
}
+ else
+ sm_lastError = wxPRINTER_CANCELLED;
return dc;
}
return dc;
}
@@
-419,3
+445,5
@@
LONG APIENTRY _EXPORT wxAbortProc(HDC WXUNUSED(hPr), int WXUNUSED(Code))
return (!wxPrinterBase::sm_abortIt);
}
return (!wxPrinterBase::sm_abortIt);
}
+#endif
+ // wxUSE_PRINTING_ARCHITECTURE