compilation fix after removing wxImage(wxImage *) ctor

[wxWidgets.git] / wxPython / wx / lib / colourchooser / pycolourchooser.py

diff --git a/wxPython/wx/lib/colourchooser/pycolourchooser.py b/wxPython/wx/lib/colourchooser/pycolourchooser.py
index 0ddebe9ba569aba6be81a3cc9f83437a05af7c9b..295698896d41d149bf346688a07e0f943159a893 100644 (file)
--- a/wxPython/wx/lib/colourchooser/pycolourchooser.py
+++ b/wxPython/wx/lib/colourchooser/pycolourchooser.py
@@ -1,10 +1,10 @@
 """
-wxPyColourChooser
+PyColourChooser
 Copyright (C) 2002 Michael Gilfix <mgilfix@eecs.tufts.edu>
 
-This file is part of wxPyColourChooser.
+This file is part of PyColourChooser.
 
-This version of wxPyColourChooser is open source; you can redistribute it
+This version of PyColourChooser is open source; you can redistribute it
 and/or modify it under the licensed terms.
 
 This program is distributed in the hope that it will be useful,
@@ -16,6 +16,13 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 #
 # o 2.5 compatability update.
 #
+# 12/21/2003 - Jeff Grimmett (grimmtooth@softhome.net)
+#
+# o wxPyColorChooser -> PyColorChooser
+# o wxPyColourChooser -> PyColourChooser
+# o Added wx.InitAllImageHandlers() to test code since
+#   that's where it belongs.
+#
 
 import  wx
 
@@ -27,7 +34,7 @@ import  intl
 
 from intl import _ # _
 
-class wxPyColourChooser(wx.Panel):
+class PyColourChooser(wx.Panel):
     """A Pure-Python implementation of the colour chooser dialog.
 
     The PyColourChooser is a pure python implementation of the colour
@@ -195,9 +202,9 @@ class wxPyColourChooser(wx.Panel):
         self.ventry.SetSize((40, -1))
         hsvgrid = wx.FlexGridSizer(1, 6, 2, 2)
         hsvgrid.AddMany ([
-            (hlabel, 0, wx.ALIGN_CENTER_VERTICAL), (self.hentry, 0, 0),
-            (slabel, 0, wx.ALIGN_CENTER_VERTICAL), (self.sentry, 0, 0),
-            (vlabel, 0, wx.ALIGN_CENTER_VERTICAL), (self.ventry, 0, 0),
+            (hlabel, 0, wx.ALIGN_CENTER_VERTICAL), (self.hentry, 0, wx.FIXED_MINSIZE),
+            (slabel, 0, wx.ALIGN_CENTER_VERTICAL), (self.sentry, 0, wx.FIXED_MINSIZE),
+            (vlabel, 0, wx.ALIGN_CENTER_VERTICAL), (self.ventry, 0, wx.FIXED_MINSIZE),
         ])
 
         rlabel = wx.StaticText(self, -1, _("R:"))
@@ -211,9 +218,9 @@ class wxPyColourChooser(wx.Panel):
         self.bentry.SetSize((40, -1))
         lgrid = wx.FlexGridSizer(1, 6, 2, 2)
         lgrid.AddMany([
-            (rlabel, 0, wx.ALIGN_CENTER_VERTICAL), (self.rentry, 0, 0),
-            (glabel, 0, wx.ALIGN_CENTER_VERTICAL), (self.gentry, 0, 0),
-            (blabel, 0, wx.ALIGN_CENTER_VERTICAL), (self.bentry, 0, 0),
+            (rlabel, 0, wx.ALIGN_CENTER_VERTICAL), (self.rentry, 0, wx.FIXED_MINSIZE),
+            (glabel, 0, wx.ALIGN_CENTER_VERTICAL), (self.gentry, 0, wx.FIXED_MINSIZE),
+            (blabel, 0, wx.ALIGN_CENTER_VERTICAL), (self.bentry, 0, wx.FIXED_MINSIZE),
         ])
 
         gsizer = wx.GridSizer(2, 1)
@@ -383,7 +390,13 @@ def main():
         def OnInit(self):
             frame = wx.Frame(None, -1, 'PyColourChooser Test')
 
-            chooser = wxPyColourChooser(frame, -1)
+            # Added here because that's where it's supposed to be,
+            # not embedded in the library. If it's embedded in the
+            # library, debug messages will be generated for duplicate
+            # handlers.
+            wx.InitAllImageHandlers()
+
+            chooser = PyColourChooser(frame, -1)
             sizer = wx.BoxSizer(wx.VERTICAL)
             sizer.Add(chooser, 0, 0)
             frame.SetAutoLayout(True)