Add wxRTTI info and set bestSize
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26654 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
parent
078a0f5444
commit
a78cb66358
@ -85,6 +85,8 @@ BEGIN_EVENT_TABLE(wxActiveX, wxWindow)
|
||||
EVT_KILL_FOCUS(wxActiveX::OnKillFocus)
|
||||
END_EVENT_TABLE()
|
||||
|
||||
IMPLEMENT_CLASS(wxActiveX, wxWindow)
|
||||
|
||||
class wxActiveX;
|
||||
|
||||
class FrameSite :
|
||||
@ -253,6 +255,7 @@ wxWindow(parent, id, pos, size, style, name)
|
||||
m_bAmbientUserMode = true;
|
||||
m_docAdviseCookie = 0;
|
||||
CreateActiveX(clsid);
|
||||
m_bestSize = GetSize();
|
||||
}
|
||||
|
||||
wxActiveX::wxActiveX(wxWindow * parent, const wxString& progId, wxWindowID id,
|
||||
@ -265,6 +268,7 @@ wxActiveX::wxActiveX(wxWindow * parent, const wxString& progId, wxWindowID id,
|
||||
m_bAmbientUserMode = true;
|
||||
m_docAdviseCookie = 0;
|
||||
CreateActiveX((LPOLESTR) (const wchar_t *) progId.wc_str(wxConvUTF8));
|
||||
m_bestSize = GetSize();
|
||||
}
|
||||
|
||||
wxActiveX::~wxActiveX()
|
||||
|
@ -610,6 +610,8 @@ protected:
|
||||
NameMap m_methodNames;
|
||||
|
||||
long MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam);
|
||||
|
||||
DECLARE_CLASS(wxActiveX)
|
||||
};
|
||||
|
||||
// events
|
||||
|
Loading…
Reference in New Issue
Block a user