Add a unit test for wxImage::Scale() method.

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

diff --git a/tests/controls/textctrltest.cpp b/tests/controls/textctrltest.cpp
index 61dd87347cf55db7e526a85249e504e15e6b5169..dee9da5822e49a698946085e365f44b511135764 100644 (file)
--- a/tests/controls/textctrltest.cpp
+++ b/tests/controls/textctrltest.cpp
@@ -188,7 +188,7 @@ void TextCtrlTestCase::ReadOnly()
     delete m_text;
     CreateText(wxTE_READONLY);
 
     delete m_text;
     CreateText(wxTE_READONLY);
 

-    EventCounter updated(m_text, wxEVT_COMMAND_TEXT_UPDATED);
+    EventCounter updated(m_text, wxEVT_TEXT);

 
     m_text->SetFocus();
 
 
     m_text->SetFocus();
 


@@ -201,6 +201,11 @@ void TextCtrlTestCase::ReadOnly()
 
     // SetEditable() is supposed to override wxTE_READONLY
     m_text->SetEditable(true);
 
     // SetEditable() is supposed to override wxTE_READONLY
     m_text->SetEditable(true);

+    
+#ifdef __WXOSX__
+    // a ready only text field might not have been focusable at all
+    m_text->SetFocus();
+#endif

 
     sim.Text("abcdef");
     wxYield();
 
     sim.Text("abcdef");
     wxYield();


@@ -213,8 +218,8 @@ void TextCtrlTestCase::ReadOnly()
 void TextCtrlTestCase::MaxLength()
 {
 #if wxUSE_UIACTIONSIMULATOR
 void TextCtrlTestCase::MaxLength()
 {
 #if wxUSE_UIACTIONSIMULATOR

-    EventCounter updated(m_text, wxEVT_COMMAND_TEXT_UPDATED);
-    EventCounter maxlen(m_text, wxEVT_COMMAND_TEXT_MAXLEN);
+    EventCounter updated(m_text, wxEVT_TEXT);
+    EventCounter maxlen(m_text, wxEVT_TEXT_MAXLEN);

 
     m_text->SetFocus();
     m_text->SetMaxLength(10);
 
     m_text->SetFocus();
     m_text->SetMaxLength(10);


@@ -319,7 +324,7 @@ void TextCtrlTestCase::ProcessEnter()
     wxTestableFrame* frame = wxStaticCast(wxTheApp->GetTopWindow(),
                                           wxTestableFrame);
 
     wxTestableFrame* frame = wxStaticCast(wxTheApp->GetTopWindow(),
                                           wxTestableFrame);
 

-    EventCounter count(m_text, wxEVT_COMMAND_TEXT_ENTER);
+    EventCounter count(m_text, wxEVT_TEXT_ENTER);

 
     m_text->SetFocus();
 
 
     m_text->SetFocus();
 


@@ -327,7 +332,7 @@ void TextCtrlTestCase::ProcessEnter()
     sim.Char(WXK_RETURN);
     wxYield();
 
     sim.Char(WXK_RETURN);
     wxYield();
 

-    CPPUNIT_ASSERT_EQUAL(0, frame->GetEventCount(wxEVT_COMMAND_TEXT_ENTER));
+    CPPUNIT_ASSERT_EQUAL(0, frame->GetEventCount(wxEVT_TEXT_ENTER));

 
     // we need a text control with wxTE_PROCESS_ENTER for this test
     delete m_text;
 
     // we need a text control with wxTE_PROCESS_ENTER for this test
     delete m_text;


@@ -338,7 +343,7 @@ void TextCtrlTestCase::ProcessEnter()
     sim.Char(WXK_RETURN);
     wxYield();
 
     sim.Char(WXK_RETURN);
     wxYield();
 

-    CPPUNIT_ASSERT_EQUAL(1, frame->GetEventCount(wxEVT_COMMAND_TEXT_ENTER));
+    CPPUNIT_ASSERT_EQUAL(1, frame->GetEventCount(wxEVT_TEXT_ENTER));

 #endif
 }
 #endif
 #endif
 }
 #endif


@@ -349,7 +354,7 @@ void TextCtrlTestCase::Url()
     delete m_text;
     CreateText(wxTE_RICH | wxTE_AUTO_URL);
 
     delete m_text;
     CreateText(wxTE_RICH | wxTE_AUTO_URL);
 

-    EventCounter url(m_text, wxEVT_COMMAND_TEXT_URL);
+    EventCounter url(m_text, wxEVT_TEXT_URL);

 
     m_text->AppendText("http://www.wxwidgets.org");
 
 
     m_text->AppendText("http://www.wxwidgets.org");