diff --git a/modules/juce_gui_extra/native/juce_win32_WebBrowserComponent.cpp b/modules/juce_gui_extra/native/juce_win32_WebBrowserComponent.cpp index f72c26ed66..d5e445ae03 100644 --- a/modules/juce_gui_extra/native/juce_win32_WebBrowserComponent.cpp +++ b/modules/juce_gui_extra/native/juce_win32_WebBrowserComponent.cpp @@ -129,13 +129,10 @@ private: DWORD adviseCookie; //============================================================================== - class EventHandler : public ComBaseClassHelper, - public ComponentMovementWatcher + struct EventHandler : public ComBaseClassHelper, + public ComponentMovementWatcher { - public: - EventHandler (WebBrowserComponent& w) : ComponentMovementWatcher (&w), owner (w) - { - } + EventHandler (WebBrowserComponent& w) : ComponentMovementWatcher (&w), owner (w) {} JUCE_COMRESULT GetTypeInfoCount (UINT*) { return E_NOTIMPL; } JUCE_COMRESULT GetTypeInfo (UINT, LCID, ITypeInfo**) { return E_NOTIMPL; } @@ -151,19 +148,21 @@ private: : VARIANT_TRUE; return S_OK; } - else if (dispIdMember == 273 /*DISPID_NEWWINDOW3*/) + + if (dispIdMember == 273 /*DISPID_NEWWINDOW3*/) { owner.newWindowAttemptingToLoad (pDispParams->rgvarg[0].bstrVal); *pDispParams->rgvarg[3].pboolVal = VARIANT_TRUE; - return S_OK; } - else if (dispIdMember == DISPID_DOCUMENTCOMPLETE) + + if (dispIdMember == DISPID_DOCUMENTCOMPLETE) { owner.pageFinishedLoading (getStringFromVariant (pDispParams->rgvarg[0].pvarVal)); return S_OK; } - else if (dispIdMember == 263 /*DISPID_WINDOWCLOSING*/) + + if (dispIdMember == 263 /*DISPID_WINDOWCLOSING*/) { owner.windowCloseRequest();