1. minor fixes in wxDynLib

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

diff --git a/include/wx/protocol/protocol.h b/include/wx/protocol/protocol.h
index b6729536903305abdead539cc9508af24313bbca..ad3cf86f833f2668ce588791568b1b020d371b55 100644 (file)
--- a/include/wx/protocol/protocol.h
+++ b/include/wx/protocol/protocol.h
@@ -15,6 +15,10 @@
 #pragma interface
 #endif
 
 #pragma interface
 #endif
 

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

 #include "wx/object.h"
 #include "wx/string.h"
 #include "wx/stream.h"
 #include "wx/object.h"
 #include "wx/string.h"
 #include "wx/stream.h"


@@ -30,7 +34,7 @@ typedef enum {
  wxPROTO_NOFILE,
  wxPROTO_ABRT,
  wxPROTO_RCNCT,
  wxPROTO_NOFILE,
  wxPROTO_ABRT,
  wxPROTO_RCNCT,

- wxPROTO_STREAMING 
+ wxPROTO_STREAMING

 } wxProtocolError;
 
 // For protocols
 } wxProtocolError;
 
 // For protocols


@@ -53,7 +57,7 @@ protected:
 
   friend class wxURL;
 public:
 
   friend class wxURL;
 public:

-  wxProtoInfo(const char *name, const char *serv_name, const bool need_host1,
+  wxProtoInfo(const wxChar *name, const wxChar *serv_name, const bool need_host1,

               wxClassInfo *info);
 };
 
               wxClassInfo *info);
 };
 


@@ -69,11 +73,13 @@ public:
   virtual bool Abort() = 0;
   virtual wxInputStream *GetInputStream(const wxString& path) = 0;
   virtual wxProtocolError GetError() = 0;
   virtual bool Abort() = 0;
   virtual wxInputStream *GetInputStream(const wxString& path) = 0;
   virtual wxProtocolError GetError() = 0;

-  virtual wxString GetContentType() { return (char *)NULL; }
+  virtual wxString GetContentType() { return wxEmptyString; }

   virtual void SetUser(const wxString& WXUNUSED(user)) {}
   virtual void SetPassword(const wxString& WXUNUSED(passwd) ) {}
 };
 
 wxProtocolError WXDLLEXPORT GetLine(wxSocketBase *sock, wxString& result);
 
   virtual void SetUser(const wxString& WXUNUSED(user)) {}
   virtual void SetPassword(const wxString& WXUNUSED(passwd) ) {}
 };
 
 wxProtocolError WXDLLEXPORT GetLine(wxSocketBase *sock, wxString& result);
 

-#endif
+#endif // wxUSE_SOCKETS
+
+#endif // _WX_PROTOCOL_PROTOCOL_H