switched to using wxPopupWindow

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

diff --git a/include/wx/protocol/protocol.h b/include/wx/protocol/protocol.h
index a98c0527db5ca7229f107db4544df2e290495c47..8d7648503295907c9f0ee7f6cc41f15ac494dfc1 100644 (file)
--- a/include/wx/protocol/protocol.h
+++ b/include/wx/protocol/protocol.h
@@ -6,13 +6,13 @@
 // Created:     10/07/1997
 // RCS-ID:      $Id$
 // Copyright:   (c) 1997, 1998 Guilhem Lavaux
 // 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
 
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_PROTOCOL_PROTOCOL_H
 #define _WX_PROTOCOL_PROTOCOL_H
 

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

 #pragma interface
 #endif
 
 #pragma interface
 #endif
 


@@ -50,7 +50,7 @@ typedef enum
 // wxProtocol: abstract base class for all protocols
 // ----------------------------------------------------------------------------
 
 // wxProtocol: abstract base class for all protocols
 // ----------------------------------------------------------------------------
 

-class WXDLLEXPORT wxProtocol
+class WXDLLIMPEXP_NET wxProtocol

 #if wxUSE_SOCKETS
  : public wxSocketClient
 #else
 #if wxUSE_SOCKETS
  : public wxSocketClient
 #else


@@ -82,11 +82,11 @@ public:
     virtual void SetPassword(const wxString& WXUNUSED(passwd) ) {}
 
 private:
     virtual void SetPassword(const wxString& WXUNUSED(passwd) ) {}
 
 private:

-    DECLARE_ABSTRACT_CLASS(wxProtocol)
+    DECLARE_DYNAMIC_CLASS_NO_COPY(wxProtocol)

 };
 
 #if wxUSE_SOCKETS
 };
 
 #if wxUSE_SOCKETS

-wxProtocolError WXDLLEXPORT GetLine(wxSocketBase *sock, wxString& result);
+wxProtocolError WXDLLIMPEXP_NET GetLine(wxSocketBase *sock, wxString& result);

 #endif
 
 // ----------------------------------------------------------------------------
 #endif
 
 // ----------------------------------------------------------------------------


@@ -108,7 +108,7 @@ bool wxProtocolUse##class = TRUE;
         wxProtocolUserFor##class() { wxProtocolUse##class = TRUE; } \
     } wxProtocolDoUse##class;
 
         wxProtocolUserFor##class() { wxProtocolUse##class = TRUE; } \
     } wxProtocolDoUse##class;
 

-class WXDLLEXPORT wxProtoInfo : public wxObject
+class WXDLLIMPEXP_NET wxProtoInfo : public wxObject

 {
 public:
     wxProtoInfo(const wxChar *name,
 {
 public:
     wxProtoInfo(const wxChar *name,


@@ -127,6 +127,7 @@ protected:
     friend class wxURL;
 
     DECLARE_DYNAMIC_CLASS(wxProtoInfo)
     friend class wxURL;
 
     DECLARE_DYNAMIC_CLASS(wxProtoInfo)

+    DECLARE_NO_COPY_CLASS(wxProtoInfo)

 };
 
 #endif // wxUSE_PROTOCOL
 };
 
 #endif // wxUSE_PROTOCOL