Removed rundant files, updated readme.txt.

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

diff --git a/src/common/sckfile.cpp b/src/common/sckfile.cpp
index a4487f8df08572220a6d66bce81f784d0f68272d..11134b837379ddcd00b3792db904ed710fc6384b 100644 (file)
--- a/src/common/sckfile.cpp
+++ b/src/common/sckfile.cpp
@@ -16,22 +16,21 @@
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__

-#pragma hdrstop
+  #pragma hdrstop

 #endif
 
 #endif
 

-#if wxUSE_SOCKETS
-

 #ifndef WX_PRECOMP
 #ifndef WX_PRECOMP

+  #include "wx/defs.h"

 #endif
 
 #endif
 

+#if wxUSE_STREAMS && wxUSE_PROTOCOL_FILE
+

 #include <stdio.h>
 #include <stdio.h>

-#include <wx/wfstream.h>
-#include <wx/protocol/file.h>
+#include "wx/wfstream.h"
+#include "wx/protocol/file.h"

 
 

-#if !USE_SHARED_LIBRARY

 IMPLEMENT_DYNAMIC_CLASS(wxFileProto, wxProtocol)
 IMPLEMENT_DYNAMIC_CLASS(wxFileProto, wxProtocol)

-IMPLEMENT_PROTOCOL(wxFileProto, _T("file"), NULL, FALSE)
-#endif
+IMPLEMENT_PROTOCOL(wxFileProto, wxT("file"), NULL, FALSE)

 
 wxFileProto::wxFileProto()
   : wxProtocol()
 
 wxFileProto::wxFileProto()
   : wxProtocol()


@@ -47,5 +46,5 @@ wxInputStream *wxFileProto::GetInputStream(const wxString& path)
   return new wxFileInputStream(path);
 }
 
   return new wxFileInputStream(path);
 }
 

-#endif
-  // wxUSE_SOCKETS
+#endif // wxUSE_STREAMS && wxUSE_PROTOCOL_FILE
+