X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6de2f8b9da9c738da63e1a431b4d53f070b1599a..b0655a87f40073577bdb8ba4378e5e683a163d44:/src/common/docview.cpp

diff --git a/src/common/docview.cpp b/src/common/docview.cpp
index cb1ddc4380..a7fd1a2209 100644
--- a/src/common/docview.cpp
+++ b/src/common/docview.cpp
@@ -50,10 +50,14 @@
     #include "wx/mdi.h"
 #endif
 
+#if wxUSE_PRINTING_ARCHITECTURE
+  #include "wx/prntbase.h"
+  #include "wx/printdlg.h"
+#endif
+
 #include "wx/msgdlg.h"
 #include "wx/choicdlg.h"
 #include "wx/docview.h"
-#include "wx/printdlg.h"
 #include "wx/confbase.h"
 
 #include <stdio.h>
@@ -240,9 +244,7 @@ bool wxDocument::SaveAs()
         return FALSE;
 
     wxString fileName(tmp);
-    wxString path("");
-    wxString name("");
-    wxString ext("");
+    wxString path, name, ext;
     wxSplitPath(fileName, & path, & name, & ext);
 
     if (ext.IsEmpty() || ext == _T(""))
@@ -669,9 +671,11 @@ BEGIN_EVENT_TABLE(wxDocManager, wxEvtHandler)
     EVT_MENU(wxID_SAVEAS, wxDocManager::OnFileSaveAs)
     EVT_MENU(wxID_UNDO, wxDocManager::OnUndo)
     EVT_MENU(wxID_REDO, wxDocManager::OnRedo)
+#if wxUSE_PRINTING_ARCHITECTURE
     EVT_MENU(wxID_PRINT, wxDocManager::OnPrint)
     EVT_MENU(wxID_PRINT_SETUP, wxDocManager::OnPrintSetup)
     EVT_MENU(wxID_PREVIEW, wxDocManager::OnPreview)
+#endif
 END_EVENT_TABLE()
 
 wxDocManager::wxDocManager(long flags, bool initialize)
@@ -787,6 +791,7 @@ void wxDocManager::OnFileSaveAs(wxCommandEvent& WXUNUSED(event))
 
 void wxDocManager::OnPrint(wxCommandEvent& WXUNUSED(event))
 {
+#if wxUSE_PRINTING_ARCHITECTURE
     wxView *view = GetCurrentView();
     if (!view)
         return;
@@ -799,10 +804,12 @@ void wxDocManager::OnPrint(wxCommandEvent& WXUNUSED(event))
 
         delete printout;
     }
+#endif // wxUSE_PRINTING_ARCHITECTURE
 }
 
 void wxDocManager::OnPrintSetup(wxCommandEvent& WXUNUSED(event))
 {
+#if wxUSE_PRINTING_ARCHITECTURE
     wxWindow *parentWin = wxTheApp->GetTopWindow();
     wxView *view = GetCurrentView();
     if (view)
@@ -813,10 +820,12 @@ void wxDocManager::OnPrintSetup(wxCommandEvent& WXUNUSED(event))
     wxPrintDialog printerDialog(parentWin, & data);
     printerDialog.GetPrintDialogData().SetSetupDialog(TRUE);
     printerDialog.ShowModal();
+#endif // wxUSE_PRINTING_ARCHITECTURE
 }
 
 void wxDocManager::OnPreview(wxCommandEvent& WXUNUSED(event))
 {
+#if wxUSE_PRINTING_ARCHITECTURE
     wxView *view = GetCurrentView();
     if (!view)
         return;
@@ -834,6 +843,7 @@ void wxDocManager::OnPreview(wxCommandEvent& WXUNUSED(event))
         frame->Initialize();
         frame->Show(TRUE);
     }
+#endif // wxUSE_PRINTING_ARCHITECTURE
 }
 
 void wxDocManager::OnUndo(wxCommandEvent& WXUNUSED(event))
@@ -1154,7 +1164,11 @@ wxDocTemplate *wxDocManager::FindTemplateForPath(const wxString& path)
 // template extension.
 
 wxDocTemplate *wxDocManager::SelectDocumentPath(wxDocTemplate **templates,
+#ifdef __WXMSW__
                                                 int noTemplates,
+#else
+                                                int WXUNUSED(noTemplates),
+#endif
                                                 wxString& path,
                                                 long WXUNUSED(flags),
                                                 bool WXUNUSED(save))
@@ -1183,9 +1197,12 @@ wxDocTemplate *wxDocManager::SelectDocumentPath(wxDocTemplate **templates,
 
     int FilterIndex = 0;
     wxString pathTmp = wxFileSelectorEx(_("Select a file"),
-                                        _T(""), _T(""), _T(""),
+                                        _T(""),
+                                        _T(""),
                                         &FilterIndex,
-                                        descrBuf, 0, wxTheApp->GetTopWindow());
+                                        descrBuf,
+                                        0,
+                                        wxTheApp->GetTopWindow());
 
     if (!pathTmp.IsEmpty())
     {