Win compilation fixes

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

diff --git a/user/wxLayout/wxLayout.cpp b/user/wxLayout/wxLayout.cpp
index 504fef1d1f06d676aa6ee6be684b9910aa01a61b..880a1dd6903dc9ee2ef3cb6fdc257eba402b703e 100644 (file)
--- a/user/wxLayout/wxLayout.cpp
+++ b/user/wxLayout/wxLayout.cpp
@@ -228,7 +228,8 @@ void MyFrame::OnCommand( wxCommandEvent &event )
       wxLayoutExportObject *export;
       wxLayoutExportStatus status(m_lwin->GetLayoutList());
 
-      while((export = wxLayoutExport( &status, WXLO_EXPORT_AS_HTML)) != NULL)
+      while((export = wxLayoutExport( &status,
+                                      WXLO_EXPORT_AS_HTML)) != NULL)
       {
          if(export->type == WXLO_EXPORT_HTML)
             cout << *(export->content.text);
@@ -275,9 +276,11 @@ void MyFrame::OnPrintPS(wxCommandEvent& WXUNUSED(event))
 {
    wxGetApp().SetPrintMode(wxPRINT_POSTSCRIPT);
 
+#ifdef OS_UNIX
    wxPostScriptPrinter printer;
    wxLayoutPrintout printout( m_lwin->GetLayoutList(),"My printout");
    printer.Print(this, &printout, TRUE);
+#endif
 }
 
 void MyFrame::OnPrintPreview(wxCommandEvent& WXUNUSED(event))
@@ -371,7 +374,11 @@ void MyFrame::OnPrintSetupPS(wxCommandEvent& WXUNUSED(event))
    wxPrintData data;
    data.SetOrientation(orientation);
 
+#ifdef __WXMSW__
+   wxPrintDialog printerDialog(this, & data);
+#else
    wxGenericPrintDialog printerDialog(this, & data);
+#endif
    printerDialog.GetPrintData().SetSetupDialog(TRUE);
    printerDialog.ShowModal();
 
@@ -385,7 +392,11 @@ void MyFrame::OnPageSetupPS(wxCommandEvent& WXUNUSED(event))
    wxPageSetupData data;
    data.SetOrientation(orientation);
 
+#ifdef __WXMSW__
+   wxPageSetupDialog pageSetupDialog(this, & data);
+#else
    wxGenericPageSetupDialog pageSetupDialog(this, & data);
+#endif
    pageSetupDialog.ShowModal();
 
    orientation = pageSetupDialog.GetPageSetupData().GetOrientation();

diff --git a/user/wxLayout/wxllist.cpp b/user/wxLayout/wxllist.cpp
index 1b92f5cc5d5bdffe7dc557e304eda5e1e3ceb6aa..2181189c6d7bdf5453c508062ffb41483da61596 100644 (file)
--- a/user/wxLayout/wxllist.cpp
+++ b/user/wxLayout/wxllist.cpp
@@ -369,6 +369,8 @@ wxLayoutLine::Insert(CoordType xpos, wxString text)
       wxLayoutObjectText *tobj = (wxLayoutObjectText *) *i;
       tobj->GetText().insert(offset, text);
       m_Length += text.Length();
+
+      return true;
    }
    else
       return Insert(xpos, new wxLayoutObjectText(text));

diff --git a/user/wxLayout/wxlparser.h b/user/wxLayout/wxlparser.h
index f0b07c80300dfcf594d60bae35c174d322d482f4..7aba804790fddd1d853df8e1c616449d903f77cb 100644 (file)
--- a/user/wxLayout/wxlparser.h
+++ b/user/wxLayout/wxlparser.h
@@ -71,7 +71,7 @@ struct wxLayoutExportStatus
 void wxLayoutImportText(wxLayoutList &list, wxString const &str,
                         int withflag = WXLO_EXPORT_WITH_CRLF);
 
-wxLayoutExportObject *wxLayoutExport(wxLayoutList &list,
+wxLayoutExportObject *wxLayoutExport(wxLayoutExportStatus *status,
                                int mode = WXLO_EXPORT_AS_TEXT|WXLO_EXPORT_WITH_CRLF); 
 #else
 /// import text into a wxLayoutList (including linefeeds):