wxNativeFontInfo changes

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

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

-#pragma hdrstop
+  #pragma hdrstop

 #endif
 
 #ifndef WX_PRECOMP
 #endif
 
 #ifndef WX_PRECOMP

+  #include "wx/defs.h"

 #endif
 
 #endif
 

+#if wxUSE_STREAMS
+

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

-#include <stdlib.h>
-#include <wx/fstream.h>
+#include "wx/wfstream.h"

 #include "wx/protocol/file.h"
 
 #include "wx/protocol/file.h"
 

-#if !USE_SHARED_LIBRARY

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

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

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


@@ -45,3 +45,6 @@ wxInputStream *wxFileProto::GetInputStream(const wxString& path)
 {
   return new wxFileInputStream(path);
 }
 {
   return new wxFileInputStream(path);
 }

+
+#endif
+