r6091 - in trunk/gnue-forms/src/uidrivers/gtk2: . widgets

[johannes]

Author: johannes
Date: 2004-07-27 10:01:35 -0500 (Tue, 27 Jul 2004)
New Revision: 6091

Modified:
   trunk/gnue-forms/src/uidrivers/gtk2/UIdriver.py
   trunk/gnue-forms/src/uidrivers/gtk2/widgets/button.py
   trunk/gnue-forms/src/uidrivers/gtk2/widgets/entry.py
   trunk/gnue-forms/src/uidrivers/gtk2/widgets/label.py
Log:
Don't set a font, just use the default's as set by themes and the like


Modified: trunk/gnue-forms/src/uidrivers/gtk2/UIdriver.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/gtk2/UIdriver.py     2004-07-27 15:00:59 UTC 
(rev 6090)
+++ trunk/gnue-forms/src/uidrivers/gtk2/UIdriver.py     2004-07-27 15:01:35 UTC 
(rev 6091)
@@ -122,7 +122,6 @@
     self.textHeight = CHAR_HEIGHT
 
     gDebug (1, "Metrics %s x %s" % (self.textWidth, self.textHeight))
-    gDebug (1, "Default %s x %s" % (CHAR_WIDTH, CHAR_HEIGHT))
 
     self.widgetWidth  = self.textWidth
     self.widgetHeight = self.textHeight + 3
@@ -328,7 +327,6 @@
   try:
     if fontName is not None:
       fontDesc = pango.FontDescription (fontName)
-      label.modify_font (fontDesc)
 
     context  = label.get_pango_context ()
     if fontName is None:
@@ -348,9 +346,4 @@
 # Get the current default application font and it's metrics
 # =============================================================================
 
-if gConfigForms ('fixedWidthFont'):
-  fontname = 'monospace %s' % gConfigForms ('pointSize')
-else:
-  fontname = None
-
-(CHAR_WIDTH, CHAR_HEIGHT, APPFONT) = _getFontMetrics (fontname)
+(CHAR_WIDTH, CHAR_HEIGHT, APPFONT) = _getFontMetrics ()

Modified: trunk/gnue-forms/src/uidrivers/gtk2/widgets/button.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/gtk2/widgets/button.py       2004-07-27 
15:00:59 UTC (rev 6090)
+++ trunk/gnue-forms/src/uidrivers/gtk2/widgets/button.py       2004-07-27 
15:01:35 UTC (rev 6091)
@@ -42,7 +42,6 @@
 
     text = "%s" % object.label
     newWidget = gtk.Button (self._makeSafe (text))
-    newWidget.modify_font (self._uiDriver.font)
     newWidget.set_size_request (self.itemWidth, self.itemHeight)
 
     if event.initialize:

Modified: trunk/gnue-forms/src/uidrivers/gtk2/widgets/entry.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/gtk2/widgets/entry.py        2004-07-27 
15:00:59 UTC (rev 6090)
+++ trunk/gnue-forms/src/uidrivers/gtk2/widgets/entry.py        2004-07-27 
15:01:35 UTC (rev 6091)
@@ -67,7 +67,6 @@
 
   def __createDropDown (self, gfObject, event):
     newWidget = gtk.Combo ()
-    newWidget.entry.modify_font (self._uiDriver.font)
     maxLen = hasattr (gfObject, 'maxLength') and gfObject.maxLength or 0
     newWidget.entry.set_max_length (maxLen)
     
@@ -104,7 +103,6 @@
 
   def __createLabel (self, gfObject, event):
     newWidget = gtk.Label ("")
-    newWidget.modify_font (self._uiDriver.font)
     # Place a label deeper than the input widgets, so the baselines are ok
     event.container.put (newWidget, self.itemX, self.itemY + 4)
     newWidget.show ()
@@ -119,7 +117,6 @@
   def __createCheckbox (self, gfObject, event):
     label = len (gfObject.label) and gfObject.label or None
     newWidget = gtk.CheckButton (label)
-    newWidget.modify_font (self._uiDriver.font)
     event.container.put (newWidget, self.itemX, self.itemY)
     newWidget.show ()
 
@@ -139,7 +136,6 @@
   def __createTextView (self, gfObject, event):
 
     newWidget = gtk.TextView ()
-    newWidget.modify_font (self._uiDriver.font)
     newWidget.set_wrap_mode (gtk.WRAP_CHAR)
     newWidget.set_pixels_above_lines (2)
     newWidget.set_left_margin (2)
@@ -184,7 +180,6 @@
     maxLen = hasattr (gfObject, 'maxLength') and gfObject.maxLength or 0
 
     newWidget = gtk.Entry (maxLen)
-    newWidget.modify_font (self._uiDriver.font)
     newWidget.set_size_request (self.itemWidth, self.itemHeight)
 
     newWidget._insert_handler = newWidget.connect ('insert-text',
@@ -452,7 +447,6 @@
                                            self._focusOnScroll, newWidget)
       scroll.show ()
 
-    newWidget.modify_font (self._uiDriver.font)
     self.selection = newWidget.get_selection ()
     self.selection.set_mode (gtk.SELECTION_SINGLE)
     self.selection._changedHandler = self.selection.connect ('changed',

Modified: trunk/gnue-forms/src/uidrivers/gtk2/widgets/label.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/gtk2/widgets/label.py        2004-07-27 
15:00:59 UTC (rev 6090)
+++ trunk/gnue-forms/src/uidrivers/gtk2/widgets/label.py        2004-07-27 
15:01:35 UTC (rev 6091)
@@ -53,8 +53,6 @@
     text = "%s" % gfObject.text
 
     newWidget = gtk.Label (self._makeSafe (text))
-    newWidget.modify_font (self._uiDriver.font)
-
     newWidget.set_justify (_alignmentStyle [gfObject.alignment])
 
     # Make sure the baseline of labels and widgets are the same