#include <stdlib.h>
-#include "wx/msw/private.h"
-
-#include <commdlg.h>
-
+#include "wx/msw/wrapcdlg.h"
#ifndef __WIN32__
#include <print.h>
#endif
m_printDialogData.SetMaxPage(9999);
// Create a suitable device context
- wxDC *dc = NULL;
+ wxDC *dc wxDUMMY_INITIALIZE(NULL);
if (prompt)
{
dc = PrintDialog(parent);
return false;
}
- int logPPIScreenX = 0;
- int logPPIScreenY = 0;
- int logPPIPrinterX = 0;
- int logPPIPrinterY = 0;
-
HDC hdc = ::GetDC(NULL);
- logPPIScreenX = ::GetDeviceCaps(hdc, LOGPIXELSX);
- logPPIScreenY = ::GetDeviceCaps(hdc, LOGPIXELSY);
+ int logPPIScreenX = ::GetDeviceCaps(hdc, LOGPIXELSX);
+ int logPPIScreenY = ::GetDeviceCaps(hdc, LOGPIXELSY);
::ReleaseDC(NULL, hdc);
- logPPIPrinterX = ::GetDeviceCaps((HDC) dc->GetHDC(), LOGPIXELSX);
- logPPIPrinterY = ::GetDeviceCaps((HDC) dc->GetHDC(), LOGPIXELSY);
+ int logPPIPrinterX = ::GetDeviceCaps((HDC) dc->GetHDC(), LOGPIXELSX);
+ int logPPIPrinterY = ::GetDeviceCaps((HDC) dc->GetHDC(), LOGPIXELSY);
if (logPPIPrinterX == 0 || logPPIPrinterY == 0)
{
delete dc;
printout->SetPageSizeMM((int)w, (int)h);
// Create an abort window
- wxBeginBusyCursor();
+ wxBusyCursor busyCursor;
printout->OnPreparePrinting();
if (maxPage == 0)
{
sm_lastError = wxPRINTER_ERROR;
- wxEndBusyCursor();
return false;
}
wxWindow *win = CreateAbortWindow(parent, printout);
wxYield();
-#if defined(__BORLANDC__) || defined(__GNUWIN32__) || defined(__SALFORDC__) || !defined(__WIN32__)
+#if defined(__WATCOMC__) || defined(__BORLANDC__) || defined(__GNUWIN32__) || defined(__SALFORDC__) || !defined(__WIN32__)
#ifdef STRICT
::SetAbortProc((HDC) dc->GetHDC(), (ABORTPROC) m_lpAbortProc);
#else
if (!win)
{
- wxEndBusyCursor();
wxLogDebug(wxT("Could not create an abort dialog."));
sm_lastError = wxPRINTER_ERROR;
delete dc;
+ return false;
}
sm_abortWindow = win;
sm_abortWindow->Show();
int minPageNum = minPage, maxPageNum = maxPage;
if ( !m_printDialogData.GetAllPages() )
- {
- minPageNum = minPage;
- maxPageNum = maxPage;
- }
- else
{
minPageNum = m_printDialogData.GetFromPage();
maxPageNum = m_printDialogData.GetToPage();
{
if ( !printout->OnBeginDocument(minPageNum, maxPageNum) )
{
- wxEndBusyCursor();
wxLogError(_("Could not start printing."));
sm_lastError = wxPRINTER_ERROR;
break;
sm_abortWindow = NULL;
}
- wxEndBusyCursor();
-
delete dc;
- return (sm_lastError == wxPRINTER_NO_ERROR);
+ return sm_lastError == wxPRINTER_NO_ERROR;
}
wxDC* wxWindowsPrinter::PrintDialog(wxWindow *parent)
return dc;
}
-bool wxWindowsPrinter::Setup(wxWindow *parent)
+bool wxWindowsPrinter::Setup(wxWindow *WXUNUSED(parent))
{
+#if 0
+ // We no longer expose that dialog
wxPrintDialog dialog(parent, & m_printDialogData);
dialog.GetPrintDialogData().SetSetupDialog(true);
}
return (ret == wxID_OK);
+#else
+ return false;
+#endif
}
/*
wxPrinterDC printerDC(m_printDialogData.GetPrintData());
int printerWidth = 150;
- int printerHeight = 250;
+ int printerHeight wxDUMMY_INITIALIZE(250);
int printerXRes = 1500;
int printerYRes = 2500;
/* Process messages intended for the abort dialog box */
- while (!wxPrinterBase::sm_abortIt && PeekMessage(&msg, 0, 0, 0, TRUE))
+ while (!wxPrinterBase::sm_abortIt && ::PeekMessage(&msg, 0, 0, 0, TRUE))
if (!IsDialogMessage((HWND) wxPrinterBase::sm_abortWindow->GetHWND(), &msg)) {
TranslateMessage(&msg);
DispatchMessage(&msg);
}
- /* bAbort is TRUE (return is FALSE) if the user has aborted */
+ /* bAbort is TRUE (return is FALSE) if the user has aborted */
- return (!wxPrinterBase::sm_abortIt);
+ return !wxPrinterBase::sm_abortIt;
}
#endif