account for scroll offset correctly in the mouse event handler

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

diff --git a/include/wx/protocol/protocol.h b/include/wx/protocol/protocol.h
index d17e4dd6373db16b2ecdd01cdee478839a3de22e..bdf1b5760d0a494dacdfcd463ff3be538781b53a 100644 (file)
--- a/include/wx/protocol/protocol.h
+++ b/include/wx/protocol/protocol.h
@@ -6,16 +6,12 @@
 // Created:     10/07/1997
 // RCS-ID:      $Id$
 // Copyright:   (c) 1997, 1998 Guilhem Lavaux
-// Licence:     wxWindows license
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_PROTOCOL_PROTOCOL_H
 #define _WX_PROTOCOL_PROTOCOL_H
 
-#if defined(__GNUG__) && !defined(__APPLE__)
-#pragma interface
-#endif
-
 #include "wx/defs.h"
 
 #if wxUSE_PROTOCOL
@@ -50,7 +46,7 @@ typedef enum
 // wxProtocol: abstract base class for all protocols
 // ----------------------------------------------------------------------------
 
-class WXDLLEXPORT wxProtocol
+class WXDLLIMPEXP_NET wxProtocol
 #if wxUSE_SOCKETS
  : public wxSocketClient
 #else
@@ -63,7 +59,8 @@ public:
 #if wxUSE_SOCKETS
     bool Reconnect();
     virtual bool Connect( const wxString& WXUNUSED(host) ) { return FALSE; }
-    virtual bool Connect( wxSockAddress& addr, bool WXUNUSED(wait) = TRUE) { return wxSocketClient::Connect(addr); }
+    virtual bool Connect( const wxSockAddress& addr, bool WXUNUSED(wait) = TRUE)
+        { return wxSocketClient::Connect(addr); }
 
     // read a '\r\n' terminated line from the given socket and put it in
     // result (without the terminators)
@@ -82,13 +79,9 @@ public:
     virtual void SetPassword(const wxString& WXUNUSED(passwd) ) {}
 
 private:
-    DECLARE_ABSTRACT_CLASS(wxProtocol)
+    DECLARE_DYNAMIC_CLASS_NO_COPY(wxProtocol)
 };
 
-#if wxUSE_SOCKETS
-wxProtocolError WXDLLEXPORT GetLine(wxSocketBase *sock, wxString& result);
-#endif
-
 // ----------------------------------------------------------------------------
 // macros for protocol classes
 // ----------------------------------------------------------------------------
@@ -108,7 +101,7 @@ bool wxProtocolUse##class = TRUE;
         wxProtocolUserFor##class() { wxProtocolUse##class = TRUE; } \
     } wxProtocolDoUse##class;
 
-class WXDLLEXPORT wxProtoInfo : public wxObject
+class WXDLLIMPEXP_NET wxProtoInfo : public wxObject
 {
 public:
     wxProtoInfo(const wxChar *name,
@@ -127,6 +120,7 @@ protected:
     friend class wxURL;
 
     DECLARE_DYNAMIC_CLASS(wxProtoInfo)
+    DECLARE_NO_COPY_CLASS(wxProtoInfo)
 };
 
 #endif // wxUSE_PROTOCOL