diff --git a/include/wx/window.h b/include/wx/window.h
index e0779b8b16..5edeba5569 100644
--- a/include/wx/window.h
+++ b/include/wx/window.h
@@ -424,7 +424,7 @@ public:
     virtual void Clear() = 0;
 
         // adjust DC for drawing on this window
-    virtual void PrepareDC( wxDC &dc ) { }
+    virtual void PrepareDC( wxDC & WXUNUSED(dc) ) { }
 
         // the update region of the window contains the areas which must be
         // repainted by the program
diff --git a/src/common/docview.cpp b/src/common/docview.cpp
index a7a157adbc..2ea1501dda 100644
--- a/src/common/docview.cpp
+++ b/src/common/docview.cpp
@@ -1154,7 +1154,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))