Another merge of 2.6 changes

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36914 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-17 05:42:30 +00:00
parent f3ebbc0ac8
commit 4617be085f
21 changed files with 241 additions and 43 deletions
--- a/wxPython/wx/py/crust.py
+++ b/wxPython/wx/py/crust.py
@@ -279,6 +279,10 @@ class CrustFrame(frame.Frame, frame.ShellFrameMixin):
        dialog.Destroy()


+    def OnHelp(self, event):
+        """Show a help dialog."""
+        frame.ShellFrameMixin.OnHelp(self, event)
+

    def LoadSettings(self):
        if self.config is not None: