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

compilation fix for VC6 after last change; use wx naming conventions

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@58411 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2009-01-25 18:55:22 +00:00
parent e92b9e696c
commit da58c4e6a0
1 changed files with 20 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/msw/ole/activex.cpp
View File

@@ -699,8 +699,7 @@ public:
// wxVariants containing a void* to this variables are 'empty' in the sense // wxVariants containing a void* to this variables are 'empty' in the sense
// that the actual ActiveX OLE parameter has not been converted and inserted // that the actual ActiveX OLE parameter has not been converted and inserted
// into m_params. // into m_params.
static const int ptr_invalid_entry_marker = 0; static wxVariant ms_invalidEntryMarker;
static wxVariant g_invalid_entry_marker;
wxActiveXEvents(wxActiveXContainer *ax) : m_activeX(ax), m_haveCustomId(false) {} wxActiveXEvents(wxActiveXContainer *ax) : m_activeX(ax), m_haveCustomId(false) {}
wxActiveXEvents(wxActiveXContainer *ax, REFIID iid) : m_activeX(ax), m_customId(iid), m_haveCustomId(true) {} wxActiveXEvents(wxActiveXContainer *ax, REFIID iid) : m_activeX(ax), m_customId(iid), m_haveCustomId(true) {}
@@ -766,8 +765,8 @@ public:
if (params_index < event.m_params.GetCount()) { if (params_index < event.m_params.GetCount()) {
wxVariant &vx = event.m_params[params_index]; wxVariant &vx = event.m_params[params_index];
// copy the result back to pDispParams only if the event has been accessed // copy the result back to pDispParams only if the event has been accessed
// i.e. if vx != g_invalid_entry_marker // i.e. if vx != ms_invalidEntryMarker
if (!vx.IsType(wxActiveXEvents::g_invalid_entry_marker.GetType()) || vx!=g_invalid_entry_marker) { if (!vx.IsType(wxActiveXEvents::ms_invalidEntryMarker.GetType()) || vx!=ms_invalidEntryMarker) {
VARIANTARG& va = pDispParams->rgvarg[i]; VARIANTARG& va = pDispParams->rgvarg[i];
wxConvertVariantToOle(vx, va); wxConvertVariantToOle(vx, va);
} }
@@ -781,7 +780,13 @@ public:
} }
}; };
wxVariant wxActiveXEvents::g_invalid_entry_marker((void*)&wxActiveXEvents::ptr_invalid_entry_marker); namespace
{
// just a unique global variable
const int invalid_entry_marker = 0;
}
wxVariant wxActiveXEvents::ms_invalidEntryMarker((void*)&invalid_entry_marker);
size_t wxActiveXEvent::ParamCount() const size_t wxActiveXEvent::ParamCount() const
{ {
@@ -802,12 +807,17 @@ wxVariant &wxActiveXEvent::operator [](size_t idx)
// 'native' will always be != if the event has been created // 'native' will always be != if the event has been created
// for an actual active X event. // for an actual active X event.
// But it may be zero if the event has been created by wx program code. // But it may be zero if the event has been created by wx program code.
if (native) { if (native)
while (m_params.GetCount()<=idx) { {
m_params.Append(wxActiveXEvents::g_invalid_entry_marker); while ( m_params.GetCount()<=idx )
{
m_params.Append(wxActiveXEvents::ms_invalidEntryMarker);
} }
wxVariant &vx(m_params[idx]);
if (vx.IsType(wxActiveXEvents::g_invalid_entry_marker.GetType()) && vx==wxActiveXEvents::g_invalid_entry_marker) { wxVariant& vx = m_params[idx];
if ( vx.IsType(wxActiveXEvents::ms_invalidEntryMarker.GetType()) &&
vx == wxActiveXEvents::ms_invalidEntryMarker)
{
// copy the _real_ parameter into this one // copy the _real_ parameter into this one
// NOTE: m_params stores the parameters in *reverse* order. // NOTE: m_params stores the parameters in *reverse* order.
// Whyever, but this was the case in the original implementation of // Whyever, but this was the case in the original implementation of
@@ -825,7 +835,6 @@ bool wxActiveXEventsInterface(wxActiveXEvents *self, REFIID iid, void **_interfa
{ {
if (self->m_haveCustomId && IsEqualIID(iid, self->m_customId)) if (self->m_haveCustomId && IsEqualIID(iid, self->m_customId))
{ {
// WXOLE_TRACE("Found Custom Dispatch Interface");
*_interface = (IUnknown *) (IDispatch *) self; *_interface = (IUnknown *) (IDispatch *) self;
desc = "Custom Dispatch Interface"; desc = "Custom Dispatch Interface";
return true; return true;