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

Rename all WEB_VIEW* style identifiers to WEBVIEW*.

Browse Source 
This makes wxWebView consistent with the rest of the toolkit. 

Closes #15013

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@73453 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Steve Lamerton
2013-02-01 09:38:53 +00:00
parent f35f5a7a1a
commit 236cff7334
14 changed files with 345 additions and 343 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
tests/controls/webtest.cpp
View File

@@ -79,7 +79,7 @@ void WebTestCase::setUp()
{
m_browser = wxWebView::New(wxTheApp->GetTopWindow(), wxID_ANY);
m_loaded = new EventCounter(m_browser, wxEVT_COMMAND_WEB_VIEW_LOADED);
m_loaded = new EventCounter(m_browser, wxEVT_COMMAND_WEBVIEW_LOADED);
ENSURE_LOADED;
}
@@ -229,25 +229,25 @@ void WebTestCase::Selection()
void WebTestCase::Zoom()
{
if(m_browser->CanSetZoomType(wxWEB_VIEW_ZOOM_TYPE_LAYOUT))
if(m_browser->CanSetZoomType(wxWEBVIEW_ZOOM_TYPE_LAYOUT))
{
m_browser->SetZoomType(wxWEB_VIEW_ZOOM_TYPE_LAYOUT);
CPPUNIT_ASSERT_EQUAL(wxWEB_VIEW_ZOOM_TYPE_LAYOUT, m_browser->GetZoomType());
m_browser->SetZoomType(wxWEBVIEW_ZOOM_TYPE_LAYOUT);
CPPUNIT_ASSERT_EQUAL(wxWEBVIEW_ZOOM_TYPE_LAYOUT, m_browser->GetZoomType());
m_browser->SetZoom(wxWEB_VIEW_ZOOM_TINY);
CPPUNIT_ASSERT_EQUAL(wxWEB_VIEW_ZOOM_TINY, m_browser->GetZoom());
m_browser->SetZoom(wxWEBVIEW_ZOOM_TINY);
CPPUNIT_ASSERT_EQUAL(wxWEBVIEW_ZOOM_TINY, m_browser->GetZoom());
}
//Reset the zoom level
m_browser->SetZoom(wxWEB_VIEW_ZOOM_MEDIUM);
m_browser->SetZoom(wxWEBVIEW_ZOOM_MEDIUM);
if(m_browser->CanSetZoomType(wxWEB_VIEW_ZOOM_TYPE_TEXT))
if(m_browser->CanSetZoomType(wxWEBVIEW_ZOOM_TYPE_TEXT))
{
m_browser->SetZoomType(wxWEB_VIEW_ZOOM_TYPE_TEXT);
CPPUNIT_ASSERT_EQUAL(wxWEB_VIEW_ZOOM_TYPE_TEXT, m_browser->GetZoomType());
m_browser->SetZoomType(wxWEBVIEW_ZOOM_TYPE_TEXT);
CPPUNIT_ASSERT_EQUAL(wxWEBVIEW_ZOOM_TYPE_TEXT, m_browser->GetZoomType());
m_browser->SetZoom(wxWEB_VIEW_ZOOM_TINY);
CPPUNIT_ASSERT_EQUAL(wxWEB_VIEW_ZOOM_TINY, m_browser->GetZoom());
m_browser->SetZoom(wxWEBVIEW_ZOOM_TINY);
CPPUNIT_ASSERT_EQUAL(wxWEBVIEW_ZOOM_TINY, m_browser->GetZoom());
}
}