Compile fixes for Linux

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@33677 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2005-04-16 19:19:22 +00:00
parent 95ba86d706
commit a1d2d6b1e8
2 changed files with 6 additions and 4 deletions

View File

@@ -519,7 +519,7 @@ void MyFrame::OnPageSetup(wxCommandEvent& WXUNUSED(event))
#else #else
wxGetApp().SetPrintMode(wxPRINT_POSTSCRIPT); wxGetApp().SetPrintMode(wxPRINT_POSTSCRIPT);
#endif #endif
wxPageSetupData data; wxPageSetupDialogData data;
#if defined(__WXMSW__) || defined(__WXMAC__) #if defined(__WXMSW__) || defined(__WXMAC__)
wxPageSetupDialog pageSetupDialog(this, & data); wxPageSetupDialog pageSetupDialog(this, & data);
@@ -528,7 +528,7 @@ void MyFrame::OnPageSetup(wxCommandEvent& WXUNUSED(event))
#endif #endif
pageSetupDialog.ShowModal(); pageSetupDialog.ShowModal();
data = pageSetupDialog.GetPageSetupData(); data = pageSetupDialog.GetPageSetupDialogData();
} }
void MyFrame::OnPrintSetupPS(wxCommandEvent& WXUNUSED(event)) void MyFrame::OnPrintSetupPS(wxCommandEvent& WXUNUSED(event))

View File

@@ -3303,10 +3303,12 @@ void wxLayoutPrintout::GetPageInfo(int *minPage, int *maxPage, int *selPageFrom,
/* We allocate a temporary wxDC for printing, so that we can /* We allocate a temporary wxDC for printing, so that we can
determine the correct paper size and scaling. We don't actually determine the correct paper size and scaling. We don't actually
print anything on it. */ print anything on it. */
#if defined(__WXMSW__) #if defined(__WXMSW__) || defined(__WXMAC__)
wxPrinterDC *psdc = new wxPrinterDC(wxEmptyString,wxEmptyString,_T(WXLLIST_TEMPFILE),false); wxPrinterDC *psdc = new wxPrinterDC(wxEmptyString,wxEmptyString,_T(WXLLIST_TEMPFILE),false);
#else #else
wxPostScriptDC *psdc = new wxPostScriptDC(WXLLIST_TEMPFILE,false); wxPrintData data;
data.SetFilename(WXLLIST_TEMPFILE);
wxPostScriptDC *psdc = new wxPostScriptDC(data);
#endif #endif
psdc->StartDoc(m_title); psdc->StartDoc(m_title);