diff --git a/wxPython/demo/wxMenu.py b/wxPython/demo/wxMenu.py index 7ed5215edd..2a6edde544 100644 --- a/wxPython/demo/wxMenu.py +++ b/wxPython/demo/wxMenu.py @@ -75,6 +75,7 @@ check the source for this sample to see how to implement them. menu6 = wxMenu() menu6.Append(601, "Submenu Item") menu5.AppendMenu(504, "submenu", menu6) + menu5.Append(505, "remove this menu") menuBar.Append(menu5, "&Fun") self.SetMenuBar(menuBar) @@ -102,6 +103,7 @@ check the source for this sample to see how to implement them. EVT_MENU(self, 501, self.Menu501) EVT_MENU(self, 502, self.Menu502) EVT_MENU(self, 503, self.TestRemove) + EVT_MENU(self, 505, self.TestRemove2) # Methods @@ -165,6 +167,11 @@ check the source for this sample to see how to implement them. #menu.RemoveItem(submenuItem) # doesn't work, as expected since submenuItem is not on menu + def TestRemove2(self, evt): + mb = self.GetMenuBar() + mb.Remove(4) + + #------------------------------------------------------------------- def runTest(frame, nb, log): diff --git a/wxPython/demo/wxScrolledWindow.py b/wxPython/demo/wxScrolledWindow.py index 53d8b4a130..74ff5ef191 100644 --- a/wxPython/demo/wxScrolledWindow.py +++ b/wxPython/demo/wxScrolledWindow.py @@ -92,6 +92,11 @@ class MyCanvas(wxScrolledWindow): dc.SetTextForeground(wxColour(0, 0xFF, 0x80)) dc.DrawText("a bitmap", 200, 85) +## dc.SetFont(wxFont(14, wxSWISS, wxNORMAL, wxNORMAL)) +## dc.SetTextForeground("BLACK") +## dc.DrawText("TEST this STRING", 10, 200) + + font = wxFont(20, wxSWISS, wxNORMAL, wxNORMAL) dc.SetFont(font) dc.SetTextForeground(wxBLACK)