Fix a number of mingw compile errors.

[wxWidgets.git] / include / wx / protocol / file.h

diff --git a/include/wx/protocol/file.h b/include/wx/protocol/file.h
index 684df8fd7ff1d3e421aa7c6c8cc1fa741c154641..086ef75e3ac8b60f99cace5fcc10696d8c0a4db2 100644 (file)
--- a/include/wx/protocol/file.h
+++ b/include/wx/protocol/file.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        file.h
+// Name:        wx/protocol/file.h

 // Purpose:     File protocol
 // Author:      Guilhem Lavaux
 // Modified by:
 // Purpose:     File protocol
 // Author:      Guilhem Lavaux
 // Modified by:


@@ -12,29 +12,26 @@
 #ifndef __WX_PROTO_FILE_H__
 #define __WX_PROTO_FILE_H__
 
 #ifndef __WX_PROTO_FILE_H__
 #define __WX_PROTO_FILE_H__
 

-#if defined(__GNUG__) && !defined(__APPLE__)
-#pragma interface "sckfile.h"
-#endif
-

 #include "wx/defs.h"
 
 #if wxUSE_PROTOCOL_FILE
 
 #include "wx/protocol/protocol.h"
 #include "wx/defs.h"
 
 #if wxUSE_PROTOCOL_FILE
 
 #include "wx/protocol/protocol.h"

-#include "wx/url.h"

 
 

-class WXDLLEXPORT wxFileProto: public wxProtocol {
-  DECLARE_DYNAMIC_CLASS(wxFileProto)
-  DECLARE_PROTOCOL(wxFileProto)
-protected:
-  wxProtocolError m_error;
+class WXDLLIMPEXP_NET wxFileProto: public wxProtocol
+{

 public:
 public:

-  wxFileProto();
-  ~wxFileProto();
+    wxFileProto();
+    virtual ~wxFileProto();
+
+    bool Abort() { return true; }
+    wxString GetContentType() const { return wxEmptyString; }

 
 

-  wxProtocolError GetError() { return m_error; }
-  bool Abort() { return TRUE; }
-  wxInputStream *GetInputStream(const wxString& path);
+    wxInputStream *GetInputStream(const wxString& path);
+
+protected:
+    DECLARE_DYNAMIC_CLASS_NO_COPY(wxFileProto)
+    DECLARE_PROTOCOL(wxFileProto)

 };
 
 #endif // wxUSE_PROTOCOL_FILE
 };
 
 #endif // wxUSE_PROTOCOL_FILE