diff --git a/demo/ActiveXWrapper_Acrobat.py b/demo/ActiveXWrapper_Acrobat.py index e6cc8f02..fe02f860 100644 --- a/demo/ActiveXWrapper_Acrobat.py +++ b/demo/ActiveXWrapper_Acrobat.py @@ -121,7 +121,7 @@ if __name__ == '__main__': self.tp = TestPanel(self, sys.stdout) - app = wx.PySimpleApp() + app = wx.App() frame = TestFrame() frame.Show(True) app.MainLoop() diff --git a/demo/ActiveXWrapper_IE.py b/demo/ActiveXWrapper_IE.py index fa1a9e4a..c8236695 100644 --- a/demo/ActiveXWrapper_IE.py +++ b/demo/ActiveXWrapper_IE.py @@ -171,7 +171,7 @@ if __name__ == '__main__': self.tp.Destroy() self.Destroy() - app = wx.PySimpleApp() + app = wx.App() frame = TestFrame() frame.Show(True) diff --git a/demo/GridCustEditor.py b/demo/GridCustEditor.py index 7b23439c..51652d6e 100644 --- a/demo/GridCustEditor.py +++ b/demo/GridCustEditor.py @@ -217,6 +217,9 @@ class GridEditorTest(gridlib.Grid): attr.SetEditor(MyCellEditor(self.log)) self.SetColAttr(2, attr) self.SetCellValue(1, 2, "or any in this column") + self.SetCellValue(2, 2, "and watch the log.") + self.SetCellValue(4, 0, "(The log shows if the custom cell editor is being used.)") + self.SetColSize(0, 150) self.SetColSize(1, 150) @@ -235,7 +238,7 @@ class TestFrame(wx.Frame): if __name__ == '__main__': import sys - app = wx.PySimpleApp() + app = wx.App() frame = TestFrame(None, sys.stdout) frame.Show(True) app.MainLoop() diff --git a/demo/GridDragAndDrop.py b/demo/GridDragAndDrop.py index f3e0e9c5..b4ef7f8f 100644 --- a/demo/GridDragAndDrop.py +++ b/demo/GridDragAndDrop.py @@ -86,7 +86,7 @@ class TestFrame(wx.Frame): if __name__ == '__main__': import sys - app = wx.PySimpleApp() + app = wx.App() frame = TestFrame(None, sys.stdout) frame.Show(True) app.MainLoop() diff --git a/demo/GridDragable.py b/demo/GridDragable.py index 8f375b8e..c61b2aa3 100644 --- a/demo/GridDragable.py +++ b/demo/GridDragable.py @@ -197,7 +197,7 @@ class TestFrame(wx.Frame): if __name__ == '__main__': import sys - app = wx.PySimpleApp() + app = wx.App() frame = TestFrame(None, sys.stdout) frame.Show(True) app.MainLoop() diff --git a/demo/GridEnterHandler.py b/demo/GridEnterHandler.py index 638eac61..58de6a51 100644 --- a/demo/GridEnterHandler.py +++ b/demo/GridEnterHandler.py @@ -56,7 +56,7 @@ class TestFrame(wx.Frame): if __name__ == '__main__': import sys - app = wx.PySimpleApp() + app = wx.App() frame = TestFrame(None, sys.stdout) frame.Show(True) app.MainLoop() diff --git a/demo/GridHugeTable.py b/demo/GridHugeTable.py index 746ea07d..a5d88761 100644 --- a/demo/GridHugeTable.py +++ b/demo/GridHugeTable.py @@ -78,7 +78,7 @@ class TestFrame(wx.Frame): if __name__ == '__main__': import sys - app = wx.PySimpleApp() + app = wx.App() frame = TestFrame(None, sys.stdout) frame.Show(True) app.MainLoop() diff --git a/demo/GridStdEdRend.py b/demo/GridStdEdRend.py index 808f908b..dc670fef 100644 --- a/demo/GridStdEdRend.py +++ b/demo/GridStdEdRend.py @@ -175,7 +175,7 @@ class TestFrame(wx.Frame): if __name__ == '__main__': import sys - app = wx.PySimpleApp() + app = wx.App() frame = TestFrame(None, sys.stdout) frame.Show(True) app.MainLoop() diff --git a/demo/MaskedEditControls.py b/demo/MaskedEditControls.py index c6033209..6a5c7883 100644 --- a/demo/MaskedEditControls.py +++ b/demo/MaskedEditControls.py @@ -626,11 +626,12 @@ def runTest(frame, nb, log): return testWin def RunStandalone(): - app = wx.PySimpleApp() + app = wx.App() frame = wx.Frame(None, -1, "Test MaskedEditCtrls", size=(640, 480)) win = TestMaskedTextCtrls(frame, -1, sys.stdout) frame.Show(True) app.MainLoop() + #---------------------------------------------------------------------------- import wx.lib.masked.maskededit as maskededit # strip out module header used for pydoc: diff --git a/demo/PlateButton.py b/demo/PlateButton.py index 8b17926f..759b6afd 100644 --- a/demo/PlateButton.py +++ b/demo/PlateButton.py @@ -415,7 +415,7 @@ if __name__ == '__main__': import sys import run except ImportError: - app = wx.PySimpleApp(False) + app = wx.App(False) frame = wx.Frame(None, title="PlateButton Test") sizer = wx.BoxSizer(wx.HORIZONTAL) sizer.Add(TestPanel(frame, TestLog()), 1, wx.EXPAND) diff --git a/demo/SystemSettings.py b/demo/SystemSettings.py index 71ace714..5eae4c71 100644 --- a/demo/SystemSettings.py +++ b/demo/SystemSettings.py @@ -318,7 +318,7 @@ if __name__ == '__main__': import sys import run except ImportError: - app = wx.PySimpleApp(False) + app = wx.App(False) frame = wx.Frame(None, title="SystemSettings Demo", size=(500, 500)) sizer = wx.BoxSizer(wx.HORIZONTAL) sizer.Add(TestPanel(frame, TestLog()), 1, wx.EXPAND) diff --git a/wx/lib/pydocview.py b/wx/lib/pydocview.py index 50385363..404c95e2 100644 --- a/wx/lib/pydocview.py +++ b/wx/lib/pydocview.py @@ -1655,7 +1655,7 @@ class GeneralOptionsPanel(wx.Panel): return wx.GetApp().GetDefaultIcon() -class DocApp(wx.PySimpleApp): +class DocApp(wx.App): """ The DocApp class serves as the base class for pydocview applications and offers functionality such as services, creation of SDI and MDI frames, show tips, diff --git a/wx/tools/genaxmodule.py b/wx/tools/genaxmodule.py index fca6b6ac..c5770b27 100644 --- a/wx/tools/genaxmodule.py +++ b/wx/tools/genaxmodule.py @@ -33,7 +33,7 @@ def main(args=None): # unfortunatly we need to make an app, frame and an instance of # the ActiceX control in order to get the TypeInfo about it... - app = wx.PySimpleApp() + app = wx.App() f = wx.Frame(None, -1, "") clsid = wx.activex.CLSID(args[1]) axw = wx.activex.ActiveXWindow(f, clsid) diff --git a/wx/tools/img2png.py b/wx/tools/img2png.py index 76b5fc57..5f71b40f 100644 --- a/wx/tools/img2png.py +++ b/wx/tools/img2png.py @@ -45,7 +45,7 @@ def main(): # some bitmap related things need to have a wxApp initialized... if wx.GetApp() is None: global app - app = wx.PySimpleApp() + app = wx.App() img2img.main(sys.argv[1:], wx.BITMAP_TYPE_PNG, ".png", __doc__) if __name__ == '__main__': diff --git a/wx/tools/img2xpm.py b/wx/tools/img2xpm.py index 53e9fcba..eb39bb75 100644 --- a/wx/tools/img2xpm.py +++ b/wx/tools/img2xpm.py @@ -44,7 +44,7 @@ def main(): # some bitmap related things need to have a wxApp initialized... if wx.GetApp() is None: global app - app = wx.PySimpleApp() + app = wx.App() img2img.main(sys.argv[1:], wx.BITMAP_TYPE_XPM, ".xpm", __doc__)