Add wxRTTI info and set bestSize

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26654 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/wxPython/contrib/activex/wxie/wxactivex.cpp b/wxPython/contrib/activex/wxie/wxactivex.cpp
index 7738d6ff57e29107e3b05add67266e39baddb9ae..46f372c9ee4f8738e1ea644bf4866eb1cf954038 100644 (file)
--- a/wxPython/contrib/activex/wxie/wxactivex.cpp
+++ b/wxPython/contrib/activex/wxie/wxactivex.cpp
@@ -85,6 +85,8 @@ BEGIN_EVENT_TABLE(wxActiveX, wxWindow)
     EVT_KILL_FOCUS(wxActiveX::OnKillFocus)
 END_EVENT_TABLE()
 
     EVT_KILL_FOCUS(wxActiveX::OnKillFocus)
 END_EVENT_TABLE()
 

+IMPLEMENT_CLASS(wxActiveX, wxWindow)
+    

 class wxActiveX;
 
 class FrameSite : 
 class wxActiveX;
 
 class FrameSite : 


@@ -253,6 +255,7 @@ wxWindow(parent, id, pos, size, style, name)
     m_bAmbientUserMode = true;
     m_docAdviseCookie = 0;
     CreateActiveX(clsid);
     m_bAmbientUserMode = true;
     m_docAdviseCookie = 0;
     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_docAdviseCookie = 0;
     CreateActiveX((LPOLESTR) (const wchar_t *) progId.wc_str(wxConvUTF8));
     m_bAmbientUserMode = true;
     m_docAdviseCookie = 0;
     CreateActiveX((LPOLESTR) (const wchar_t *) progId.wc_str(wxConvUTF8));

+    m_bestSize = GetSize();

 }
 
 wxActiveX::~wxActiveX()
 }
 
 wxActiveX::~wxActiveX()

diff --git a/wxPython/contrib/activex/wxie/wxactivex.h b/wxPython/contrib/activex/wxie/wxactivex.h
index 4b40323708bc460fa39b04484eca17034d3ac0f4..fa1d173aa0d994ed86a3c49baa10e8baa4850786 100644 (file)
--- a/wxPython/contrib/activex/wxie/wxactivex.h
+++ b/wxPython/contrib/activex/wxie/wxactivex.h
@@ -610,6 +610,8 @@ protected:
     NameMap         m_methodNames;
 
     long MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam);
     NameMap         m_methodNames;
 
     long MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam);

+
+    DECLARE_CLASS(wxActiveX)

 };
 
 // events
 };
 
 // events