Add wxRTTI and OOR info for activex classes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@31252 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -240,6 +240,9 @@ class wxActiveXWindow : public wxActiveX
|
|||||||
{
|
{
|
||||||
private:
|
private:
|
||||||
CLSID m_CLSID;
|
CLSID m_CLSID;
|
||||||
|
|
||||||
|
DECLARE_ABSTRACT_CLASS(wxActiveXWindow);
|
||||||
|
|
||||||
public:
|
public:
|
||||||
wxActiveXWindow( wxWindow* parent, const CLSID& clsId, wxWindowID id = -1,
|
wxActiveXWindow( wxWindow* parent, const CLSID& clsId, wxWindowID id = -1,
|
||||||
const wxPoint& pos = wxDefaultPosition,
|
const wxPoint& pos = wxDefaultPosition,
|
||||||
@@ -497,6 +500,8 @@ public:
|
|||||||
return rval;
|
return rval;
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
IMPLEMENT_ABSTRACT_CLASS( wxActiveXWindow, wxWindow );
|
||||||
%}
|
%}
|
||||||
|
|
||||||
|
|
||||||
@@ -861,6 +866,8 @@ class wxIEHtmlWindowBase : public wxActiveXWindow {
|
|||||||
private:
|
private:
|
||||||
wxAutoOleInterface<IWebBrowser2> m_webBrowser;
|
wxAutoOleInterface<IWebBrowser2> m_webBrowser;
|
||||||
|
|
||||||
|
DECLARE_ABSTRACT_CLASS(wxIEHtmlWindowBase);
|
||||||
|
|
||||||
public:
|
public:
|
||||||
|
|
||||||
wxIEHtmlWindowBase ( wxWindow* parent, const CLSID& clsId, wxWindowID id = -1,
|
wxIEHtmlWindowBase ( wxWindow* parent, const CLSID& clsId, wxWindowID id = -1,
|
||||||
@@ -1043,6 +1050,9 @@ public:
|
|||||||
// return ! m_bAmbientUserMode;
|
// return ! m_bAmbientUserMode;
|
||||||
// };
|
// };
|
||||||
};
|
};
|
||||||
|
|
||||||
|
IMPLEMENT_ABSTRACT_CLASS( wxIEHtmlWindowBase, wxActiveXWindow );
|
||||||
|
|
||||||
%}
|
%}
|
||||||
|
|
||||||
|
|
||||||
@@ -1059,6 +1069,7 @@ MustHaveApp(wxIEHtmlWindowBase);
|
|||||||
|
|
||||||
class wxIEHtmlWindowBase : public wxActiveXWindow {
|
class wxIEHtmlWindowBase : public wxActiveXWindow {
|
||||||
public:
|
public:
|
||||||
|
%pythonAppend wxIEHtmlWindowBase "self._setOORInfo(self)"
|
||||||
|
|
||||||
wxIEHtmlWindowBase ( wxWindow* parent, const CLSID& clsId, wxWindowID id = -1,
|
wxIEHtmlWindowBase ( wxWindow* parent, const CLSID& clsId, wxWindowID id = -1,
|
||||||
const wxPoint& pos = wxDefaultPosition,
|
const wxPoint& pos = wxDefaultPosition,
|
||||||
|
@@ -441,6 +441,8 @@ class IEHtmlWindowBase(ActiveXWindow):
|
|||||||
self.this = newobj.this
|
self.this = newobj.this
|
||||||
self.thisown = 1
|
self.thisown = 1
|
||||||
del newobj.thisown
|
del newobj.thisown
|
||||||
|
self._setOORInfo(self)
|
||||||
|
|
||||||
def SetCharset(*args, **kwargs): return _activex.IEHtmlWindowBase_SetCharset(*args, **kwargs)
|
def SetCharset(*args, **kwargs): return _activex.IEHtmlWindowBase_SetCharset(*args, **kwargs)
|
||||||
def LoadString(*args, **kwargs): return _activex.IEHtmlWindowBase_LoadString(*args, **kwargs)
|
def LoadString(*args, **kwargs): return _activex.IEHtmlWindowBase_LoadString(*args, **kwargs)
|
||||||
def LoadStream(*args, **kwargs): return _activex.IEHtmlWindowBase_LoadStream(*args, **kwargs)
|
def LoadStream(*args, **kwargs): return _activex.IEHtmlWindowBase_LoadStream(*args, **kwargs)
|
||||||
|
File diff suppressed because one or more lines are too long
Reference in New Issue
Block a user