Added __WXMAC_OSX__ guards around the CFRunLoop calls, CFRunLoop not available on...

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

diff --git a/include/wx/protocol/file.h b/include/wx/protocol/file.h
index 773cdcc5b2151b52054f1f373b376110bbc98800..ebd8093d93a8f4da301c1efbf62019aaa060adba 100644 (file)
--- a/include/wx/protocol/file.h
+++ b/include/wx/protocol/file.h
@@ -6,20 +6,25 @@
 // Created:     1997
 // RCS-ID:      $Id$
 // Copyright:   (c) 1997, 1998 Guilhem Lavaux
 // Created:     1997
 // RCS-ID:      $Id$
 // Copyright:   (c) 1997, 1998 Guilhem Lavaux

-// Licence:     wxWindows license
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

+

 #ifndef __WX_PROTO_FILE_H__
 #define __WX_PROTO_FILE_H__
 
 #ifndef __WX_PROTO_FILE_H__
 #define __WX_PROTO_FILE_H__
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

 #pragma interface "sckfile.h"
 #endif
 
 #pragma interface "sckfile.h"
 #endif
 

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

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

-class WXDLLEXPORT wxFileProto: public wxProtocol {
-  DECLARE_DYNAMIC_CLASS(wxFileProto)
+class WXDLLIMPEXP_NET wxFileProto: public wxProtocol {
+  DECLARE_DYNAMIC_CLASS_NO_COPY(wxFileProto)

   DECLARE_PROTOCOL(wxFileProto)
 protected:
   wxProtocolError m_error;
   DECLARE_PROTOCOL(wxFileProto)
 protected:
   wxProtocolError m_error;


@@ -32,4 +37,6 @@ public:
   wxInputStream *GetInputStream(const wxString& path);
 };
 
   wxInputStream *GetInputStream(const wxString& path);
 };
 

-#endif
+#endif // wxUSE_PROTOCOL_FILE
+
+#endif // __WX_PROTO_FILE_H__