replaced my recent GSocket_SetReuseAddr() addition with GSocket_SetReusable() from...

[wxWidgets.git] / include / wx / msw / ole / automtn.h

diff --git a/include/wx/msw/ole/automtn.h b/include/wx/msw/ole/automtn.h
index f8af91687749173b85979a3c0c3b62dec1d53fb4..669a32eda1cd79e86e07cc60ee1b22edd68ad98d 100644 (file)
--- a/include/wx/msw/ole/automtn.h
+++ b/include/wx/msw/ole/automtn.h
@@ -6,10 +6,10 @@
 // Created:     11/6/98
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998, Julian Smart
-// Licence:     wxWindows Licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #pragma interface "automtn.h"
 #endif
 
@@ -71,7 +71,7 @@ public:
                const wxVariant& arg3 = wxNullVariant, const wxVariant& arg4 = wxNullVariant,
                const wxVariant& arg5 = wxNullVariant, const wxVariant& arg6 = wxNullVariant);
 
-        bool wxAutomationObject::PutPropertyArray(const wxString& property, int noArgs, const wxVariant **args);
+    bool PutPropertyArray(const wxString& property, int noArgs, const wxVariant **args);
     bool PutProperty(const wxString& property, int noArgs, wxVariant args[]) ;
        bool PutProperty(const wxString& property,
                const wxVariant& arg1, const wxVariant& arg2 = wxNullVariant,
@@ -92,6 +92,8 @@ public:
 
 public:
     WXIDISPATCH*  m_dispatchPtr;
+
+    DECLARE_NO_COPY_CLASS(wxAutomationObject)
 };