X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/83a732882adf32f93d25cd7e3a0ad20f7231ec49..f6f98ecccd755993c8ba6354281fad271917be25:/wxPython/contrib/iewin/wxactivex.h

diff --git a/wxPython/contrib/iewin/wxactivex.h b/wxPython/contrib/iewin/wxactivex.h
index aa1f16788a..f62ac9830e 100644
--- a/wxPython/contrib/iewin/wxactivex.h
+++ b/wxPython/contrib/iewin/wxactivex.h
@@ -50,7 +50,7 @@ template <class I> class wxAutoOleInterface
 	};
 
 	// copy constructor
-    explicit wxAutoOleInterface(const wxAutoOleInterface<I>& ti) : m_interface(NULL)
+    wxAutoOleInterface(const wxAutoOleInterface<I>& ti) : m_interface(NULL)
     {
 		operator = (ti);
     }
@@ -362,11 +362,11 @@ public:
     wxVariant& operator[] (wxString name);
 };
 
-const wxEventType& RegisterActiveXEvent(wxString eventName);
+const wxEventType& RegisterActiveXEvent(wxChar *eventName);
 
 typedef void (wxEvtHandler::*wxActiveXEventFunction)(wxActiveXEvent&);
 
-#define EVT_ACTIVEX(id, eventName, fn) DECLARE_EVENT_TABLE_ENTRY(RegisterActiveXEvent(eventName), id, -1, (wxObjectEventFunction) (wxEventFunction) (wxActiveXEventFunction) & fn, (wxObject *) NULL ),
+#define EVT_ACTIVEX(id, eventName, fn) DECLARE_EVENT_TABLE_ENTRY(RegisterActiveXEvent(wxT(eventName)), id, -1, (wxObjectEventFunction) (wxEventFunction) (wxActiveXEventFunction) & fn, (wxObject *) NULL ),
 
 //util
 bool MSWVariantToVariant(VARIANTARG& va, wxVariant& vx);