DEFINE_GUID(wxIID_IInternetProtocolRoot,0x79eac9e3,0xbaf9,0x11ce,0x8c,0x82,0,0xaa,0,0x4b,0xa9,0xb);
DEFINE_GUID(wxIID_IInternetProtocol,0x79eac9e4,0xbaf9,0x11ce,0x8c,0x82,0,0xaa,0,0x4b,0xa9,0xb);
DEFINE_GUID(wxIID_IDocHostUIHandler, 0xbd3f23c0, 0xd43e, 0x11cf, 0x89, 0x3b, 0x00, 0xaa, 0x00, 0xbd, 0xce, 0x1a);
+DEFINE_GUID(wxIID_IHTMLElement2,0x3050f434,0x98b5,0x11cf,0xbb,0x82,0,0xaa,0,0xbd,0xce,0x0b);
+DEFINE_GUID(wxIID_IMarkupServices,0x3050f4a0,0x98b5,0x11cf,0xbb,0x82,0,0xaa,0,0xbd,0xce,0x0b);
+DEFINE_GUID(wxIID_IMarkupContainer,0x3050f5f9,0x98b5,0x11cf,0xbb,0x82,0,0xaa,0,0xbd,0xce,0x0b);
+
+enum //Internal find flags
+{
+ wxWEB_VIEW_FIND_ADD_POINTERS = 0x0001,
+ wxWEB_VIEW_FIND_REMOVE_HIGHLIGHT = 0x0002
+};
}
m_historyEnabled = true;
m_historyPosition = -1;
m_zoomType = wxWEB_VIEW_ZOOM_TYPE_TEXT;
+ FindClear();
if (::CoCreateInstance(CLSID_WebBrowser, NULL,
CLSCTX_INPROC_SERVER, // CLSCTX_INPROC,
m_webBrowser->put_RegisterAsDropTarget(VARIANT_TRUE);
m_uiHandler = new DocHostUIHandler;
- m_uiHandler->AddRef();
m_container = new wxIEContainer(this, IID_IWebBrowser2, m_webBrowser, m_uiHandler);
wxWebViewIE::~wxWebViewIE()
{
- for(unsigned int i = 0; i < m_factories.size(); i++)
+ wxDynamicLibrary urlMon(wxT("urlmon.dll"));
+ if(urlMon.HasSymbol(wxT("CoInternetGetSession")))
{
- m_factories[i]->Release();
- }
+ typedef HRESULT (WINAPI *CoInternetGetSession_t)(DWORD,
+ wxIInternetSession**,
+ DWORD);
+ wxDYNLIB_FUNCTION(CoInternetGetSession_t, CoInternetGetSession, urlMon);
- m_uiHandler->Release();
+ wxIInternetSession* session;
+ HRESULT res = (*pfnCoInternetGetSession)(0, &session, 0);
+ if(FAILED(res))
+ {
+ wxFAIL_MSG("Could not retrive internet session");
+ }
+
+ for(unsigned int i = 0; i < m_factories.size(); i++)
+ {
+ session->UnregisterNameSpace(m_factories[i],
+ (m_factories[i]->GetName()).wc_str());
+ m_factories[i]->Release();
+ }
+ }
+ FindClear();
}
void wxWebViewIE::LoadURL(const wxString& url)
m_ie.CallMethod("Navigate", wxConvertStringToOle(url));
}
-void wxWebViewIE::SetPage(const wxString& html, const wxString& baseUrl)
+void wxWebViewIE::DoSetPage(const wxString& html, const wxString& baseUrl)
{
BSTR bstr = SysAllocString(OLESTR(""));
SAFEARRAY *psaStrings = SafeArrayCreateVector(VT_VARIANT, 0, 1);
hr = SafeArrayUnaccessData(psaStrings);
- IHTMLDocument2* document = GetDocument();
+ wxCOMPtr<IHTMLDocument2> document(GetDocument());
if(!document)
return;
document->write(psaStrings);
document->close();
- document->Release();
SafeArrayDestroy(psaStrings);
return;
document->write(psaStrings);
- document->Release();
// SafeArrayDestroy calls SysFreeString for each BSTR
SafeArrayDestroy(psaStrings);
wxString wxWebViewIE::GetPageSource() const
{
- IHTMLDocument2* document = GetDocument();
+ wxCOMPtr<IHTMLDocument2> document(GetDocument());
if(document)
{
- IHTMLElement *bodyTag = NULL;
- IHTMLElement *htmlTag = NULL;
+ wxCOMPtr<IHTMLElement> bodyTag;
+ wxCOMPtr<IHTMLElement> htmlTag;
wxString source;
HRESULT hr = document->get_body(&bodyTag);
if(SUCCEEDED(hr))
BSTR bstr;
htmlTag->get_outerHTML(&bstr);
source = wxString(bstr);
- htmlTag->Release();
}
- bodyTag->Release();
}
-
- document->Release();
return source;
}
else
wxString wxWebViewIE::GetCurrentTitle() const
{
- IHTMLDocument2* document = GetDocument();
+ wxCOMPtr<IHTMLDocument2> document(GetDocument());
if(document)
{
BSTR title;
document->get_nameProp(&title);
- document->Release();
return wxString(title);
}
else
ExecCommand("Redo");
}
+long wxWebViewIE::Find(const wxString& text, int flags)
+{
+ //If the text is empty then we clear.
+ if(text.IsEmpty())
+ {
+ ClearSelection();
+ if(m_findFlags & wxWEB_VIEW_FIND_HIGHLIGHT_RESULT)
+ {
+ FindInternal(m_findText, (m_findFlags &~ wxWEB_VIEW_FIND_HIGHLIGHT_RESULT), wxWEB_VIEW_FIND_REMOVE_HIGHLIGHT);
+ }
+ FindClear();
+ return wxNOT_FOUND;
+ }
+ //Have we done this search before?
+ if(m_findText == text)
+ {
+ //Just do a highlight?
+ if((flags & wxWEB_VIEW_FIND_HIGHLIGHT_RESULT) != (m_findFlags & wxWEB_VIEW_FIND_HIGHLIGHT_RESULT))
+ {
+ m_findFlags = flags;
+ if(!m_findPointers.empty())
+ {
+ FindInternal(m_findText, m_findFlags, ((flags & wxWEB_VIEW_FIND_HIGHLIGHT_RESULT) == 0 ? wxWEB_VIEW_FIND_REMOVE_HIGHLIGHT : 0));
+ }
+ return m_findPosition;
+ }
+ else if(((m_findFlags & wxWEB_VIEW_FIND_ENTIRE_WORD) == (flags & wxWEB_VIEW_FIND_ENTIRE_WORD)) && ((m_findFlags & wxWEB_VIEW_FIND_MATCH_CASE) == (flags&wxWEB_VIEW_FIND_MATCH_CASE)))
+ {
+ m_findFlags = flags;
+ return FindNext(((flags & wxWEB_VIEW_FIND_BACKWARDS) ? -1 : 1));
+ }
+ }
+ //Remove old highlight if any.
+ if(m_findFlags & wxWEB_VIEW_FIND_HIGHLIGHT_RESULT)
+ {
+ FindInternal(m_findText, (m_findFlags &~ wxWEB_VIEW_FIND_HIGHLIGHT_RESULT), wxWEB_VIEW_FIND_REMOVE_HIGHLIGHT);
+ }
+ //Reset find variables.
+ FindClear();
+ ClearSelection();
+ m_findText = text;
+ m_findFlags = flags;
+ //find the text and return count.
+ FindInternal(text, flags, wxWEB_VIEW_FIND_ADD_POINTERS);
+ return m_findPointers.empty() ? wxNOT_FOUND : m_findPointers.size();
+}
+
void wxWebViewIE::SetEditable(bool enable)
{
- IHTMLDocument2* document = GetDocument();
+ wxCOMPtr<IHTMLDocument2> document(GetDocument());
if(document)
{
else
document->put_designMode(SysAllocString(L"Off"));
- document->Release();
}
}
bool wxWebViewIE::IsEditable() const
{
- IHTMLDocument2* document = GetDocument();
+ wxCOMPtr<IHTMLDocument2> document(GetDocument());
if(document)
{
BSTR mode;
document->get_designMode(&mode);
- document->Release();
if(wxString(mode) == "On")
return true;
else
bool wxWebViewIE::HasSelection() const
{
- IHTMLDocument2* document = GetDocument();
+ wxCOMPtr<IHTMLDocument2> document(GetDocument());
if(document)
{
- IHTMLSelectionObject* selection;
+ wxCOMPtr<IHTMLSelectionObject> selection;
wxString sel;
HRESULT hr = document->get_selection(&selection);
if(SUCCEEDED(hr))
BSTR type;
selection->get_type(&type);
sel = wxString(type);
- selection->Release();
}
- document->Release();
return sel != "None";
}
else
wxString wxWebViewIE::GetSelectedText() const
{
- IHTMLDocument2* document = GetDocument();
+ wxCOMPtr<IHTMLDocument2> document(GetDocument());
if(document)
{
- IHTMLSelectionObject* selection;
+ wxCOMPtr<IHTMLSelectionObject> selection;
wxString selected;
HRESULT hr = document->get_selection(&selection);
if(SUCCEEDED(hr))
{
- IDispatch* disrange;
+ wxCOMPtr<IDispatch> disrange;
hr = selection->createRange(&disrange);
if(SUCCEEDED(hr))
{
- IHTMLTxtRange* range;
+ wxCOMPtr<IHTMLTxtRange> range;
hr = disrange->QueryInterface(IID_IHTMLTxtRange, (void**)&range);
if(SUCCEEDED(hr))
{
BSTR text;
range->get_text(&text);
selected = wxString(text);
- range->Release();
}
- disrange->Release();
}
- selection->Release();
}
- document->Release();
return selected;
}
else
wxString wxWebViewIE::GetSelectedSource() const
{
- IHTMLDocument2* document = GetDocument();
+ wxCOMPtr<IHTMLDocument2> document(GetDocument());
if(document)
{
- IHTMLSelectionObject* selection;
+ wxCOMPtr<IHTMLSelectionObject> selection;
wxString selected;
HRESULT hr = document->get_selection(&selection);
if(SUCCEEDED(hr))
{
- IDispatch* disrange;
+ wxCOMPtr<IDispatch> disrange;
hr = selection->createRange(&disrange);
if(SUCCEEDED(hr))
{
- IHTMLTxtRange* range;
+ wxCOMPtr<IHTMLTxtRange> range;
hr = disrange->QueryInterface(IID_IHTMLTxtRange, (void**)&range);
if(SUCCEEDED(hr))
{
BSTR text;
range->get_htmlText(&text);
selected = wxString(text);
- range->Release();
}
- disrange->Release();
}
- selection->Release();
}
- document->Release();
return selected;
}
else
void wxWebViewIE::ClearSelection()
{
- IHTMLDocument2* document = GetDocument();
+ wxCOMPtr<IHTMLDocument2> document(GetDocument());
if(document)
{
- IHTMLSelectionObject* selection;
+ wxCOMPtr<IHTMLSelectionObject> selection;
wxString selected;
HRESULT hr = document->get_selection(&selection);
if(SUCCEEDED(hr))
{
selection->empty();
- selection->Release();
}
- document->Release();
}
}
wxString wxWebViewIE::GetPageText() const
{
- IHTMLDocument2* document = GetDocument();
+ wxCOMPtr<IHTMLDocument2> document(GetDocument());
if(document)
{
wxString text;
- IHTMLElement* body;
+ wxCOMPtr<IHTMLElement> body;
HRESULT hr = document->get_body(&body);
if(SUCCEEDED(hr))
{
BSTR out;
body->get_innerText(&out);
text = wxString(out);
- body->Release();
}
- document->Release();
return text;
}
else
void wxWebViewIE::RunScript(const wxString& javascript)
{
- IHTMLDocument2* document = GetDocument();
+ wxCOMPtr<IHTMLDocument2> document(GetDocument());
if(document)
{
- IHTMLWindow2* window;
+ wxCOMPtr<IHTMLWindow2> window;
wxString language = "javascript";
HRESULT hr = document->get_parentWindow(&window);
if(SUCCEEDED(hr))
SysAllocString(language.wc_str()),
&level);
}
- document->Release();
}
}
bool wxWebViewIE::CanExecCommand(wxString command) const
{
- IHTMLDocument2* document = GetDocument();
+ wxCOMPtr<IHTMLDocument2> document(GetDocument());
if(document)
{
VARIANT_BOOL enabled;
document->queryCommandEnabled(SysAllocString(command.wc_str()), &enabled);
- document->Release();
return (enabled == VARIANT_TRUE);
}
void wxWebViewIE::ExecCommand(wxString command)
{
- IHTMLDocument2* document = GetDocument();
+ wxCOMPtr<IHTMLDocument2> document(GetDocument());
if(document)
{
document->execCommand(SysAllocString(command.wc_str()), VARIANT_FALSE, VARIANT(), NULL);
- document->Release();
}
}
-IHTMLDocument2* wxWebViewIE::GetDocument() const
+wxCOMPtr<IHTMLDocument2> wxWebViewIE::GetDocument() const
{
- IDispatch* dispatch;
+ wxCOMPtr<IDispatch> dispatch;
+ wxCOMPtr<IHTMLDocument2> document;
HRESULT result = m_webBrowser->get_Document(&dispatch);
- if(SUCCEEDED(result))
+ if(dispatch && SUCCEEDED(result))
{
- IHTMLDocument2* document;
- dispatch->QueryInterface(IID_IHTMLDocument2, (void**)&document);
//document is set to null automatically if the interface isn't supported
- return document;
+ dispatch->QueryInterface(IID_IHTMLDocument2, (void**)&document);
+ }
+ return document;
+}
+
+bool wxWebViewIE::IsElementVisible(IHTMLElement* elm)
+{
+ wxIHTMLCurrentStyle* style;
+ IHTMLElement *elm1 = elm;
+ wxIHTMLElement2 *elm2;
+ BSTR tmp_bstr;
+ bool is_visible = true;
+ //This method is not perfect but it does discover most of the hidden elements.
+ //so if a better solution is found, then please do improve.
+ while(elm1)
+ {
+ if(SUCCEEDED(elm1->QueryInterface(wxIID_IHTMLElement2, (void**) &elm2)))
+ {
+ if(SUCCEEDED(elm2->get_currentStyle(&style)))
+ {
+ //Check if the object has the style display:none.
+ if((style->get_display(&tmp_bstr) != S_OK) ||
+ (tmp_bstr != NULL && (_wcsicmp(tmp_bstr, L"none") == 0)))
+ {
+ is_visible = false;
+ }
+ //Check if the object has the style visibility:hidden.
+ if(is_visible && (style->get_visibility(&tmp_bstr) != S_OK) ||
+ (tmp_bstr != NULL && _wcsicmp(tmp_bstr, L"hidden") == 0))
+ {
+ is_visible = false;
+ }
+ style->Release();
+ }
+ elm2->Release();
+ }
+
+ //Lets check the object's parent element.
+ IHTMLElement* parent;
+ if(is_visible && SUCCEEDED(elm1->get_parentElement(&parent)))
+ {
+ elm1->Release();
+ elm1 = parent;
+ }
+ else
+ {
+ elm1->Release();
+ break;
+ }
+ }
+ return is_visible;
+}
+
+void wxWebViewIE::FindInternal(const wxString& text, int flags, int internal_flag)
+{
+ wxIMarkupServices *pIMS;
+ wxIMarkupContainer *pIMC;
+ wxIMarkupPointer *ptrBegin, *ptrEnd;
+ IHTMLElement* elm;
+ long find_flag = 0;
+ IHTMLDocument2 *document = GetDocument();
+ //This function does the acutal work.
+ if(SUCCEEDED(document->QueryInterface(wxIID_IMarkupServices, (void **)&pIMS)))
+ {
+ if(SUCCEEDED(document->QueryInterface(wxIID_IMarkupContainer, (void **)&pIMC)))
+ {
+ BSTR attr_bstr = SysAllocString(L"style=\"background-color:#ffff00\"");
+ BSTR text_bstr = SysAllocString(text.wc_str());
+ pIMS->CreateMarkupPointer(&ptrBegin);
+ pIMS->CreateMarkupPointer(&ptrEnd);
+
+ ptrBegin->SetGravity(POINTER_GRAVITY_Right);
+ ptrBegin->MoveToContainer(pIMC, TRUE);
+ //Create the find flag from the wx one.
+ if(flags & wxWEB_VIEW_FIND_ENTIRE_WORD)
+ {
+ find_flag |= FINDTEXT_WHOLEWORD;
+ }
+ if(flags & wxWEB_VIEW_FIND_MATCH_CASE)
+ {
+ find_flag |= FINDTEXT_MATCHCASE;
+ }
+
+ //A little speed-up to avoid to re-alloc in the positions vector.
+ if(text.Len() < 3 && m_findPointers.capacity() < 500)
+ {
+ m_findPointers.reserve(text.Len() == 1 ? 1000 : 500);
+ }
+
+ while(ptrBegin->FindText(text_bstr, find_flag, ptrEnd, NULL) == S_OK)
+ {
+ if(ptrBegin->CurrentScope(&elm) == S_OK)
+ {
+ if(IsElementVisible(elm))
+ {
+ //Highlight the word if the flag was set.
+ if(flags & wxWEB_VIEW_FIND_HIGHLIGHT_RESULT)
+ {
+ IHTMLElement* pFontEl;
+ pIMS->CreateElement(TAGID_FONT, attr_bstr, &pFontEl);
+ pIMS->InsertElement(pFontEl, ptrBegin, ptrEnd);
+ }
+ if(internal_flag & wxWEB_VIEW_FIND_REMOVE_HIGHLIGHT)
+ {
+ IHTMLElement* pFontEl;
+ ptrBegin->CurrentScope(&pFontEl);
+ pIMS->RemoveElement(pFontEl);
+ pFontEl->Release();
+ }
+ if(internal_flag & wxWEB_VIEW_FIND_ADD_POINTERS)
+ {
+ wxIMarkupPointer *cptrBegin, *cptrEnd;
+ pIMS->CreateMarkupPointer(&cptrBegin);
+ pIMS->CreateMarkupPointer(&cptrEnd);
+ cptrBegin->MoveToPointer(ptrBegin);
+ cptrEnd->MoveToPointer(ptrEnd);
+ m_findPointers.push_back(wxFindPointers(cptrBegin,cptrEnd));
+ }
+ }
+ elm->Release();
+ }
+ ptrBegin->MoveToPointer(ptrEnd);
+ }
+ //Clean up.
+ SysFreeString(text_bstr);
+ SysFreeString(attr_bstr);
+ pIMC->Release();
+ ptrBegin->Release();
+ ptrEnd->Release();
+ }
+ pIMS->Release();
+ }
+ document->Release();
+}
+
+long wxWebViewIE::FindNext(int direction)
+{
+ //Don't bother if we have no pointers set.
+ if(m_findPointers.empty())
+ {
+ return wxNOT_FOUND;
+ }
+ //Manage the find position and do some checks.
+ if(direction > 0)
+ {
+ m_findPosition++;
}
else
{
- return NULL;
+ m_findPosition--;
+ }
+
+ if(m_findPosition >= (signed)m_findPointers.size())
+ {
+ if(m_findFlags & wxWEB_VIEW_FIND_WRAP)
+ {
+ m_findPosition = 0;
+ }
+ else
+ {
+ m_findPosition--;
+ return wxNOT_FOUND;
+ }
+ }
+ else if(m_findPosition < 0)
+ {
+ if(m_findFlags & wxWEB_VIEW_FIND_WRAP)
+ {
+ m_findPosition = m_findPointers.size()-1;
+ }
+ else
+ {
+ m_findPosition++;
+ return wxNOT_FOUND;
+ }
+ }
+ //some variables to use later on.
+ IHTMLElement *body_element;
+ IHTMLBodyElement *body;
+ wxIHTMLTxtRange *range = NULL;
+ wxIMarkupServices *pIMS;
+ IHTMLDocument2 *document = GetDocument();
+ long ret = -1;
+ //Now try to create a range from the body.
+ if(SUCCEEDED(document->get_body(&body_element)))
+ {
+ if(SUCCEEDED(body_element->QueryInterface(IID_IHTMLBodyElement,(void**)&body)))
+ {
+ if(SUCCEEDED(body->createTextRange((IHTMLTxtRange**)(&range))))
+ {
+ //So far so good, now we try to position our find pointers.
+ if(SUCCEEDED(document->QueryInterface(wxIID_IMarkupServices,(void **)&pIMS)))
+ {
+ wxIMarkupPointer *begin = m_findPointers[m_findPosition].begin, *end = m_findPointers[m_findPosition].end;
+ if(pIMS->MoveRangeToPointers(begin,end,range) == S_OK && range->select() == S_OK)
+ {
+ ret = m_findPosition;
+ }
+ pIMS->Release();
+ }
+ range->Release();
+ }
+ body->Release();
+ }
+ body_element->Release();
+ }
+ document->Release();
+ return ret;
+}
+
+void wxWebViewIE::FindClear()
+{
+ //Reset find variables.
+ m_findText.Empty();
+ m_findFlags = wxWEB_VIEW_FIND_DEFAULT;
+ m_findPosition = -1;
+
+ //The m_findPointers contains pointers for the found text.
+ //Since it uses ref counting we call release on the pointers first
+ //before we remove them from the vector. In other words do not just
+ //remove elements from m_findPointers without calling release first
+ //or you will get a memory leak.
+ size_t count = m_findPointers.size();
+ for(size_t i = 0; i < count; i++)
+ {
+ m_findPointers[i].begin->Release();
+ m_findPointers[i].end->Release();
}
+ m_findPointers.clear();
}
bool wxWebViewIE::EnableControlFeature(long flag, bool enable)
}
//Reset as we are done now
m_historyLoadingFromList = false;
+ //Reset the find values.
+ FindClear();
// TODO: set target parameter if possible
wxString target = wxEmptyString;
wxWebViewEvent event(wxEVT_COMMAND_WEB_VIEW_LOADED, GetId(),
IMPLEMENT_IUNKNOWN_METHODS(VirtualProtocol)
-HRESULT VirtualProtocol::Start(LPCWSTR szUrl, wxIInternetProtocolSink *pOIProtSink,
+HRESULT STDMETHODCALLTYPE VirtualProtocol::Start(LPCWSTR szUrl, wxIInternetProtocolSink *pOIProtSink,
wxIInternetBindInfo *pOIBindInfo, DWORD grfPI,
HANDLE_PTR dwReserved)
{
return S_OK;
}
-HRESULT VirtualProtocol::Read(void *pv, ULONG cb, ULONG *pcbRead)
+HRESULT STDMETHODCALLTYPE VirtualProtocol::Read(void *pv, ULONG cb, ULONG *pcbRead)
{
//If the file is null we return false to indicte it is finished
if(!m_file)
IMPLEMENT_IUNKNOWN_METHODS(ClassFactory)
-HRESULT ClassFactory::CreateInstance(IUnknown* pUnkOuter, REFIID riid,
+HRESULT STDMETHODCALLTYPE ClassFactory::CreateInstance(IUnknown* pUnkOuter, REFIID riid,
void ** ppvObject)
{
if (pUnkOuter)
return false;
}
-HRESULT DocHostUIHandler::ShowContextMenu(DWORD dwID, POINT *ppt,
+HRESULT wxSTDCALL DocHostUIHandler::ShowContextMenu(DWORD dwID, POINT *ppt,
IUnknown *pcmdtReserved,
IDispatch *pdispReserved)
{
return E_NOTIMPL;
}
-HRESULT DocHostUIHandler::GetHostInfo(DOCHOSTUIINFO *pInfo)
+HRESULT wxSTDCALL DocHostUIHandler::GetHostInfo(DOCHOSTUIINFO *pInfo)
{
//don't show 3d border and enable themes.
pInfo->dwFlags = pInfo->dwFlags | DOCHOSTUIFLAG_NO3DBORDER | DOCHOSTUIFLAG_THEME;
return S_OK;
}
-HRESULT DocHostUIHandler::ShowUI(DWORD dwID,
+HRESULT wxSTDCALL DocHostUIHandler::ShowUI(DWORD dwID,
IOleInPlaceActiveObject *pActiveObject,
IOleCommandTarget *pCommandTarget,
IOleInPlaceFrame *pFrame,
return S_FALSE;
}
-HRESULT DocHostUIHandler::HideUI(void)
+HRESULT wxSTDCALL DocHostUIHandler::HideUI(void)
{
return E_NOTIMPL;
}
-HRESULT DocHostUIHandler::UpdateUI(void)
+HRESULT wxSTDCALL DocHostUIHandler::UpdateUI(void)
{
return E_NOTIMPL;
}
-HRESULT DocHostUIHandler::EnableModeless(BOOL fEnable)
+HRESULT wxSTDCALL DocHostUIHandler::EnableModeless(BOOL fEnable)
{
wxUnusedVar(fEnable);
return E_NOTIMPL;
}
-HRESULT DocHostUIHandler::OnDocWindowActivate(BOOL fActivate)
+HRESULT wxSTDCALL DocHostUIHandler::OnDocWindowActivate(BOOL fActivate)
{
wxUnusedVar(fActivate);
return E_NOTIMPL;
}
-HRESULT DocHostUIHandler::OnFrameWindowActivate(BOOL fActivate)
+HRESULT wxSTDCALL DocHostUIHandler::OnFrameWindowActivate(BOOL fActivate)
{
wxUnusedVar(fActivate);
return E_NOTIMPL;
}
-HRESULT DocHostUIHandler::ResizeBorder(LPCRECT prcBorder,
+HRESULT wxSTDCALL DocHostUIHandler::ResizeBorder(LPCRECT prcBorder,
IOleInPlaceUIWindow *pUIWindow,
BOOL fFrameWindow)
{
return E_NOTIMPL;
}
-HRESULT DocHostUIHandler::TranslateAccelerator(LPMSG lpMsg,
+HRESULT wxSTDCALL DocHostUIHandler::TranslateAccelerator(LPMSG lpMsg,
const GUID *pguidCmdGroup,
DWORD nCmdID)
{
//control is down?
if((GetKeyState(VK_CONTROL) & 0x8000 ))
{
- //skip CTRL-N, CTRL-F and CTRL-P
- if(lpMsg->wParam == 'N' || lpMsg->wParam == 'P' || lpMsg->wParam == 'F')
+ //skip the accelerators used by the control
+ switch(lpMsg->wParam)
{
- return S_OK;
+ case 'F':
+ case 'L':
+ case 'N':
+ case 'O':
+ case 'P':
+ return S_OK;
}
}
//skip F5
return E_NOTIMPL;
}
-HRESULT DocHostUIHandler::GetOptionKeyPath(LPOLESTR *pchKey,DWORD dw)
+HRESULT wxSTDCALL DocHostUIHandler::GetOptionKeyPath(LPOLESTR *pchKey,DWORD dw)
{
wxUnusedVar(pchKey);
wxUnusedVar(dw);
return E_NOTIMPL;
}
-HRESULT DocHostUIHandler::GetDropTarget(IDropTarget *pDropTarget,
+HRESULT wxSTDCALL DocHostUIHandler::GetDropTarget(IDropTarget *pDropTarget,
IDropTarget **ppDropTarget)
{
wxUnusedVar(pDropTarget);
return E_NOTIMPL;
}
-HRESULT DocHostUIHandler::GetExternal(IDispatch **ppDispatch)
+HRESULT wxSTDCALL DocHostUIHandler::GetExternal(IDispatch **ppDispatch)
{
wxUnusedVar(ppDispatch);
return E_NOTIMPL;
}
-HRESULT DocHostUIHandler::TranslateUrl(DWORD dwTranslate,
+HRESULT wxSTDCALL DocHostUIHandler::TranslateUrl(DWORD dwTranslate,
OLECHAR *pchURLIn,
OLECHAR **ppchURLOut)
{
return E_NOTIMPL;
}
-HRESULT DocHostUIHandler::FilterDataObject(IDataObject *pDO, IDataObject **ppDORet)
+HRESULT wxSTDCALL DocHostUIHandler::FilterDataObject(IDataObject *pDO, IDataObject **ppDORet)
{
wxUnusedVar(pDO);
wxUnusedVar(ppDORet);
projects / wxWidgets.git / blobdiff