[Python-checkins] r68990 - in sandbox/trunk/ttk-gsoc/samples: theming.py ttkcalendar.py widget_state.py

guilherme.polo python-checkins at python.org
Tue Jan 27 02:22:20 CET 2009


Author: guilherme.polo
Date: Tue Jan 27 02:22:20 2009
New Revision: 68990

Log:
Bug fix on samples/widget_state.py and other minor fixes.


Modified:
   sandbox/trunk/ttk-gsoc/samples/theming.py
   sandbox/trunk/ttk-gsoc/samples/ttkcalendar.py
   sandbox/trunk/ttk-gsoc/samples/widget_state.py

Modified: sandbox/trunk/ttk-gsoc/samples/theming.py
==============================================================================
--- sandbox/trunk/ttk-gsoc/samples/theming.py	(original)
+++ sandbox/trunk/ttk-gsoc/samples/theming.py	Tue Jan 27 02:22:20 2009
@@ -215,7 +215,7 @@
                 sbar.grid_remove()
             else:
                 sbar.grid()
-        
+
             sbar.set(first, last)
 
         return wrapped

Modified: sandbox/trunk/ttk-gsoc/samples/ttkcalendar.py
==============================================================================
--- sandbox/trunk/ttk-gsoc/samples/ttkcalendar.py	(original)
+++ sandbox/trunk/ttk-gsoc/samples/ttkcalendar.py	Tue Jan 27 02:22:20 2009
@@ -14,6 +14,13 @@
 
 import ttk
 
+def get_calendar(locale, fwday):
+    # instantiate proper calendar class
+    if locale is None:
+        return calendar.TextCalendar(fwday)
+    else:
+        return calendar.LocaleTextCalendar(fwday, locale)
+
 class Calendar(ttk.Frame):
     # XXX ToDo: critical: cget and configure
 
@@ -40,11 +47,7 @@
 
         ttk.Frame.__init__(self, master, **kw)
 
-        # instantiate proper calendar class
-        if locale is None:
-            self._cal = calendar.TextCalendar(fwday)
-        else:
-            self._cal = calendar.LocaleTextCalendar(fwday, locale)
+        self._cal = get_calendar(locale, fwday)
 
         self.__setup_styles()       # creates custom styles
         self.__place_widgets()      # pack/grid used widgets

Modified: sandbox/trunk/ttk-gsoc/samples/widget_state.py
==============================================================================
--- sandbox/trunk/ttk-gsoc/samples/widget_state.py	(original)
+++ sandbox/trunk/ttk-gsoc/samples/widget_state.py	Tue Jan 27 02:22:20 2009
@@ -20,7 +20,7 @@
 
         # get default font size and family
         btn_font = self.style.lookup("TButton", "-font")
-        fsize = self.tk.eval("font configure %s -size" % btn_font)
+        fsize = str(self.tk.eval("font configure %s -size" % btn_font))
         self.font_family = self.tk.eval("font configure %s -family" % btn_font)
         if ' ' in self.font_family:
             self.font_family = '{%s}' % self.font_family


More information about the Python-checkins mailing list