warning fix

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

diff --git a/wxPython/demo/ColourSelect.py b/wxPython/demo/ColourSelect.py
index 442696eb07811ac87afa12009ae09cf10323c871..01065dd37b2b19dc797f7836414d114475841bda 100644 (file)
--- a/wxPython/demo/ColourSelect.py
+++ b/wxPython/demo/ColourSelect.py
@@ -1,67 +1,97 @@
-

 #----------------------------------------------------------------------------
 # Name:         ColourSelect.py
 # Purpose:      Colour Selection control display testing on panel for wxPython demo
 #
 # Author:       Lorne White (email: lorne.white@telusplanet.net)
 #
 #----------------------------------------------------------------------------
 # Name:         ColourSelect.py
 # Purpose:      Colour Selection control display testing on panel for wxPython demo
 #
 # Author:       Lorne White (email: lorne.white@telusplanet.net)
 #

-# Version       0.5
-# Date:         Feb 26, 2001
+# Version       0.6
+# Date:         Nov 14, 2001

 # Licence:      wxWindows license
 # Licence:      wxWindows license

+#
+# Change Log:  Add Label parameter to accommodate updated library code
+#
+# Cliff Wells (logiplexsoftware@earthlink.net) 2002/03/11
+#              - added code to demonstrate EVT_COLOURSELECT
+#              - 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
     def __init__(self, parent, log):
         self.log = log

-        wxPanel.__init__(self, parent, -1)
-
-        wxStaticText(self, -1, "This example uses a colour selection control based on the wxButton and wxColourDialog Classes.  Click Button to get Colour Values",
-                               wxPoint(10, 20), wxSize(400, 60))
-
-        self.x_pos = 30
-        self.y_pos = 100
-        delta = 40
-
-        mID = NewId()
-        wxButton(self, mID, "Get All Colours", wxPoint(self.x_pos, self.y_pos))
-        EVT_BUTTON(self, mID, self.OnClick)
-        self.y_pos = self.y_pos + delta
-
-        wxStaticText(self, -1, "Default", wxPoint(self.x_pos, self.y_pos), wxSize(-1, -1))   # name
-        self.colour_def = ColourSelect(self, -1, pos=wxPoint(self.x_pos+100, self.y_pos))   # default colour selection control
-
-        self.y_pos = self.y_pos + delta
-        colours = [[255, 255, 0], [255, 0, 255], [0, 255, 0], [0, 0, 255]]   # list of initial colours for display
-        self.names = names = [ "Default Size", "Another Size", "Another Colour", "Larger"]    # display names
-        sizes = [ wxDefaultSize, wxSize(60, 20), wxDefaultSize, wxSize(60, 60)]       # button sizes
-        self.set_val = []
-
-        for i in range(len(colours)):
-            wxStaticText(self, -1, names[i], wxPoint(self.x_pos, self.y_pos), wxSize(-1, -1))   # name
-
-            val = ColourSelect(self, -1, colours[i], wxPoint(self.x_pos+100, self.y_pos), sizes[i])     # colour selection button
-            self.set_val.append(val)     # store control for reference
-            self.y_pos = self.y_pos + delta
-
-
-    def OnClick(self, event):
+        wx.Panel.__init__(self, parent, -1)
+        self.SetAutoLayout(True)
+        mainSizer = wx.BoxSizer(wx.VERTICAL)
+        self.SetSizer(mainSizer)
+        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, wx.ALL, 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 = wx.FlexGridSizer(1, 2) # sizer to contain all the example buttons
+
+        # show a button with all default values
+        self.colourDefaults = csel.ColourSelect(self, -1)
+
+        self.Bind(csel.EVT_COLOURSELECT, self.OnSelectColour, id=self.colourDefaults.GetId())
+        
+        buttonSizer.AddMany([
+            (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),   wx.DefaultSize, ""),
+            ("Another Size",         (255, 0, 255),   (60, 20),      ""),
+            ("Another Colour",       (0, 255, 0),     wx.DefaultSize, ""),
+            ("Larger Size",          (0, 0, 255),     (60, 60),      ""),
+            ("With a Label",         (127, 0, 255),   wx.DefaultSize, "Colour..."),
+            ("Another Colour/Label", (255, 100, 130), (120, -1),     "Choose Colour..."),
+            ]
+
+        self.buttonRefs = [] # for saving references to buttons
+
+        # build each button and save a reference to it
+        for name, color, size, label in buttonData:
+            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([
+                (wx.StaticText(self, -1, name), 0, wx.ALIGN_RIGHT | wx.ALIGN_CENTER_VERTICAL),
+                (b, 0, wx.ALL, 3),
+                ])
+
+        mainSizer.Add(buttonSizer, 0, wx.ALL, 3)
+        self.Layout()
+
+    def OnSelectColour(self, event):
+        self.log.WriteText("Colour selected: %s" % str(event.GetValue()))
+
+    def OnShowAll(self, event):
+        # show the state of each button

         result = []
         result = []

-        colour = self.colour_def.GetColour()        # default control value
-        result.append("Default: " + str(colour))
+        colour = self.colourDefaults.GetColour() # default control value
+        result.append("Default Colour/Size: " + str(colour))

 
 

-        for i in range(len(self.set_val)):
-            val = self.set_val[i]
-            colour = val.GetColour()        # get the colour selection button result
-            name = self.names[i]
-            result.append(name + ": " + str(colour))        # create string list for easy viewing of results
-        out_result = string.joinfields(result, ',  ')
-        self.log.WriteText("Colour Results :" + out_result + "\n")
+        for name, button in self.buttonRefs:
+            colour = button.GetColour() # get the colour selection button result
+            result.append(name + ": " + str(colour))  # create string list for easy viewing of results
+
+        out_result = ',  '.join(result)
+        self.log.WriteText("Colour Results: " + out_result + "\n")

 
 #---------------------------------------------------------------------------
 
 
 #---------------------------------------------------------------------------
 


@@ -74,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 = """\
-
-"""