don't do anything in SetWindowMenu() if we're setting the same menu as we already...

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

diff --git a/include/wx/protocol/file.h b/include/wx/protocol/file.h
index ebd8093d93a8f4da301c1efbf62019aaa060adba..b0e7e003a8b79ebff1f56e01de785a0b1fb6db59 100644 (file)
--- a/include/wx/protocol/file.h
+++ b/include/wx/protocol/file.h
@@ -12,29 +12,26 @@
 #ifndef __WX_PROTO_FILE_H__
 #define __WX_PROTO_FILE_H__
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma interface "sckfile.h"
-#endif
-
 #include "wx/defs.h"
 
 #if wxUSE_PROTOCOL_FILE
 
 #include "wx/protocol/protocol.h"
-#include "wx/url.h"
 
-class WXDLLIMPEXP_NET wxFileProto: public wxProtocol {
-  DECLARE_DYNAMIC_CLASS_NO_COPY(wxFileProto)
-  DECLARE_PROTOCOL(wxFileProto)
-protected:
-  wxProtocolError m_error;
+class WXDLLIMPEXP_NET wxFileProto: public wxProtocol
+{
 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