]> git.saurik.com Git - wxWidgets.git/blobdiff - include/wx/protocol/protocol.h
Applied patch [ 619705 ] Fixes wxApp::GetComCtl32Version
[wxWidgets.git] / include / wx / protocol / protocol.h
index 1ac98294c83e7acac907a589e926bcb53cec41c8..f4f7997a98d73169b96b31eb2f77a66b0599fcb3 100644 (file)
@@ -6,18 +6,20 @@
 // 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(__APPLE__)
 #pragma interface
 #endif
 
 #include "wx/defs.h"
 
 #pragma interface
 #endif
 
 #include "wx/defs.h"
 
+#if wxUSE_PROTOCOL
+
 #include "wx/object.h"
 #include "wx/string.h"
 #include "wx/stream.h"
 #include "wx/object.h"
 #include "wx/string.h"
 #include "wx/stream.h"
@@ -96,7 +98,15 @@ public: \
   static wxProtoInfo g_proto_##class;
 
 #define IMPLEMENT_PROTOCOL(class, name, serv, host) \
   static wxProtoInfo g_proto_##class;
 
 #define IMPLEMENT_PROTOCOL(class, name, serv, host) \
-wxProtoInfo class::g_proto_##class(name, serv, host, CLASSINFO(class));
+wxProtoInfo class::g_proto_##class(name, serv, host, CLASSINFO(class)); \
+bool wxProtocolUse##class = TRUE;
+
+#define USE_PROTOCOL(class) \
+    extern bool wxProtocolUse##class ; \
+    static struct wxProtocolUserFor##class \
+    { \
+        wxProtocolUserFor##class() { wxProtocolUse##class = TRUE; } \
+    } wxProtocolDoUse##class;
 
 class WXDLLEXPORT wxProtoInfo : public wxObject
 {
 
 class WXDLLEXPORT wxProtoInfo : public wxObject
 {
@@ -117,6 +127,9 @@ protected:
     friend class wxURL;
 
     DECLARE_DYNAMIC_CLASS(wxProtoInfo)
     friend class wxURL;
 
     DECLARE_DYNAMIC_CLASS(wxProtoInfo)
+    DECLARE_NO_COPY_CLASS(wxProtoInfo)
 };
 
 };
 
+#endif // wxUSE_PROTOCOL
+
 #endif // _WX_PROTOCOL_PROTOCOL_H
 #endif // _WX_PROTOCOL_PROTOCOL_H