fixed wxlib Mach-O debug and release compilation

[wxWidgets.git] / wxPython / contrib / activex / wxie / wxactivex.cpp

diff --git a/wxPython/contrib/activex/wxie/wxactivex.cpp b/wxPython/contrib/activex/wxie/wxactivex.cpp
index 46f372c9ee4f8738e1ea644bf4866eb1cf954038..3ef27da80b869aa13c46ee86cb968c9f4aed1b6a 100644 (file)
--- a/wxPython/contrib/activex/wxie/wxactivex.cpp
+++ b/wxPython/contrib/activex/wxie/wxactivex.cpp
@@ -255,7 +255,6 @@ 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,
@@ -268,7 +267,6 @@ 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()
@@ -417,7 +415,7 @@ void wxActiveX::CreateActiveX(REFCLSID clsid)
         // Update by GBR to resize older controls
         wxSizeEvent szEvent;
         szEvent.m_size = wxSize(w, h) ;
-        AddPendingEvent(szEvent);
+        GetEventHandler()->AddPendingEvent(szEvent);
     };
 }
 
@@ -911,7 +909,7 @@ public:
         if (func.hasOut)
         {
             int nArg = min(func.params.size(), pDispParams->cArgs);
-            m_activeX->GetParent()->ProcessEvent(event);
+            m_activeX->GetEventHandler()->ProcessEvent(event);
             for (int i = 0; i < nArg; i++)
             {
                 VARIANTARG& va = pDispParams->rgvarg[i];
@@ -926,7 +924,7 @@ public:
             };
         }
         else
-            m_activeX->GetParent()->AddPendingEvent(event);
+            m_activeX->GetEventHandler()->AddPendingEvent(event);
 
     };