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

Fixed MSW printing, tidied up member variable names

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@641 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
1998-08-28 11:00:50 +00:00
parent 451871970b
commit 34da0970a0
9 changed files with 430 additions and 446 deletions
Download Patch File Download Diff File Expand all files Collapse all files

356
src/common/prntbase.cpp
View File

@@ -60,22 +60,6 @@
#include <print.h>
#endif
#if !defined(APIENTRY) // NT defines APIENTRY, 3.x not
#define APIENTRY FAR PASCAL
#endif
#ifdef __WIN32__
#define _EXPORT /**/
#else
#define _EXPORT _export
typedef signed short int SHORT ;
#endif
#if !defined(__WIN32__) // 3.x uses FARPROC for dialogs
#define DLGPROC FARPROC
#endif
LONG APIENTRY _EXPORT wxAbortProc(HDC hPr, int Code);
#endif
// End __WXMSW__
@@ -103,31 +87,31 @@ END_EVENT_TABLE()
wxPrinterBase::wxPrinterBase(wxPrintData *data)
{
currentPrintout = (wxPrintout *) NULL;
abortWindow = (wxWindow *) NULL;
abortIt = FALSE;
m_currentPrintout = (wxPrintout *) NULL;
sm_abortWindow = (wxWindow *) NULL;
sm_abortIt = FALSE;
if (data)
printData = (*data);
m_printData = (*data);
}
wxWindow *wxPrinterBase::abortWindow = (wxWindow *) NULL;
bool wxPrinterBase::abortIt = FALSE;
wxWindow *wxPrinterBase::sm_abortWindow = (wxWindow *) NULL;
bool wxPrinterBase::sm_abortIt = FALSE;
wxPrinterBase::~wxPrinterBase(void)
wxPrinterBase::~wxPrinterBase()
{
}
void wxPrintAbortDialog::OnCancel(wxCommandEvent& WXUNUSED(event))
{
wxPrinterBase::abortIt = TRUE;
wxPrinterBase::abortWindow->Show(FALSE);
wxPrinterBase::abortWindow->Close(TRUE);
wxPrinterBase::abortWindow = (wxWindow *) NULL;
wxPrinterBase::sm_abortIt = TRUE;
wxPrinterBase::sm_abortWindow->Show(FALSE);
wxPrinterBase::sm_abortWindow->Close(TRUE);
wxPrinterBase::sm_abortWindow = (wxWindow *) NULL;
}
wxWindow *wxPrinterBase::CreateAbortWindow(wxWindow *parent, wxPrintout *WXUNUSED(printout))
{
wxPrintAbortDialog *dialog = new wxPrintAbortDialog(parent, _("Printing"), wxPoint(0, 0), wxSize(400, 400));
wxPrintAbortDialog *dialog = new wxPrintAbortDialog(parent, _("Printing"), wxPoint(0, 0), wxSize(400, 400), wxDEFAULT_DIALOG_STYLE);
(void) new wxStaticText(dialog, -1, _("Please wait..."), wxPoint(5, 5));
wxButton *button = new wxButton(dialog, wxID_CANCEL, _("Cancel"), wxPoint(5, 30));
@@ -148,25 +132,23 @@ void wxPrinterBase::ReportError(wxWindow *parent, wxPrintout *WXUNUSED(printout)
* Printout class
*/
wxPrintout::wxPrintout(const char *title)
wxPrintout::wxPrintout(const wxString& title)
{
printoutTitle = title ? copystring(title) : (char *) NULL;
printoutDC = (wxDC *) NULL;
pageWidthMM = 0;
pageHeightMM = 0;
pageWidthPixels = 0;
pageHeightPixels = 0;
PPIScreenX = 0;
PPIScreenY = 0;
PPIPrinterX = 0;
PPIPrinterY = 0;
isPreview = FALSE;
m_printoutTitle = title ;
m_printoutDC = (wxDC *) NULL;
m_pageWidthMM = 0;
m_pageHeightMM = 0;
m_pageWidthPixels = 0;
m_pageHeightPixels = 0;
m_PPIScreenX = 0;
m_PPIScreenY = 0;
m_PPIPrinterX = 0;
m_PPIPrinterY = 0;
m_isPreview = FALSE;
}
wxPrintout::~wxPrintout(void)
wxPrintout::~wxPrintout()
{
if (printoutTitle)
delete[] printoutTitle;
}
bool wxPrintout::OnBeginDocument(int WXUNUSED(startPage), int WXUNUSED(endPage))
@@ -174,16 +156,16 @@ bool wxPrintout::OnBeginDocument(int WXUNUSED(startPage), int WXUNUSED(endPage))
return GetDC()->StartDoc(_("Printing"));
}
void wxPrintout::OnEndDocument(void)
void wxPrintout::OnEndDocument()
{
GetDC()->EndDoc();
}
void wxPrintout::OnBeginPrinting(void)
void wxPrintout::OnBeginPrinting()
{
}
void wxPrintout::OnEndPrinting(void)
void wxPrintout::OnEndPrinting()
{
}
@@ -208,13 +190,13 @@ wxPreviewCanvas::wxPreviewCanvas(wxPrintPreviewBase *preview, wxWindow *parent,
const wxPoint& pos, const wxSize& size, long style, const wxString& name):
wxScrolledWindow(parent, -1, pos, size, style, name)
{
printPreview = preview;
m_printPreview = preview;
SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_APPWORKSPACE));
SetScrollbars(40, 40, 100, 100);
}
wxPreviewCanvas::~wxPreviewCanvas(void)
wxPreviewCanvas::~wxPreviewCanvas()
{
}
@@ -222,9 +204,9 @@ void wxPreviewCanvas::OnPaint(wxPaintEvent& WXUNUSED(event))
{
wxPaintDC dc(this);
if (printPreview)
if (m_printPreview)
{
printPreview->PaintPage(this, dc);
m_printPreview->PaintPage(this, dc);
}
}
@@ -256,18 +238,16 @@ wxPreviewControlBar::wxPreviewControlBar(wxPrintPreviewBase *preview, long butto
long style, const wxString& name):
wxPanel(parent, -1, pos, size, style, name)
{
printPreview = preview;
closeButton = (wxButton *) NULL;
nextPageButton = (wxButton *) NULL;
previousPageButton = (wxButton *) NULL;
printButton = (wxButton *) NULL;
zoomControl = (wxChoice *) NULL;
buttonFlags = buttons;
m_printPreview = preview;
m_closeButton = (wxButton *) NULL;
m_nextPageButton = (wxButton *) NULL;
m_previousPageButton = (wxButton *) NULL;
m_printButton = (wxButton *) NULL;
m_zoomControl = (wxChoice *) NULL;
m_buttonFlags = buttons;
}
wxFont *wxPreviewControlBar::buttonFont = (wxFont *) NULL;
wxPreviewControlBar::~wxPreviewControlBar(void)
wxPreviewControlBar::~wxPreviewControlBar()
{
}
@@ -331,7 +311,7 @@ void wxPreviewControlBar::OnZoom(wxCommandEvent& WXUNUSED(event))
GetPrintPreview()->SetZoom(zoom);
}
void wxPreviewControlBar::CreateButtons(void)
void wxPreviewControlBar::CreateButtons()
{
#ifdef __GOOD_COMPILER__ // Robert Roebling
@@ -343,9 +323,8 @@ void wxPreviewControlBar::CreateButtons(void)
int fontSize = 10;
#endif
if (!buttonFont)
buttonFont = wxTheFontList->FindOrCreateFont(fontSize, wxSWISS, wxNORMAL, wxBOLD);
SetButtonFont(*buttonFont);
wxFont buttonFont(fontSize, wxSWISS, wxNORMAL, wxBOLD);
SetButtonFont(buttonFont);
int buttonWidth = 65;
int buttonHeight = 24;
@@ -354,28 +333,28 @@ void wxPreviewControlBar::CreateButtons(void)
int y = 5;
int gap = 5;
closeButton = new wxButton(this, wxID_PREVIEW_CLOSE, _("Close"),
m_closeButton = new wxButton(this, wxID_PREVIEW_CLOSE, _("Close"),
wxPoint(x, y), wxSize(buttonWidth, buttonHeight));
x += gap + buttonWidth;
if (buttonFlags & wxPREVIEW_PRINT)
if (m_buttonFlags & wxPREVIEW_PRINT)
{
printButton = new wxButton(this, wxID_PREVIEW_PRINT, _("Print..."), wxPoint(x, y),
m_printButton = new wxButton(this, wxID_PREVIEW_PRINT, _("Print..."), wxPoint(x, y),
wxSize(buttonWidth, buttonHeight));
x += gap + buttonWidth;
}
if (buttonFlags & wxPREVIEW_PREVIOUS)
if (m_buttonFlags & wxPREVIEW_PREVIOUS)
{
previousPageButton = new wxButton(this, wxID_PREVIEW_PREVIOUS, "<<", wxPoint(x, y),
m_previousPageButton = new wxButton(this, wxID_PREVIEW_PREVIOUS, "<<", wxPoint(x, y),
wxSize(buttonWidth, buttonHeight));
x += gap + buttonWidth;
}
if (buttonFlags & wxPREVIEW_NEXT)
if (m_buttonFlags & wxPREVIEW_NEXT)
{
nextPageButton = new wxButton(this, wxID_PREVIEW_NEXT, ">>",
m_nextPageButton = new wxButton(this, wxID_PREVIEW_NEXT, ">>",
wxPoint(x, y), wxSize(buttonWidth, buttonHeight));
x += gap + buttonWidth;
}
@@ -383,14 +362,14 @@ void wxPreviewControlBar::CreateButtons(void)
static wxString choices[] = { "10%", "20%", "25%", "30%", "35%", "40%", "45%", "50%", "55%", "60%",
"65%", "70%", "75%", "80%", "85%", "90%", "95%", "100%", "110%", "120%", "150%", "200%" };
int n = 22;
if (buttonFlags & wxPREVIEW_ZOOM)
if (m_buttonFlags & wxPREVIEW_ZOOM)
{
zoomControl = new wxChoice(this, wxID_PREVIEW_ZOOM, wxPoint(x, y),
m_zoomControl = new wxChoice(this, wxID_PREVIEW_ZOOM, wxPoint(x, y),
wxSize(100, -1), n, (wxString *)choices);
SetZoomControl(printPreview->GetZoom());
SetZoomControl(m_printPreview->GetZoom());
}
closeButton->SetDefault();
m_closeButton->SetDefault();
#endif
}
@@ -400,18 +379,18 @@ void wxPreviewControlBar::SetZoomControl(int zoom)
#ifdef __GOOD_COMPILER__ // Robert Roebling
char buf[20];
sprintf(buf, "%d%%", zoom);
if (zoomControl)
zoomControl->SetStringSelection(buf);
if (m_zoomControl)
m_zoomControl->SetStringSelection(buf);
#endif
}
int wxPreviewControlBar::GetZoomControl(void)
int wxPreviewControlBar::GetZoomControl()
{
#ifdef __GOOD_COMPILER__ // Robert Roebling
char buf[20];
if (zoomControl && zoomControl->GetStringSelection())
if (m_zoomControl && m_zoomControl->GetStringSelection())
{
strcpy(buf, zoomControl->GetStringSelection());
strcpy(buf, m_zoomControl->GetStringSelection());
buf[strlen(buf) - 1] = 0;
return (int)atoi(buf);
}
@@ -431,40 +410,39 @@ wxPreviewFrame::wxPreviewFrame(wxPrintPreviewBase *preview, wxFrame *parent, con
wxFrame(parent, -1, title, pos, size, style, name)
{
#ifdef __GOOD_COMPILER__ // Robert Roebling
printPreview = preview;
controlBar = NULL;
previewCanvas = NULL;
m_printPreview = preview;
m_controlBar = NULL;
m_previewCanvas = NULL;
#endif
}
wxPreviewFrame::~wxPreviewFrame(void)
wxPreviewFrame::~wxPreviewFrame()
{
}
bool wxPreviewFrame::OnClose(void)
bool wxPreviewFrame::OnClose()
{
#ifdef __GOOD_COMPILER__ // Robert Roebling
MakeModal(FALSE);
// Need to delete the printout and the print preview
wxPrintout *printout = printPreview->GetPrintout();
wxPrintout *printout = m_printPreview->GetPrintout();
if (printout)
{
delete printout;
printPreview->SetPrintout(NULL);
printPreview->SetCanvas(NULL);
printPreview->SetFrame(NULL);
m_printPreview->SetPrintout(NULL);
m_printPreview->SetCanvas(NULL);
m_printPreview->SetFrame(NULL);
}
delete printPreview;
delete m_printPreview;
return TRUE;
#else
return FALSE;
#endif
}
void wxPreviewFrame::Initialize(void)
void wxPreviewFrame::Initialize()
{
#ifdef __GOOD_COMPILER__ // Robert Roebling
@@ -474,15 +452,15 @@ void wxPreviewFrame::Initialize(void)
CreateCanvas();
CreateControlBar();
printPreview->SetCanvas(previewCanvas);
printPreview->SetFrame(this);
m_printPreview->SetCanvas(m_previewCanvas);
m_printPreview->SetFrame(this);
// Set layout constraints here
// Control bar constraints
wxLayoutConstraints *c1 = new wxLayoutConstraints;
// int w, h;
// controlBar->GetSize(&w, &h);
// m_controlBar->GetSize(&w, &h);
int h;
#ifdef __WXMSW__
h = 40;
@@ -495,17 +473,17 @@ void wxPreviewFrame::Initialize(void)
c1->right.SameAs (this, wxRight);
c1->height.Absolute (h);
controlBar->SetConstraints(c1);
m_controlBar->SetConstraints(c1);
// Canvas constraints
wxLayoutConstraints *c2 = new wxLayoutConstraints;
c2->left.SameAs (this, wxLeft);
c2->top.Below (controlBar);
c2->top.Below (m_controlBar);
c2->right.SameAs (this, wxRight);
c2->bottom.SameAs (this, wxBottom);
previewCanvas->SetConstraints(c2);
m_previewCanvas->SetConstraints(c2);
SetAutoLayout(TRUE);
@@ -516,25 +494,25 @@ void wxPreviewFrame::Initialize(void)
#endif
}
void wxPreviewFrame::CreateCanvas(void)
void wxPreviewFrame::CreateCanvas()
{
#ifdef __GOOD_COMPILER__ // Robert Roebling
previewCanvas = new wxPreviewCanvas(printPreview, this);
m_previewCanvas = new wxPreviewCanvas(m_printPreview, this);
#endif
}
void wxPreviewFrame::CreateControlBar(void)
void wxPreviewFrame::CreateControlBar()
{
#ifdef __GOOD_COMPILER__ // Robert Roebling
long buttons = wxPREVIEW_DEFAULT;
if (printPreview->GetPrintoutForPrinting())
if (m_printPreview->GetPrintoutForPrinting())
buttons |= wxPREVIEW_PRINT;
controlBar = new wxPreviewControlBar(printPreview, buttons, this, wxPoint(0, 0), wxSize(400, 40));
controlBar->CreateButtons();
m_controlBar = new wxPreviewControlBar(m_printPreview, buttons, this, wxPoint(0, 0), wxSize(400, 40));
m_controlBar->CreateButtons();
#endif
}
@@ -547,44 +525,44 @@ wxPrintPreviewBase::wxPrintPreviewBase(wxPrintout *printout, wxPrintout *printou
#ifdef __GOOD_COMPILER__ // Robert Roebling
isOk = TRUE;
previewPrintout = printout;
if (previewPrintout)
previewPrintout->SetIsPreview(TRUE);
m_isOk = TRUE;
m_previewPrintout = printout;
if (m_previewPrintout)
m_previewPrintout->SetIsPreview(TRUE);
printPrintout = printoutForPrinting;
m_printPrintout = printoutForPrinting;
if (data)
printData = (*data);
m_printData = (*data);
previewCanvas = NULL;
previewFrame = NULL;
previewBitmap = NULL;
currentPage = 1;
currentZoom = 30;
topMargin = 40;
leftMargin = 40;
pageWidth = 0;
pageHeight = 0;
m_previewCanvas = NULL;
m_previewFrame = NULL;
m_previewBitmap = NULL;
m_currentPage = 1;
m_currentZoom = 30;
m_topMargin = 40;
m_leftMargin = 40;
m_pageWidth = 0;
m_pageHeight = 0;
printout->OnPreparePrinting();
// Get some parameters from the printout, if defined
int selFrom, selTo;
printout->GetPageInfo(&minPage, &maxPage, &selFrom, &selTo);
printout->GetPageInfo(&m_minPage, &m_maxPage, &selFrom, &selTo);
#endif
}
wxPrintPreviewBase::~wxPrintPreviewBase(void)
wxPrintPreviewBase::~wxPrintPreviewBase()
{
#ifdef __GOOD_COMPILER__ // Robert Roebling
if (previewPrintout)
delete previewPrintout;
if (previewBitmap)
delete previewBitmap;
if (printPrintout)
delete printPrintout;
if (m_previewPrintout)
delete m_previewPrintout;
if (m_previewBitmap)
delete m_previewBitmap;
if (m_printPrintout)
delete m_printPrintout;
#endif
}
@@ -592,20 +570,20 @@ wxPrintPreviewBase::~wxPrintPreviewBase(void)
bool wxPrintPreviewBase::SetCurrentPage(int pageNum)
{
#ifdef __GOOD_COMPILER__ // Robert Roebling
if (currentPage == pageNum)
if (m_currentPage == pageNum)
return TRUE;
currentPage = pageNum;
if (previewBitmap)
m_currentPage = pageNum;
if (m_previewBitmap)
{
delete previewBitmap;
previewBitmap = NULL;
delete m_previewBitmap;
m_previewBitmap = NULL;
}
if (previewCanvas)
if (m_previewCanvas)
{
RenderPage(pageNum);
previewCanvas->Refresh();
m_previewCanvas->Refresh();
}
#endif
@@ -619,10 +597,10 @@ bool wxPrintPreviewBase::PaintPage(wxWindow *canvas, wxDC& dc)
DrawBlankPage(canvas, dc);
if (!previewBitmap)
RenderPage(currentPage);
if (!m_previewBitmap)
RenderPage(m_currentPage);
if (!previewBitmap)
if (!m_previewBitmap)
return FALSE;
if (!canvas)
@@ -631,19 +609,19 @@ bool wxPrintPreviewBase::PaintPage(wxWindow *canvas, wxDC& dc)
int canvasWidth, canvasHeight;
canvas->GetSize(&canvasWidth, &canvasHeight);
float zoomScale = (float)((float)currentZoom/(float)100);
float actualWidth = (float)(zoomScale*pageWidth*previewScale);
// float actualHeight = (float)(zoomScale*pageHeight*previewScale);
double zoomScale = ((float)m_currentZoom/(float)100);
double actualWidth = (zoomScale*m_pageWidth*m_previewScale);
// float actualHeight = (float)(zoomScale*m_pageHeight*m_previewScale);
float x = (float)((canvasWidth - actualWidth)/2.0);
if (x < leftMargin)
x = (float)leftMargin;
float y = (float)topMargin;
int x = ((canvasWidth - actualWidth)/2.0);
if (x < m_leftMargin)
x = m_leftMargin;
int y = m_topMargin;
wxMemoryDC temp_dc;
temp_dc.SelectObject(*previewBitmap);
temp_dc.SelectObject(*m_previewBitmap);
dc.Blit((float)x, (float)y, (float)previewBitmap->GetWidth(), (float)previewBitmap->GetHeight(), &temp_dc, (float)0, (float)0);
dc.Blit(x, y, m_previewBitmap->GetWidth(), m_previewBitmap->GetHeight(), &temp_dc, 0, 0);
temp_dc.SelectObject(wxNullBitmap);
@@ -658,74 +636,74 @@ bool wxPrintPreviewBase::RenderPage(int pageNum)
#ifdef __GOOD_COMPILER__ // Robert Roebling
if (!previewCanvas)
if (!m_previewCanvas)
{
wxMessageBox(_("wxPrintPreviewBase::RenderPage: must use wxPrintPreviewBase::SetCanvas to let me know about the canvas!"),
_("Print Preview Failure"), wxOK);
return FALSE;
}
previewCanvas->GetSize(&canvasWidth, &canvasHeight);
m_previewCanvas->GetSize(&canvasWidth, &canvasHeight);
float zoomScale = (float)((float)currentZoom/(float)100);
float actualWidth = (float)(zoomScale*pageWidth*previewScale);
float actualHeight = (float)(zoomScale*pageHeight*previewScale);
double zoomScale = (m_currentZoom/100.0);
int actualWidth = (int)(zoomScale*m_pageWidth*m_previewScale);
int actualHeight = (int)(zoomScale*m_pageHeight*m_previewScale);
float x = (float)((canvasWidth - actualWidth)/2.0);
if (x < leftMargin)
x = (float)leftMargin;
// float y = topMargin;
int x = (int)((canvasWidth - actualWidth)/2.0);
if (x < m_leftMargin)
x = m_leftMargin;
// int y = m_topMargin;
if (!previewBitmap)
if (!m_previewBitmap)
{
previewBitmap = new wxBitmap((int)actualWidth, (int)actualHeight);
if (!previewBitmap || !previewBitmap->Ok())
m_previewBitmap = new wxBitmap((int)actualWidth, (int)actualHeight);
if (!m_previewBitmap || !m_previewBitmap->Ok())
{
if (previewBitmap)
delete previewBitmap;
if (m_previewBitmap)
delete m_previewBitmap;
wxMessageBox(_("Sorry, not enough memory to create a preview."), _("Print Preview Failure"), wxOK);
return FALSE;
}
}
wxMemoryDC memoryDC;
memoryDC.SelectObject(*previewBitmap);
memoryDC.SelectObject(*m_previewBitmap);
memoryDC.Clear();
previewPrintout->SetDC(&memoryDC);
previewPrintout->SetPageSizePixels(pageWidth, pageHeight);
m_previewPrintout->SetDC(&memoryDC);
m_previewPrintout->SetPageSizePixels(m_pageWidth, m_pageHeight);
previewPrintout->OnBeginPrinting();
m_previewPrintout->OnBeginPrinting();
if (!previewPrintout->OnBeginDocument(printData.GetFromPage(), printData.GetToPage()))
if (!m_previewPrintout->OnBeginDocument(m_printData.GetFromPage(), m_printData.GetToPage()))
{
wxMessageBox(_("Could not start document preview."), _("Print Preview Failure"), wxOK);
memoryDC.SelectObject(wxNullBitmap);
delete previewBitmap;
delete m_previewBitmap;
return FALSE;
}
previewPrintout->OnPrintPage(pageNum);
previewPrintout->OnEndDocument();
previewPrintout->OnEndPrinting();
m_previewPrintout->OnPrintPage(pageNum);
m_previewPrintout->OnEndDocument();
m_previewPrintout->OnEndPrinting();
previewPrintout->SetDC(NULL);
m_previewPrintout->SetDC(NULL);
memoryDC.SelectObject(wxNullBitmap);
#endif
char buf[200];
if (maxPage != 0)
sprintf(buf, _("Page %d of %d"), pageNum, maxPage);
if (m_maxPage != 0)
sprintf(buf, _("Page %d of %d"), pageNum, m_maxPage);
else
sprintf(buf, _("Page %d"), pageNum);
if (previewFrame)
previewFrame->SetStatusText(buf);
if (m_previewFrame)
m_previewFrame->SetStatusText(buf);
return TRUE;
}
@@ -739,14 +717,14 @@ bool wxPrintPreviewBase::DrawBlankPage(wxWindow *canvas, wxDC& dc)
int canvasWidth, canvasHeight;
canvas->GetSize(&canvasWidth, &canvasHeight);
float zoomScale = (float)((float)currentZoom/(float)100);
float actualWidth = zoomScale*pageWidth*previewScale;
float actualHeight = zoomScale*pageHeight*previewScale;
float zoomScale = (float)((float)m_currentZoom/(float)100);
float actualWidth = zoomScale*m_pageWidth*m_previewScale;
float actualHeight = zoomScale*m_pageHeight*m_previewScale;
float x = (float)((canvasWidth - actualWidth)/2.0);
if (x < leftMargin)
x = (float)leftMargin;
float y = (float)topMargin;
if (x < m_leftMargin)
x = (float)m_leftMargin;
float y = (float)m_topMargin;
// Draw shadow, allowing for 1-pixel border AROUND the actual page
int shadowOffset = 4;
@@ -769,21 +747,21 @@ bool wxPrintPreviewBase::DrawBlankPage(wxWindow *canvas, wxDC& dc)
void wxPrintPreviewBase::SetZoom(int percent)
{
#ifdef __GOOD_COMPILER__ // Robert Roebling
if (currentZoom == percent)
if (m_currentZoom == percent)
return;
currentZoom = percent;
if (previewBitmap)
m_currentZoom = percent;
if (m_previewBitmap)
{
delete previewBitmap;
previewBitmap = NULL;
delete m_previewBitmap;
m_previewBitmap = NULL;
}
RenderPage(currentPage);
RenderPage(m_currentPage);
if (previewCanvas)
if (m_previewCanvas)
{
previewCanvas->Clear();
previewCanvas->Refresh();
m_previewCanvas->Clear();
m_previewCanvas->Refresh();
}
#endif

86
src/generic/printps.cpp
View File

@@ -57,8 +57,8 @@ wxPostScriptPrinter::~wxPostScriptPrinter(void)
bool wxPostScriptPrinter::Print(wxWindow *parent, wxPrintout *printout, bool prompt)
{
abortIt = FALSE;
abortWindow = (wxWindow *) NULL;
sm_abortIt = FALSE;
sm_abortWindow = (wxWindow *) NULL;
if (!printout)
return FALSE;
@@ -74,37 +74,37 @@ bool wxPostScriptPrinter::Print(wxWindow *parent, wxPrintout *printout, bool pro
if (maxPage == 0)
return FALSE;
printData.SetMinPage(minPage);
printData.SetMaxPage(maxPage);
m_printData.SetMinPage(minPage);
m_printData.SetMaxPage(maxPage);
if (fromPage != 0)
printData.SetFromPage(fromPage);
m_printData.SetFromPage(fromPage);
if (toPage != 0)
printData.SetToPage(toPage);
m_printData.SetToPage(toPage);
if (minPage != 0)
{
printData.EnablePageNumbers(TRUE);
if (printData.GetFromPage() < printData.GetMinPage())
printData.SetFromPage(printData.GetMinPage());
else if (printData.GetFromPage() > printData.GetMaxPage())
printData.SetFromPage(printData.GetMaxPage());
if (printData.GetToPage() > printData.GetMaxPage())
printData.SetToPage(printData.GetMaxPage());
else if (printData.GetToPage() < printData.GetMinPage())
printData.SetToPage(printData.GetMinPage());
m_printData.EnablePageNumbers(TRUE);
if (m_printData.GetFromPage() < m_printData.GetMinPage())
m_printData.SetFromPage(m_printData.GetMinPage());
else if (m_printData.GetFromPage() > m_printData.GetMaxPage())
m_printData.SetFromPage(m_printData.GetMaxPage());
if (m_printData.GetToPage() > m_printData.GetMaxPage())
m_printData.SetToPage(m_printData.GetMaxPage());
else if (m_printData.GetToPage() < m_printData.GetMinPage())
m_printData.SetToPage(m_printData.GetMinPage());
}
else
printData.EnablePageNumbers(FALSE);
m_printData.EnablePageNumbers(FALSE);
// Create a suitable device context
wxDC *dc = (wxDC *) NULL;
if (prompt)
{
wxGenericPrintDialog dialog(parent, & printData);
wxGenericPrintDialog dialog(parent, & m_printData);
if (dialog.ShowModal() == wxID_OK)
{
dc = dialog.GetPrintDC();
printData = dialog.GetPrintData();
m_printData = dialog.GetPrintData();
}
}
else
@@ -151,22 +151,22 @@ bool wxPostScriptPrinter::Print(wxWindow *parent, wxPrintout *printout, bool pro
bool keepGoing = TRUE;
int copyCount;
for (copyCount = 1; copyCount <= printData.GetNoCopies(); copyCount ++)
for (copyCount = 1; copyCount <= m_printData.GetNoCopies(); copyCount ++)
{
if (!printout->OnBeginDocument(printData.GetFromPage(), printData.GetToPage()))
if (!printout->OnBeginDocument(m_printData.GetFromPage(), m_printData.GetToPage()))
{
wxEndBusyCursor();
wxMessageBox(_("Could not start printing."), _("Print Error"), wxOK, parent);
break;
}
if (abortIt)
if (sm_abortIt)
break;
int pn;
for (pn = printData.GetFromPage(); keepGoing && (pn <= printData.GetToPage()) && printout->HasPage(pn);
for (pn = m_printData.GetFromPage(); keepGoing && (pn <= m_printData.GetToPage()) && printout->HasPage(pn);
pn++)
{
if (abortIt)
if (sm_abortIt)
{
keepGoing = FALSE;
break;
@@ -192,13 +192,13 @@ bool wxPostScriptPrinter::Print(wxWindow *parent, wxPrintout *printout, bool pro
bool wxPostScriptPrinter::PrintDialog(wxWindow *parent)
{
wxGenericPrintDialog dialog(parent, & printData);
wxGenericPrintDialog dialog(parent, & m_printData);
return (dialog.ShowModal() == wxID_OK);
}
bool wxPostScriptPrinter::Setup(wxWindow *parent)
{
wxGenericPrintDialog dialog(parent, & printData);
wxGenericPrintDialog dialog(parent, & m_printData);
dialog.GetPrintData().SetSetupDialog(TRUE);
return (dialog.ShowModal() == wxID_OK);
}
@@ -220,10 +220,10 @@ wxPostScriptPrintPreview::~wxPostScriptPrintPreview(void)
bool wxPostScriptPrintPreview::Print(bool interactive)
{
if (!printPrintout)
if (!m_printPrintout)
return FALSE;
wxPostScriptPrinter printer(&printData);
return printer.Print(previewFrame, printPrintout, interactive);
wxPostScriptPrinter printer(&m_printData);
return printer.Print(m_previewFrame, m_printPrintout, interactive);
}
void wxPostScriptPrintPreview::DetermineScaling(void)
@@ -237,29 +237,29 @@ void wxPostScriptPrintPreview::DetermineScaling(void)
paper = wxThePrintPaperDatabase->FindPaperType(_("A4 210 x 297 mm"));
if (paper)
{
previewPrintout->SetPPIScreen(100, 100);
previewPrintout->SetPPIPrinter(100, 100);
m_previewPrintout->SetPPIScreen(100, 100);
m_previewPrintout->SetPPIPrinter(100, 100);
// If in landscape mode, we need to swap the width and height.
if ( printData.GetOrientation() == wxLANDSCAPE )
if ( m_printData.GetOrientation() == wxLANDSCAPE )
{
pageWidth = paper->heightPixels;
pageHeight = paper->widthPixels;
previewPrintout->SetPageSizeMM(paper->heightMM, paper->widthMM);
previewPrintout->SetPageSizePixels(paper->heightPixels, paper->widthPixels);
m_pageWidth = paper->heightPixels;
m_pageHeight = paper->widthPixels;
m_previewPrintout->SetPageSizeMM(paper->heightMM, paper->widthMM);
m_previewPrintout->SetPageSizePixels(paper->heightPixels, paper->widthPixels);
}
else
{
pageWidth = paper->widthPixels;
pageHeight = paper->heightPixels;
previewPrintout->SetPageSizeMM(paper->widthMM, paper->heightMM);
previewPrintout->SetPageSizePixels(paper->widthPixels, paper->heightPixels);
m_pageWidth = paper->widthPixels;
m_pageHeight = paper->heightPixels;
m_previewPrintout->SetPageSizeMM(paper->widthMM, paper->heightMM);
m_previewPrintout->SetPageSizePixels(paper->widthPixels, paper->heightPixels);
}
// At 100%, the page should look about page-size on the screen.
previewScale = (float)0.8;
// previewScale = (float)((float)screenWidth/(float)printerWidth);
// previewScale = previewScale * (float)((float)screenXRes/(float)printerYRes);
m_previewScale = (float)0.8;
// m_previewScale = (float)((float)screenWidth/(float)printerWidth);
// m_previewScale = previewScale * (float)((float)screenXRes/(float)printerYRes);
}
}

36
src/msw/dc.cpp
View File

@@ -648,6 +648,10 @@ void wxDC::SetFont(const wxFont& the_font)
wxDebugMsg("wxDC::SetFont: Selecting HFONT %X\n", m_font.GetResourceHandle());
#endif
HFONT f = (HFONT) ::SelectObject((HDC) m_hDC, (HFONT) m_font.GetResourceHandle());
if (f == NULL)
{
wxDebugMsg("::SelectObject failed in wxDC::SetFont.");
}
if (!m_oldFont)
m_oldFont = (WXHFONT) f;
}
@@ -716,6 +720,8 @@ void wxDC::SetBrush(const wxBrush& brush)
void wxDC::DrawText(const wxString& text, long x, long y, bool use16bit)
{
// Should be unnecessary: SetFont should have done this already.
#if 0
if (m_font.Ok() && m_font.GetResourceHandle())
{
#if WXDEBUG > 1
@@ -725,6 +731,7 @@ void wxDC::DrawText(const wxString& text, long x, long y, bool use16bit)
if (!m_oldFont)
m_oldFont = (WXHFONT) f;
}
#endif
if (m_textForegroundColour.Ok())
SetTextColor((HDC) m_hDC, m_textForegroundColour.GetPixel() ) ;
@@ -838,31 +845,40 @@ bool wxDC::StartDoc(const wxString& message)
if (!this->IsKindOf(CLASSINFO(wxPrinterDC)))
return TRUE;
bool flag = FALSE;
DOCINFO docinfo;
docinfo.cbSize = sizeof(DOCINFO);
docinfo.lpszDocName = (const char *)message;
docinfo.lpszOutput = (const char *)m_filename;
if (m_filename.IsEmpty())
docinfo.lpszOutput = NULL;
else
docinfo.lpszOutput = (const char *)m_filename;
#if defined(__WIN95__)
docinfo.lpszDatatype = NULL;
docinfo.fwType = 0;
#endif
if (m_hDC) flag = (SP_ERROR !=
if (!m_hDC)
return FALSE;
int ret =
#ifndef __WIN32__
::StartDoc((HDC) m_hDC, &docinfo));
::StartDoc((HDC) m_hDC, &docinfo);
#else
#ifdef UNICODE
::StartDocW((HDC) m_hDC, &docinfo));
::StartDocW((HDC) m_hDC, &docinfo);
#else
::StartDocA((HDC) m_hDC, &docinfo));
::StartDocA((HDC) m_hDC, &docinfo);
#endif
#endif
else flag = FALSE;
return flag;
if (ret <= 0)
{
DWORD lastError = GetLastError();
wxDebugMsg("wxDC::StartDoc failed with error: %d\n", lastError);
}
return (ret > 0);
}
void wxDC::EndDoc(void)

12
src/msw/font.cpp
View File

@@ -158,13 +158,9 @@ bool wxFont::RealizeResource(void)
else if (M_FONTDATA->m_weight == wxBOLD)
ff_weight = FW_BOLD;
#if defined(__X__) || (defined(__WXMSW__) && USE_PORTABLE_FONTS_IN_MSW)
ff_face = wxTheFontNameDirectory.GetScreenName(M_FONTDATA->m_family, M_FONTDATA->m_weight, M_FONTDATA->m_style);
#else
ff_face = M_FONTDATA->m_faceName;
if ( ff_face.IsNull() )
ff_face = "";
#endif
const char* pzFace = (const char*) ff_face;
if (!M_FONTDATA->m_faceName.IsNull())
pzFace = (const char*) M_FONTDATA->m_faceName ;
/* Always calculate fonts using the screen DC (is this the best strategy?)
* There may be confusion if a font is selected into a printer
@@ -208,7 +204,7 @@ bool wxFont::RealizeResource(void)
M_FONTDATA->m_hFont = (WXHFONT) CreateFont(nHeight, 0, 0, 0,ff_weight,ff_italic,(BYTE)ff_underline,
0, ANSI_CHARSET, OUT_DEFAULT_PRECIS, CLIP_DEFAULT_PRECIS,
PROOF_QUALITY, DEFAULT_PITCH | ff_family, (ff_face == "" ? NULL : (const char *)ff_face));
PROOF_QUALITY, DEFAULT_PITCH | ff_family, pzFace);
#ifdef WXDEBUG_CREATE
if (m_hFont==NULL) wxError("Cannot create font","Internal Error") ;
#endif

108
src/msw/printwin.cpp
View File

@@ -63,18 +63,18 @@ IMPLEMENT_CLASS(wxWindowsPrintPreview, wxPrintPreviewBase)
wxWindowsPrinter::wxWindowsPrinter(wxPrintData *data):
wxPrinterBase(data)
{
lpAbortProc = (WXFARPROC) MakeProcInstance((FARPROC) wxAbortProc, wxGetInstance());
m_lpAbortProc = (WXFARPROC) MakeProcInstance((FARPROC) wxAbortProc, wxGetInstance());
}
wxWindowsPrinter::~wxWindowsPrinter(void)
{
FreeProcInstance((FARPROC) lpAbortProc);
FreeProcInstance((FARPROC) m_lpAbortProc);
}
bool wxWindowsPrinter::Print(wxWindow *parent, wxPrintout *printout, bool prompt)
{
abortIt = FALSE;
abortWindow = NULL;
sm_abortIt = FALSE;
sm_abortWindow = NULL;
if (!printout)
return FALSE;
@@ -90,42 +90,42 @@ bool wxWindowsPrinter::Print(wxWindow *parent, wxPrintout *printout, bool prompt
if (maxPage == 0)
return FALSE;
printData.SetMinPage(minPage);
printData.SetMaxPage(maxPage);
m_printData.SetMinPage(minPage);
m_printData.SetMaxPage(maxPage);
if (fromPage != 0)
printData.SetFromPage(fromPage);
m_printData.SetFromPage(fromPage);
if (toPage != 0)
printData.SetToPage(toPage);
m_printData.SetToPage(toPage);
if (minPage != 0)
{
printData.EnablePageNumbers(TRUE);
if (printData.GetFromPage() < printData.GetMinPage())
printData.SetFromPage(printData.GetMinPage());
else if (printData.GetFromPage() > printData.GetMaxPage())
printData.SetFromPage(printData.GetMaxPage());
if (printData.GetToPage() > printData.GetMaxPage())
printData.SetToPage(printData.GetMaxPage());
else if (printData.GetToPage() < printData.GetMinPage())
printData.SetToPage(printData.GetMinPage());
m_printData.EnablePageNumbers(TRUE);
if (m_printData.GetFromPage() < m_printData.GetMinPage())
m_printData.SetFromPage(m_printData.GetMinPage());
else if (m_printData.GetFromPage() > m_printData.GetMaxPage())
m_printData.SetFromPage(m_printData.GetMaxPage());
if (m_printData.GetToPage() > m_printData.GetMaxPage())
m_printData.SetToPage(m_printData.GetMaxPage());
else if (m_printData.GetToPage() < m_printData.GetMinPage())
m_printData.SetToPage(m_printData.GetMinPage());
}
else
printData.EnablePageNumbers(FALSE);
m_printData.EnablePageNumbers(FALSE);
// Create a suitable device context
wxDC *dc = NULL;
if (prompt)
{
wxPrintDialog dialog(parent, & printData);
wxPrintDialog dialog(parent, & m_printData);
if (dialog.ShowModal() == wxID_OK)
{
dc = dialog.GetPrintDC();
printData = dialog.GetPrintData();
m_printData = dialog.GetPrintData();
}
}
else
{
dc = new wxPrinterDC("", "", "", FALSE, printData.GetOrientation());
dc = new wxPrinterDC("", "", "", FALSE, m_printData.GetOrientation());
}
// May have pressed cancel.
@@ -173,7 +173,7 @@ bool wxWindowsPrinter::Print(wxWindow *parent, wxPrintout *printout, bool prompt
wxYield();
#if defined(__BORLANDC__) || defined(__GNUWIN32__) || !defined(__WIN32__)
::SetAbortProc((HDC) dc->GetHDC(), (FARPROC) lpAbortProc);
::SetAbortProc((HDC) dc->GetHDC(), (FARPROC) m_lpAbortProc);
#else
::SetAbortProc((HDC) dc->GetHDC(), (int (_stdcall *)
// cast it to right type only if required
@@ -184,7 +184,7 @@ bool wxWindowsPrinter::Print(wxWindow *parent, wxPrintout *printout, bool prompt
#else
()
#endif
)lpAbortProc);
)m_lpAbortProc);
#endif
if (!win)
@@ -193,8 +193,8 @@ bool wxWindowsPrinter::Print(wxWindow *parent, wxPrintout *printout, bool prompt
wxMessageBox("Sorry, could not create an abort dialog.", "Print Error", wxOK, parent);
delete dc;
}
abortWindow = win;
abortWindow->Show(TRUE);
sm_abortWindow = win;
sm_abortWindow->Show(TRUE);
wxYield();
printout->OnBeginPrinting();
@@ -202,22 +202,22 @@ bool wxWindowsPrinter::Print(wxWindow *parent, wxPrintout *printout, bool prompt
bool keepGoing = TRUE;
int copyCount;
for (copyCount = 1; copyCount <= printData.GetNoCopies(); copyCount ++)
for (copyCount = 1; copyCount <= m_printData.GetNoCopies(); copyCount ++)
{
if (!printout->OnBeginDocument(printData.GetFromPage(), printData.GetToPage()))
if (!printout->OnBeginDocument(m_printData.GetFromPage(), m_printData.GetToPage()))
{
wxEndBusyCursor();
wxMessageBox("Could not start printing.", "Print Error", wxOK, parent);
break;
}
if (abortIt)
if (sm_abortIt)
break;
int pn;
for (pn = printData.GetFromPage(); keepGoing && (pn <= printData.GetToPage()) && printout->HasPage(pn);
for (pn = m_printData.GetFromPage(); keepGoing && (pn <= m_printData.GetToPage()) && printout->HasPage(pn);
pn++)
{
if (abortIt)
if (sm_abortIt)
{
keepGoing = FALSE;
break;
@@ -236,11 +236,11 @@ bool wxWindowsPrinter::Print(wxWindow *parent, wxPrintout *printout, bool prompt
printout->OnEndPrinting();
if (abortWindow)
if (sm_abortWindow)
{
abortWindow->Show(FALSE);
delete abortWindow;
abortWindow = NULL;
sm_abortWindow->Show(FALSE);
delete sm_abortWindow;
sm_abortWindow = NULL;
}
wxEndBusyCursor();
@@ -252,13 +252,13 @@ bool wxWindowsPrinter::Print(wxWindow *parent, wxPrintout *printout, bool prompt
bool wxWindowsPrinter::PrintDialog(wxWindow *parent)
{
wxPrintDialog dialog(parent, & printData);
wxPrintDialog dialog(parent, & m_printData);
return (dialog.ShowModal() == wxID_OK);
}
bool wxWindowsPrinter::Setup(wxWindow *parent)
{
wxPrintDialog dialog(parent, & printData);
wxPrintDialog dialog(parent, & m_printData);
dialog.GetPrintData().SetSetupDialog(TRUE);
return (dialog.ShowModal() == wxID_OK);
}
@@ -279,10 +279,10 @@ wxWindowsPrintPreview::~wxWindowsPrintPreview(void)
bool wxWindowsPrintPreview::Print(bool interactive)
{
if (!printPrintout)
if (!m_printPrintout)
return FALSE;
wxWindowsPrinter printer(&printData);
return printer.Print(previewFrame, printPrintout, interactive);
wxWindowsPrinter printer(&m_printData);
return printer.Print(m_previewFrame, m_printPrintout, interactive);
}
void wxWindowsPrintPreview::DetermineScaling(void)
@@ -294,12 +294,12 @@ void wxWindowsPrintPreview::DetermineScaling(void)
// int screenYRes = ::GetDeviceCaps(dc, VERTRES);
int logPPIScreenX = ::GetDeviceCaps(dc, LOGPIXELSX);
int logPPIScreenY = ::GetDeviceCaps(dc, LOGPIXELSY);
previewPrintout->SetPPIScreen(logPPIScreenX, logPPIScreenY);
m_previewPrintout->SetPPIScreen(logPPIScreenX, logPPIScreenY);
::ReleaseDC(NULL, dc);
// Get a device context for the currently selected printer
wxPrinterDC printerDC("", "", "", FALSE, printData.GetOrientation());
wxPrinterDC printerDC("", "", "", FALSE, m_printData.GetOrientation());
int printerWidth = 150;
int printerHeight = 250;
@@ -316,21 +316,21 @@ void wxWindowsPrintPreview::DetermineScaling(void)
int logPPIPrinterX = ::GetDeviceCaps((HDC) printerDC.GetHDC(), LOGPIXELSX);
int logPPIPrinterY = ::GetDeviceCaps((HDC) printerDC.GetHDC(), LOGPIXELSY);
previewPrintout->SetPPIPrinter(logPPIPrinterX, logPPIPrinterY);
previewPrintout->SetPageSizeMM(printerWidth, printerHeight);
m_previewPrintout->SetPPIPrinter(logPPIPrinterX, logPPIPrinterY);
m_previewPrintout->SetPageSizeMM(printerWidth, printerHeight);
if (logPPIPrinterX == 0 || logPPIPrinterY == 0 || printerWidth == 0 || printerHeight == 0)
isOk = FALSE;
m_isOk = FALSE;
}
else
isOk = FALSE;
m_isOk = FALSE;
pageWidth = printerXRes;
pageHeight = printerYRes;
m_pageWidth = printerXRes;
m_pageHeight = printerYRes;
// At 100%, the page should look about page-size on the screen.
previewScale = (float)((float)screenWidth/(float)printerWidth);
previewScale = previewScale * (float)((float)screenXRes/(float)printerYRes);
m_previewScale = (float)((float)screenWidth/(float)printerWidth);
m_previewScale = m_previewScale * (float)((float)screenXRes/(float)printerYRes);
}
/****************************************************************************
@@ -345,19 +345,19 @@ LONG APIENTRY _EXPORT wxAbortProc(HDC WXUNUSED(hPr), int WXUNUSED(Code))
{
MSG msg;
if (!wxPrinterBase::abortWindow) /* If the abort dialog isn't up yet */
if (!wxPrinterBase::sm_abortWindow) /* If the abort dialog isn't up yet */
return(TRUE);
/* Process messages intended for the abort dialog box */
while (!wxPrinterBase::abortIt && PeekMessage(&msg, 0, 0, 0, TRUE))
if (!IsDialogMessage((HWND) wxPrinterBase::abortWindow->GetHWND(), &msg)) {
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 */
return (!wxPrinterBase::abortIt);
return (!wxPrinterBase::sm_abortIt);
}