Applied #15375 to stop event-sending in generic wxSpinCtrl ctor (eco)

[wxWidgets.git] / src / common / fs_filter.cpp

diff --git a/src/common/fs_filter.cpp b/src/common/fs_filter.cpp
index bf466d5af3b9b2511ce7e2394dc9ff3bfe696432..5dccb892988af6f3330ac52c4178697979615a2b 100644 (file)
--- a/src/common/fs_filter.cpp
+++ b/src/common/fs_filter.cpp
@@ -1,26 +1,25 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        fs_filter.cpp
+// Name:        src/common/fs_filter.cpp
 // Purpose:     wxFilter file system handler
 // Author:      Mike Wetherell
 // Copyright:   (c) 2006 Mike Wetherell
-// CVS-ID:      $Id$
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
-#pragma hdrstop
+    #pragma hdrstop
 #endif
 
 #if wxUSE_FILESYSTEM
 
 #include "wx/fs_filter.h"
 
-#ifndef WXPRECOMP
+#ifndef WX_PRECOMP
 #endif
 
-#include "wx/ptr_scpd.h"
+#include "wx/scopedptr.h"
 
 wxDEFINE_SCOPED_PTR_TYPE(wxFSFile)
 wxDEFINE_SCOPED_PTR_TYPE(wxInputStream)
@@ -41,7 +40,7 @@ wxFSFile* wxFilterFSHandler::OpenFile(
     wxString right = GetRightLocation(location);
     if (!right.empty())
         return NULL;
-    
+
     wxString protocol = GetProtocol(location);
     const wxFilterClassFactory *factory = wxFilterClassFactory::Find(protocol);
     if (!factory)
@@ -56,11 +55,11 @@ wxFSFile* wxFilterFSHandler::OpenFile(
     if (!leftStream.get() || !leftStream->IsOk())
         return NULL;
 
-    wxInputStreamPtr stream(factory->NewStream(leftStream.get()));
+    wxInputStreamPtr stream(factory->NewStream(leftStream.release()));
 
     // The way compressed streams are supposed to be served is e.g.:
-    //  Content-type: application/postscript 
-    //  Content-encoding: gzip 
+    //  Content-type: application/postscript
+    //  Content-encoding: gzip
     // So the mime type should be just the mime type of the lhs. However check
     // whether the mime type is that of this compression format (e.g.
     // application/gzip). If so pop any extension and try GetMimeTypeFromExt,
@@ -79,7 +78,7 @@ wxFSFile* wxFilterFSHandler::OpenFile(
                        );
 }
 
-wxString wxFilterFSHandler::FindFirst(const wxString& spec, int flags)
+wxString wxFilterFSHandler::FindFirst(const wxString& WXUNUSED(spec), int WXUNUSED(flags))
 {
     return wxEmptyString;
 }