minor tweaks for the widget inspector

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44240 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/wxPython/demo/Main.py b/wxPython/demo/Main.py
index 014213c5f9d32a182b05fb564da45326627efe4d..64b08bba9b56b6b04e4191147b689733bf304405 100644 (file)
--- a/wxPython/demo/Main.py
+++ b/wxPython/demo/Main.py
@@ -1208,7 +1208,7 @@ class wxPythonDemo(wx.Frame):
                            wx.ITEM_CHECK)
         self.Bind(wx.EVT_MENU, self.OnToggleRedirect, item)
  
-        exitItem = menu.Append(-1, 'E&xit\tAlt-X', 'Get the heck outta here!')
+        exitItem = menu.Append(-1, 'E&xit\tCtrl-Q', 'Get the heck outta here!')
         self.Bind(wx.EVT_MENU, self.OnFileExit, exitItem)
         wx.App.SetMacExitMenuItemId(exitItem.GetId())
         self.mainmenu.Append(menu, '&File')
@@ -1232,11 +1232,14 @@ class wxPythonDemo(wx.Frame):
 
         shellItem = menu.Append(-1, 'Open Py&Shell Window\tF5',
                                 'An interactive interpreter window with the demo app and frame objects in the namesapce')
+        inspToolItem = menu.Append(-1, 'Open &Widget Inspector\tF6',
+                                'A tool that lets you browse the live widgets and sizers in an application')
         menu.AppendSeparator()
         helpItem = menu.Append(-1, '&About wxPython Demo', 'wxPython RULES!!!')
         wx.App.SetMacAboutMenuItemId(helpItem.GetId())
 
         self.Bind(wx.EVT_MENU, self.OnOpenShellWindow, shellItem)
+        self.Bind(wx.EVT_MENU, self.OnOpenWidgetInspector, inspToolItem)
         self.Bind(wx.EVT_MENU, self.OnHelpAbout, helpItem)
         self.Bind(wx.EVT_MENU, self.OnHelpFind,  findItem)
         self.Bind(wx.EVT_MENU, self.OnFindNext,  findnextItem)
@@ -1680,6 +1683,12 @@ class wxPythonDemo(wx.Frame):
                 evt.Skip()
             self.Bind(wx.EVT_CLOSE, CloseShell)
 
+
+    def OnOpenWidgetInspector(self, evt):
+        # Activate the widget inspector that was mixed in with the
+        # app, see MyApp and MyApp.OnInit below.
+        wx.GetApp().ShowInspectionTool()
+
         
     #---------------------------------------------
     def OnCloseWindow(self, event):
@@ -1778,9 +1787,9 @@ class MySplashScreen(wx.SplashScreen):
         frame.Show()
         if self.fc.IsRunning():
             self.Raise()
+
         
 import wx.lib.mixins.inspect
-
 class MyApp(wx.App, wx.lib.mixins.inspect.InspectionMixin):
     def OnInit(self):
         """

diff --git a/wxPython/demo/run.py b/wxPython/demo/run.py
index 3c27661e9ed49357c2b1dbdfd2f1278d4e367e30..5b1fffb091863a25579ca777061049229cc05d2b 100755 (executable)
--- a/wxPython/demo/run.py
+++ b/wxPython/demo/run.py
@@ -17,7 +17,8 @@ directory within its own frame window.  Just specify the module name
 on the command line.
 """
 
-import wx                  # This module uses the new wx namespace
+import wx
+import wx.lib.mixins.inspect
 import sys, os
 
 # stuff for debugging
@@ -39,7 +40,7 @@ class Log:
     write = WriteText
 
 
-class RunDemoApp(wx.App):
+class RunDemoApp(wx.App, wx.lib.mixins.inspect.InspectionMixin):
     def __init__(self, name, module, useShell):
         self.name = name
         self.demoModule = module
@@ -51,9 +52,10 @@ class RunDemoApp(wx.App):
         wx.Log_SetActiveTarget(wx.LogStderr())
 
         self.SetAssertMode(assertMode)
+        self.Init()  # InspectionMixin
 
         frame = wx.Frame(None, -1, "RunDemo: " + self.name, pos=(50,50), size=(200,100),
-                        style=wx.DEFAULT_FRAME_STYLE)
+                        style=wx.DEFAULT_FRAME_STYLE, name="run a sample")
         frame.CreateStatusBar()
 
         menuBar = wx.MenuBar()