Add empty paragraph in wxRichTextTable::AddColumns() and AddRows().

[wxWidgets.git] / tests / controls / webtest.cpp

diff --git a/tests/controls/webtest.cpp b/tests/controls/webtest.cpp
index fab56fab35d238006e162e9d222bd125e273a16b..533f1da461785fc76da9f80917179737be169aa1 100644 (file)
--- a/tests/controls/webtest.cpp
+++ b/tests/controls/webtest.cpp
@@ -79,7 +79,8 @@ void WebTestCase::setUp()
 {
     m_browser = wxWebView::New(wxTheApp->GetTopWindow(), wxID_ANY);
 
 {
     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_WEBVIEW_LOADED);
+    m_browser->LoadURL("about:");

     ENSURE_LOADED;
 }
 
     ENSURE_LOADED;
 }
 


@@ -229,25 +230,25 @@ void WebTestCase::Selection()
 
 void WebTestCase::Zoom()
 {
 
 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
     }
 
     //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());

     }
 }
 
     }
 }