Moved tools to be a Python package in wxPython.tools, added scripts to

[wxWidgets.git] / wxPython / contrib / iewin / wxactivex.h

diff --git a/wxPython/contrib/iewin/wxactivex.h b/wxPython/contrib/iewin/wxactivex.h
index aa1f16788aeab68718b002c0e999aacf1d779f44..f62ac9830e7824534b4e04417e5221f38e8d8b5d 100644 (file)
--- a/wxPython/contrib/iewin/wxactivex.h
+++ b/wxPython/contrib/iewin/wxactivex.h
@@ -50,7 +50,7 @@ template <class I> class wxAutoOleInterface
        };
 
        // copy constructor
        };
 
        // copy constructor

-    explicit wxAutoOleInterface(const wxAutoOleInterface<I>& ti) : m_interface(NULL)
+    wxAutoOleInterface(const wxAutoOleInterface<I>& ti) : m_interface(NULL)

     {
                operator = (ti);
     }
     {
                operator = (ti);
     }


@@ -362,11 +362,11 @@ public:
     wxVariant& operator[] (wxString name);
 };
 
     wxVariant& operator[] (wxString name);
 };
 

-const wxEventType& RegisterActiveXEvent(wxString eventName);
+const wxEventType& RegisterActiveXEvent(wxChar *eventName);

 
 typedef void (wxEvtHandler::*wxActiveXEventFunction)(wxActiveXEvent&);
 
 
 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);
 
 //util
 bool MSWVariantToVariant(VARIANTARG& va, wxVariant& vx);