Applied #13763 from dghart, to use primary selections if available

[wxWidgets.git] / tests / menu / menu.cpp

diff --git a/tests/menu/menu.cpp b/tests/menu/menu.cpp
index 3424af6b50482a726ad1eb1e818140b5329916da..7c0c3551d860bd07a352a6d54048c9818557bfdf 100644 (file)
--- a/tests/menu/menu.cpp
+++ b/tests/menu/menu.cpp
@@ -85,6 +85,7 @@ private:
         CPPUNIT_TEST( Count );
         CPPUNIT_TEST( Labels );
         CPPUNIT_TEST( RadioItems );
         CPPUNIT_TEST( Count );
         CPPUNIT_TEST( Labels );
         CPPUNIT_TEST( RadioItems );

+        CPPUNIT_TEST( RemoveAdd );

     CPPUNIT_TEST_SUITE_END();
 
     void CreateFrame();
     CPPUNIT_TEST_SUITE_END();
 
     void CreateFrame();


@@ -94,6 +95,7 @@ private:
     void Count();
     void Labels();
     void RadioItems();
     void Count();
     void Labels();
     void RadioItems();

+    void RemoveAdd();

 
     wxFrame* m_frame;
 
 
     wxFrame* m_frame;
 


@@ -359,3 +361,23 @@ void MenuTestCase::RadioItems()
     menu->Check(MenuTestCase_First + 4, true);
     CPPUNIT_ASSERT( !menu->IsChecked(MenuTestCase_First + 5) );
 }
     menu->Check(MenuTestCase_First + 4, true);
     CPPUNIT_ASSERT( !menu->IsChecked(MenuTestCase_First + 5) );
 }

+
+void MenuTestCase::RemoveAdd()
+{
+    wxMenuBar* bar = m_frame->GetMenuBar();
+
+    wxMenu* menu0 = bar->GetMenu(0);
+    wxMenu* menu1 = bar->GetMenu(1);
+    wxMenuItem* item = new wxMenuItem(menu0, MenuTestCase_Foo + 100, "t&ext\tCtrl-E");
+    menu0->Insert(0, item);
+    CPPUNIT_ASSERT( menu0->FindItemByPosition(0) == item );
+    menu0->Remove(item);
+    CPPUNIT_ASSERT( menu0->FindItemByPosition(0) != item );
+    menu1->Insert(0, item);
+    CPPUNIT_ASSERT( menu1->FindItemByPosition(0) == item );
+    menu1->Remove(item);
+    CPPUNIT_ASSERT( menu1->FindItemByPosition(0) != item );
+    menu0->Insert(0, item);
+    CPPUNIT_ASSERT( menu0->FindItemByPosition(0) == item );
+    menu0->Delete(item);
+}