Merged wxPython 2.4.x to the 2.5 branch (Finally!!!)

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

wxPython/demo/wxPyColourChooser.py

@@ -0,0 +1,58 @@
+from wxPython.wx import *
+from wxPython.lib.colourchooser import wxPyColourChooser
+
+#---------------------------------------------------------------
+
+class TestColourChooser(wxPanel):
+    def __init__(self, parent, log):
+        wxPanel.__init__(self, parent, -1)
+        self.log = log
+
+        chooser = wxPyColourChooser(self, -1)
+        sizer = wxBoxSizer(wxVERTICAL)
+        sizer.Add(chooser, 0, wxALL, 25)
+
+        self.SetAutoLayout(True)
+        self.SetSizer(sizer)
+
+#---------------------------------------------------------------
+
+def runTest(frame, nb, log):
+    win = TestColourChooser(nb, log)
+    return win
+
+#---------------------------------------------------------------
+
+overview = """
+The wxPyColourChooser component creates a colour chooser window
+that is similar to the Microsoft Windows colour chooser dialog.
+This dialog component is drawn in a panel, and thus can be
+embedded inside any widget (although it cannot be resized).
+This colour chooser may also be substituted for the colour
+chooser on any platform that might have an ugly one :)
+
+How to use it
+------------------------------
+
+The demo (demo/wxPyColourChooser.py code shows how to display
+a colour chooser and retrieve its options.
+
+Contact and Author Info
+------------------------------
+
+wxPyColourChooser was written and is maintained by:
+
+    Michael Gilfix <mgilfix@eecs.tufts.edu>
+
+You can find the latest wxPyColourChooser code at
+http://www.sourceforge.net/wxcolourchooser. If you have
+any suggestions or want to submit a patch, please send
+it my way at: mgilfix@eecs.tufts.edu
+"""
+
+
+
+if __name__ == '__main__':
+    import sys,os
+    import run
+    run.main(['', os.path.basename(sys.argv[0])])