Fix up NSSlider code to not use class posing and instantiate the proper type (now...

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

diff --git a/include/wx/protocol/protocol.h b/include/wx/protocol/protocol.h
index f1a7780be16de44aae6ce3838cb89996063384aa..a6012c5c9e615e2ff8044424c9df977050b51678 100644 (file)
--- a/include/wx/protocol/protocol.h
+++ b/include/wx/protocol/protocol.h
@@ -12,10 +12,6 @@
 #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_BASE wxProtocol
+class WXDLLIMPEXP_NET wxProtocol
 #if wxUSE_SOCKETS
  : public wxSocketClient
 #else
@@ -82,13 +78,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_BASE GetLine(wxSocketBase *sock, wxString& result);
-#endif
-
 // ----------------------------------------------------------------------------
 // macros for protocol classes
 // ----------------------------------------------------------------------------
@@ -108,7 +100,7 @@ bool wxProtocolUse##class = TRUE;
         wxProtocolUserFor##class() { wxProtocolUse##class = TRUE; } \
     } wxProtocolDoUse##class;
 
-class WXDLLEXPORT_BASE wxProtoInfo : public wxObject
+class WXDLLIMPEXP_NET wxProtoInfo : public wxObject
 {
 public:
     wxProtoInfo(const wxChar *name,