Compile fix (VC++ 6 doesn't like wxString::Format with only 1 arg: gives several...

[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 6145f48f11d4ed47111f0fe63150549d94520246..dea726397b85a5fc3e1bd9276309b3cefaf1ebb1 100644 (file)
--- a/include/wx/msw/ole/automtn.h
+++ b/include/wx/msw/ole/automtn.h
@@ -9,13 +9,13 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma interface "automtn.h"
-#endif
-

 #ifndef _WX_AUTOMTN_H_
 #define _WX_AUTOMTN_H_
 
 #ifndef _WX_AUTOMTN_H_
 #define _WX_AUTOMTN_H_
 

+#include "wx/defs.h"
+
+#if wxUSE_OLE_AUTOMATION
+

 #include "wx/object.h"
 #include "wx/variant.h"
 
 #include "wx/object.h"
 #include "wx/variant.h"
 


@@ -35,10 +35,10 @@ class WXDLLEXPORT wxAutomationObject: public wxObject
 {
 public:
     wxAutomationObject(WXIDISPATCH* dispatchPtr = NULL);
 {
 public:
     wxAutomationObject(WXIDISPATCH* dispatchPtr = NULL);

-    ~wxAutomationObject();
+    virtual ~wxAutomationObject();

 
     // Set/get dispatch pointer
 
     // Set/get dispatch pointer

-    inline void SetDispatchPtr(WXIDISPATCH* dispatchPtr) { m_dispatchPtr = dispatchPtr; };
+    inline void SetDispatchPtr(WXIDISPATCH* dispatchPtr) { m_dispatchPtr = dispatchPtr; }

     inline WXIDISPATCH* GetDispatchPtr() const { return m_dispatchPtr; }
 
     // Get a dispatch pointer from the current object associated
     inline WXIDISPATCH* GetDispatchPtr() const { return m_dispatchPtr; }
 
     // Get a dispatch pointer from the current object associated


@@ -96,6 +96,6 @@ public:
     DECLARE_NO_COPY_CLASS(wxAutomationObject)
 };
 
     DECLARE_NO_COPY_CLASS(wxAutomationObject)
 };
 

+#endif // wxUSE_OLE_AUTOMATION

 
 

-#endif
-    // _WX_AUTOMTN_H_
+#endif // _WX_AUTOMTN_H_