mirror/JUCE
1
0
Fork 0
mirror of https://github.com/juce-framework/JUCE.git synced 2026-02-07 04:10:08 +00:00
Code Activity

Improvements to ComponentMovementWatcher to check visibility. TopLevelWindow activation fix. Changed MidiMessage default constructor to an empty sysex.

Browse source
This commit is contained in:
Julian Storer 2011-01-11 15:37:31 +00:00
parent 5e67b6c7c5
commit e05f6a2b95
22 changed files with 322 additions and 347 deletions
Download patch file Download diff file Expand all files Collapse all files

47
src/native/windows/juce_win32_WebBrowserComponent.cpp
View file

@ -66,7 +66,7 @@ public:
WebBrowserComponent* const owner = dynamic_cast <WebBrowserComponent*> (getParentComponent());
jassert (owner != 0);
EventHandler* handler = new EventHandler (owner);
EventHandler* handler = new EventHandler (*owner);
connectionPoint->Advise (handler, &adviseCookie);
handler->Release();
}
@ -144,8 +144,8 @@ private:
public ComponentMovementWatcher
{
public:
EventHandler (WebBrowserComponent* const owner_)
: ComponentMovementWatcher (owner_),
EventHandler (WebBrowserComponent& owner_)
: ComponentMovementWatcher (&owner_),
owner (owner_)
{
}
@ -158,44 +158,33 @@ private:
HRESULT __stdcall Invoke (DISPID dispIdMember, REFIID /*riid*/, LCID /*lcid*/, WORD /*wFlags*/, DISPPARAMS* pDispParams,
VARIANT* /*pVarResult*/, EXCEPINFO* /*pExcepInfo*/, UINT* /*puArgErr*/)
{
switch (dispIdMember)
if (dispIdMember == DISPID_BEFORENAVIGATE2)
{
case DISPID_BEFORENAVIGATE2:
{
VARIANT* const vurl = pDispParams->rgvarg[5].pvarVal;
VARIANT* const vurl = pDispParams->rgvarg[5].pvarVal;
String url;
String url;
if ((vurl->vt & VT_BYREF) != 0)
url = *vurl->pbstrVal;
else
url = vurl->bstrVal;
if ((vurl->vt & VT_BYREF) != 0)
url = *vurl->pbstrVal;
else
url = vurl->bstrVal;
*pDispParams->rgvarg->pboolVal
= owner.pageAboutToLoad (url) ? VARIANT_FALSE
: VARIANT_TRUE;
*pDispParams->rgvarg->pboolVal
= owner->pageAboutToLoad (url) ? VARIANT_FALSE
: VARIANT_TRUE;
return S_OK;
}
default:
break;
return S_OK;
}
return E_NOTIMPL;
}
void componentMovedOrResized (bool /*wasMoved*/, bool /*wasResized*/) {}
void componentPeerChanged() {}
void componentVisibilityChanged (Component&)
{
owner->visibilityChanged();
}
void componentMovedOrResized (bool, bool ) {}
void componentPeerChanged() {}
void componentVisibilityChanged() { owner.visibilityChanged(); }
//==============================================================================
private:
WebBrowserComponent* const owner;
WebBrowserComponent& owner;
JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (EventHandler);
};