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

Disable wxWebView::Find and associated functions under MinGW and VC6 to fix compilation

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@72423 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Steve Lamerton
2012-09-06 08:39:12 +00:00
parent 81b93d3e85
commit 58f513e990
1 changed files with 16 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/msw/webview_ie.cpp
View File

@@ -601,6 +601,7 @@ void wxWebViewIE::Redo()
long wxWebViewIE::Find(const wxString& text, int flags) long wxWebViewIE::Find(const wxString& text, int flags)
{ {
#if !defined(__MINGW32__) && !defined(__VISUALC6__)
//If the text is empty then we clear. //If the text is empty then we clear.
if(text.IsEmpty()) if(text.IsEmpty())
{ {
@@ -644,6 +645,9 @@ long wxWebViewIE::Find(const wxString& text, int flags)
//find the text and return count. //find the text and return count.
FindInternal(text, flags, wxWEB_VIEW_FIND_ADD_POINTERS); FindInternal(text, flags, wxWEB_VIEW_FIND_ADD_POINTERS);
return m_findPointers.empty() ? wxNOT_FOUND : m_findPointers.size(); return m_findPointers.empty() ? wxNOT_FOUND : m_findPointers.size();
#else
return wxNOT_FOUND;
#endif
} }
void wxWebViewIE::SetEditable(bool enable) void wxWebViewIE::SetEditable(bool enable)
@@ -913,6 +917,7 @@ wxCOMPtr<IHTMLDocument2> wxWebViewIE::GetDocument() const
bool wxWebViewIE::IsElementVisible(IHTMLElement* elm) bool wxWebViewIE::IsElementVisible(IHTMLElement* elm)
{ {
#if !defined(__MINGW32__) && !defined(__VISUALC6__)
IHTMLCurrentStyle* style; IHTMLCurrentStyle* style;
IHTMLElement *elm1 = elm; IHTMLElement *elm1 = elm;
IHTMLElement2 *elm2; IHTMLElement2 *elm2;
@@ -957,10 +962,14 @@ bool wxWebViewIE::IsElementVisible(IHTMLElement* elm)
} }
} }
return is_visible; return is_visible;
#else
return false;
#endif
} }
void wxWebViewIE::FindInternal(const wxString& text, int flags, int internal_flag) void wxWebViewIE::FindInternal(const wxString& text, int flags, int internal_flag)
{ {
#if !defined(__MINGW32__) && !defined(__VISUALC6__)
IMarkupServices *pIMS; IMarkupServices *pIMS;
IMarkupContainer *pIMC; IMarkupContainer *pIMC;
IMarkupPointer *ptrBegin, *ptrEnd; IMarkupPointer *ptrBegin, *ptrEnd;
@@ -1039,10 +1048,12 @@ void wxWebViewIE::FindInternal(const wxString& text, int flags, int internal_fla
pIMS->Release(); pIMS->Release();
} }
document->Release(); document->Release();
#endif
} }
long wxWebViewIE::FindNext(int direction) long wxWebViewIE::FindNext(int direction)
{ {
#if !defined(__MINGW32__) && !defined(__VISUALC6__)
//Don't bother if we have no pointers set. //Don't bother if we have no pointers set.
if(m_findPointers.empty()) if(m_findPointers.empty())
{ {
@@ -1114,10 +1125,14 @@ long wxWebViewIE::FindNext(int direction)
} }
document->Release(); document->Release();
return ret; return ret;
#else
return wxNOT_FOUND;
#endif
} }
void wxWebViewIE::FindClear() void wxWebViewIE::FindClear()
{ {
#if !defined(__MINGW32__) && !defined(__VISUALC6__)
//Reset find variables. //Reset find variables.
m_findText.Empty(); m_findText.Empty();
m_findFlags = wxWEB_VIEW_FIND_DEFAULT; m_findFlags = wxWEB_VIEW_FIND_DEFAULT;
@@ -1135,6 +1150,7 @@ void wxWebViewIE::FindClear()
m_findPointers[i].end->Release(); m_findPointers[i].end->Release();
} }
m_findPointers.clear(); m_findPointers.clear();
#endif
} }
bool wxWebViewIE::EnableControlFeature(long flag, bool enable) bool wxWebViewIE::EnableControlFeature(long flag, bool enable)