Compile fixes for Linux

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@33677 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/samples/richedit/wxLayout.cpp b/samples/richedit/wxLayout.cpp
index e6a46a1ea3b2ad3ebda02b665745a1055b38b46b..f20d0fb0f270412f5419244c64289319ab2319d0 100644 (file)
--- a/samples/richedit/wxLayout.cpp
+++ b/samples/richedit/wxLayout.cpp
@@ -519,7 +519,7 @@ void MyFrame::OnPageSetup(wxCommandEvent& WXUNUSED(event))
 #else
    wxGetApp().SetPrintMode(wxPRINT_POSTSCRIPT);
 #endif
-   wxPageSetupData data;
+   wxPageSetupDialogData data;
 
 #if defined(__WXMSW__) || defined(__WXMAC__)
    wxPageSetupDialog pageSetupDialog(this, & data);
@@ -528,7 +528,7 @@ void MyFrame::OnPageSetup(wxCommandEvent& WXUNUSED(event))
 #endif
    pageSetupDialog.ShowModal();
 
-   data = pageSetupDialog.GetPageSetupData();
+   data = pageSetupDialog.GetPageSetupDialogData();
 }
 
 void MyFrame::OnPrintSetupPS(wxCommandEvent& WXUNUSED(event))

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