X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/caa74ba3bb4829e24bb3e2024abf918d30207a59..66394199cf03f0e9a3a675fe9829d31463ad38bb:/wxPython/demo/ColourSelect.py?ds=sidebyside

diff --git a/wxPython/demo/ColourSelect.py b/wxPython/demo/ColourSelect.py
index 0e044e0671..01065dd37b 100644
--- a/wxPython/demo/ColourSelect.py
+++ b/wxPython/demo/ColourSelect.py
@@ -15,46 +15,48 @@
 #              - use sizers
 #              - other minor "improvements"
 #----------------------------------------------------------------------------
+# 
 
-from wxPython.wx import *
-from wxPython.lib.colourselect import *
-import string
+import  wx
+import  wx.lib.colourselect as  csel
 
 #----------------------------------------------------------------------------
 
-class TestColourSelect(wxPanel):
+class TestColourSelect(wx.Panel):
     def __init__(self, parent, log):
         self.log = log
-        wxPanel.__init__(self, parent, -1)
-        self.SetAutoLayout(true)
-        mainSizer = wxBoxSizer(wxVERTICAL)
+        wx.Panel.__init__(self, parent, -1)
+        self.SetAutoLayout(True)
+        mainSizer = wx.BoxSizer(wx.VERTICAL)
         self.SetSizer(mainSizer)
-        t = wxStaticText(self, -1,
+        t = wx.StaticText(self, -1,
                          "This example uses a colour selection control based on the wxButton\n"
                          "and wxColourDialog Classes.  Click Button to get Colour Values")
-        mainSizer.Add(t, 0, wxALL, 3)
+        mainSizer.Add(t, 0, wx.ALL, 3)
 
-        b = wxButton(self, -1, "Show All Colours")
-        EVT_BUTTON(self, b.GetId(), self.OnShowAll)
-        mainSizer.Add(b, 0, wxALL, 3)
+        b = wx.Button(self, -1, "Show All Colours")
+        self.Bind(wx.EVT_BUTTON, self.OnShowAll, id=b.GetId())
+        mainSizer.Add(b, 0, wx.ALL, 3)
 
-        buttonSizer = wxFlexGridSizer(1, 2) # sizer to contain all the example buttons
+        buttonSizer = wx.FlexGridSizer(1, 2) # sizer to contain all the example buttons
 
         # show a button with all default values
-        self.colourDefaults = ColourSelect(self, -1)
-        EVT_COLOURSELECT(self.colourDefaults, self.colourDefaults.GetId(), self.OnSelectColour)
+        self.colourDefaults = csel.ColourSelect(self, -1)
+
+        self.Bind(csel.EVT_COLOURSELECT, self.OnSelectColour, id=self.colourDefaults.GetId())
+        
         buttonSizer.AddMany([
-            (wxStaticText(self, -1, "Default Colour/Size"), 0, wxALIGN_RIGHT | wxALIGN_CENTER_VERTICAL),
-            (self.colourDefaults, 0, wxALL, 3),
+            (wx.StaticText(self, -1, "Default Colour/Size"), 0, wx.ALIGN_RIGHT | wx.ALIGN_CENTER_VERTICAL),
+            (self.colourDefaults, 0, wx.ALL, 3),
             ])
 
         # build several examples of buttons with different colours and sizes
         buttonData = [
-            ("Default Size",         (255, 255, 0),   wxDefaultSize, ""),
+            ("Default Size",         (255, 255, 0),   wx.DefaultSize, ""),
             ("Another Size",         (255, 0, 255),   (60, 20),      ""),
-            ("Another Colour",       (0, 255, 0),     wxDefaultSize, ""),
+            ("Another Colour",       (0, 255, 0),     wx.DefaultSize, ""),
             ("Larger Size",          (0, 0, 255),     (60, 60),      ""),
-            ("With a Label",         (127, 0, 255),   wxDefaultSize, "Colour..."),
+            ("With a Label",         (127, 0, 255),   wx.DefaultSize, "Colour..."),
             ("Another Colour/Label", (255, 100, 130), (120, -1),     "Choose Colour..."),
             ]
 
@@ -62,15 +64,17 @@ class TestColourSelect(wxPanel):
 
         # build each button and save a reference to it
         for name, color, size, label in buttonData:
-            b = ColourSelect(self, -1, label, color, size = size)
-            EVT_COLOURSELECT(b, b.GetId(), self.OnSelectColour)
+            b = csel.ColourSelect(self, -1, label, color, size = size)
+
+            b.Bind(csel.EVT_COLOURSELECT, self.OnSelectColour)
             self.buttonRefs.append((name, b))  # store reference to button
+
             buttonSizer.AddMany([
-                (wxStaticText(self, -1, name), 0, wxALIGN_RIGHT | wxALIGN_CENTER_VERTICAL),
-                (b, 0, wxALL, 3),
+                (wx.StaticText(self, -1, name), 0, wx.ALIGN_RIGHT | wx.ALIGN_CENTER_VERTICAL),
+                (b, 0, wx.ALL, 3),
                 ])
 
-        mainSizer.Add(buttonSizer, 0, wxALL, 3)
+        mainSizer.Add(buttonSizer, 0, wx.ALL, 3)
         self.Layout()
 
     def OnSelectColour(self, event):
@@ -86,7 +90,7 @@ class TestColourSelect(wxPanel):
             colour = button.GetColour() # get the colour selection button result
             result.append(name + ": " + str(colour))  # create string list for easy viewing of results
 
-        out_result = string.joinfields(result, ',  ')
+        out_result = ',  '.join(result)
         self.log.WriteText("Colour Results: " + out_result + "\n")
 
 #---------------------------------------------------------------------------
@@ -100,17 +104,13 @@ def runTest(frame, nb, log):
 
 
 
+overview = """\
+A coloured button that when clicked allows the user to select a colour from the wxColourDialog.
+"""
 
 
+if __name__ == '__main__':
+    import sys,os
+    import run
+    run.main(['', os.path.basename(sys.argv[0])] + sys.argv[1:])
 
-
-
-
-
-
-
-
-
-overview = """\
-
-"""