Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add wxRTTI info and set bestSize

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26654 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
2004-04-07 21:22:24 +00:00
parent 078a0f5444
commit a78cb66358
2 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
wxPython/contrib/activex/wxie/wxactivex.cpp
View File

@@ -85,6 +85,8 @@ BEGIN_EVENT_TABLE(wxActiveX, wxWindow)
EVT_KILL_FOCUS(wxActiveX::OnKillFocus) EVT_KILL_FOCUS(wxActiveX::OnKillFocus)
END_EVENT_TABLE() END_EVENT_TABLE()
IMPLEMENT_CLASS(wxActiveX, wxWindow)
class wxActiveX; class wxActiveX;
class FrameSite : class FrameSite :
@@ -253,6 +255,7 @@ wxWindow(parent, id, pos, size, style, name)
m_bAmbientUserMode = true; m_bAmbientUserMode = true;
m_docAdviseCookie = 0; m_docAdviseCookie = 0;
CreateActiveX(clsid); CreateActiveX(clsid);
m_bestSize = GetSize();
} }
wxActiveX::wxActiveX(wxWindow * parent, const wxString& progId, wxWindowID id, 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_bAmbientUserMode = true;
m_docAdviseCookie = 0; m_docAdviseCookie = 0;
CreateActiveX((LPOLESTR) (const wchar_t *) progId.wc_str(wxConvUTF8)); CreateActiveX((LPOLESTR) (const wchar_t *) progId.wc_str(wxConvUTF8));
m_bestSize = GetSize();
} }
wxActiveX::~wxActiveX() wxActiveX::~wxActiveX()

2
wxPython/contrib/activex/wxie/wxactivex.h
View File

@@ -610,6 +610,8 @@ protected:
NameMap m_methodNames; NameMap m_methodNames;
long MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam); long MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam);
DECLARE_CLASS(wxActiveX)
}; };
// events // events