New style

[wxWidgets.git] / wxPython / demo / ColourDB.py

diff --git a/wxPython/demo/ColourDB.py b/wxPython/demo/ColourDB.py
index 3db76c0a06c10041bddbfdcefb8a5ae19495e494..b3b08ce8788444bb5a884d659ef4559433ebd9a7 100644 (file)
--- a/wxPython/demo/ColourDB.py
+++ b/wxPython/demo/ColourDB.py
@@ -1,16 +1,6 @@
-# 11/4/03 - grimmtooth@softhome.net (Jeff Grimmett)
-#
-# o Updated to use wx namespace
-#
-# 11/24/03 - grimmtooth@softhome.net (Jeff Grimmett)
-#
-# o Had to move the call to wx.updateColourDB()
-# o Updated several places to change discrete pos and size parameters
-#   into two-tuples.
-#
 
 import wx
-import wx.lib.colourdb as cdb
+import wx.lib.colourdb
 
 import images
 
@@ -22,7 +12,7 @@ class TestWindow(wx.ScrolledWindow):
         wx.ScrolledWindow.__init__(self, parent, -1)
 
         # Populate our color list
-        self.clrList = cdb.getColourList()
+        self.clrList = wx.lib.colourdb.getColourList()
 
         # Just for style points, we'll use this as a background image.
         #self.clrList.sort()
@@ -165,7 +155,7 @@ def runTest(frame, nb, log):
     # Note 11/24/03 - jg - I moved this into runTest() because
     # there must be a wx.App existing before this function
     # can be called - this is a change from 2.4 -> 2.5.
-    cdb.updateColourDB()
+    wx.lib.colourdb.updateColourDB()
 
     win = TestPanel(nb)
 
@@ -206,5 +196,5 @@ Trying to do otherwise will cause an exception to be raised.
 if __name__ == '__main__':
     import sys,os
     import run
-    run.main(['', os.path.basename(sys.argv[0])])
+    run.main(['', os.path.basename(sys.argv[0])] + sys.argv[1:])