xti additions / changes, trying to reduce dependencies

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

diff --git a/src/common/sckfile.cpp b/src/common/sckfile.cpp
index 41686d09d8d808c7d93798f53c92cc2c389a6153..5dbc6a0c12e0f711fc3ba8430e0dd263976b0243 100644 (file)
--- a/src/common/sckfile.cpp
+++ b/src/common/sckfile.cpp
@@ -6,9 +6,9 @@
 // Created:     20/07/97
 // RCS-ID:      $Id$
 // Copyright:   (c) 1997, 1998 Guilhem Lavaux
-// Licence:     wxWindows license
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #pragma implementation "sckfile.h"
 #endif
 
@@ -16,21 +16,21 @@
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
-#pragma hdrstop
+  #pragma hdrstop
 #endif
 
 #ifndef WX_PRECOMP
+  #include "wx/defs.h"
 #endif
 
+#if wxUSE_STREAMS && wxUSE_PROTOCOL_FILE
+
 #include <stdio.h>
-#include <stdlib.h>
-#include <wx/fstream.h>
+#include "wx/wfstream.h"
 #include "wx/protocol/file.h"
 
-#if !USE_SHARED_LIBRARY
 IMPLEMENT_DYNAMIC_CLASS(wxFileProto, wxProtocol)
-IMPLEMENT_PROTOCOL(wxFileProto, "file", NULL, FALSE)
-#endif
+IMPLEMENT_PROTOCOL(wxFileProto, wxT("file"), NULL, FALSE)
 
 wxFileProto::wxFileProto()
   : wxProtocol()
@@ -45,3 +45,6 @@ wxInputStream *wxFileProto::GetInputStream(const wxString& path)
 {
   return new wxFileInputStream(path);
 }
+
+#endif // wxUSE_STREAMS && wxUSE_PROTOCOL_FILE
+