[gnue] r10264 - in trunk/gnue-forms: . src/uidrivers/wx/widgets

[reinhard]

Author: reinhard
Date: 2010-12-03 11:29:37 -0600 (Fri, 03 Dec 2010)
New Revision: 10264

Modified:
   trunk/gnue-forms/
   trunk/gnue-forms/src/uidrivers/wx/widgets/entry.py
Log:
Show current record in a grid (not only for label-style entries).



Property changes on: trunk/gnue-forms
___________________________________________________________________
Name: bzr:revision-info
   - timestamp: 2010-12-03 11:58:45.086999893 +0100
committer: Reinhard Müller <address@hidden>
properties: 
        branch-nick: forms

   + timestamp: 2010-12-03 12:21:40.121000051 +0100
committer: Reinhard Müller <address@hidden>
properties: 
        branch-nick: forms

Name: bzr:file-ids
   - src/GFObjects/GFTabStop.py 
address@hidden:trunk%2Fgnue-forms:src%2FGFObjects%2FGFTabStop.py

   + src/uidrivers/wx/widgets/entry.py  
address@hidden:trunk%2Fgnue-forms:src%2Fuidrivers%2Fwx%2Fwidgets%2Fentry.py

Name: bzr:revision-id:v4
   - 3116 address@hidden
3117 address@hidden
3118 address@hidden
3119 address@hidden
3120 address@hidden
3121 address@hidden
3122 address@hidden
3123 address@hidden
3124 address@hidden
3125 address@hidden
3126 address@hidden
3127 address@hidden
3128 address@hidden
3129 address@hidden
3130 address@hidden
3131 address@hidden
3132 address@hidden
3133 address@hidden
3134 address@hidden
3135 address@hidden
3136 address@hidden
3137 address@hidden
3138 address@hidden
3139 address@hidden
3140 address@hidden
3141 address@hidden
3142 address@hidden
3143 address@hidden
3144 address@hidden
3145 address@hidden
3146 address@hidden
3147 address@hidden
3148 address@hidden
3149 address@hidden
3150 address@hidden
3151 address@hidden
3152 address@hidden
3153 address@hidden
3154 address@hidden
3155 address@hidden
3156 address@hidden
3157 address@hidden
3158 address@hidden
3159 address@hidden
3160 address@hidden
3161 address@hidden
3162 address@hidden
3163 address@hidden
3164 address@hidden
3165 address@hidden
3166 address@hidden
3167 address@hidden
3168 address@hidden
3169 address@hidden
3170 address@hidden

   + 3116 address@hidden
3117 address@hidden
3118 address@hidden
3119 address@hidden
3120 address@hidden
3121 address@hidden
3122 address@hidden
3123 address@hidden
3124 address@hidden
3125 address@hidden
3126 address@hidden
3127 address@hidden
3128 address@hidden
3129 address@hidden
3130 address@hidden
3131 address@hidden
3132 address@hidden
3133 address@hidden
3134 address@hidden
3135 address@hidden
3136 address@hidden
3137 address@hidden
3138 address@hidden
3139 address@hidden
3140 address@hidden
3141 address@hidden
3142 address@hidden
3143 address@hidden
3144 address@hidden
3145 address@hidden
3146 address@hidden
3147 address@hidden
3148 address@hidden
3149 address@hidden
3150 address@hidden
3151 address@hidden
3152 address@hidden
3153 address@hidden
3154 address@hidden
3155 address@hidden
3156 address@hidden
3157 address@hidden
3158 address@hidden
3159 address@hidden
3160 address@hidden
3161 address@hidden
3162 address@hidden
3163 address@hidden
3164 address@hidden
3165 address@hidden
3166 address@hidden
3167 address@hidden
3168 address@hidden
3169 address@hidden
3170 address@hidden
3171 address@hidden

Name: bzr:text-parents
   - src/GFObjects/GFTabStop.py address@hidden

   + src/uidrivers/wx/widgets/entry.py  address@hidden


Modified: trunk/gnue-forms/src/uidrivers/wx/widgets/entry.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/wx/widgets/entry.py  2010-12-03 11:01:17 UTC 
(rev 10263)
+++ trunk/gnue-forms/src/uidrivers/wx/widgets/entry.py  2010-12-03 17:29:37 UTC 
(rev 10264)
@@ -684,13 +684,15 @@
 
     def _ui_set_current_row_(self, index):
         
-        # If we are a label in a grid, change the background color.
-        if self.in_grid and self._gfObject.style.lower() == 'label':
+        # If we are in a grid, change the background color.
+        if self.in_grid:
             # Reset old current row to normal color.
             if self.__current_row is not None:
                 widget = self.widgets[self.__current_row]
-                widget.SetForegroundColour(wx.NullColour)
-                widget._gnue_label_.SetForegroundColour(wx.NullColour)
+                if widget._gnue_label_ is not None:
+                    widget._gnue_label_.SetForegroundColour(wx.NullColour)
+                else:
+                    widget.SetForegroundColour(wx.NullColour)
                 widget.GetParent().SetBackgroundColour(
                         self.__current_row_color_save)
                 widget.GetParent().Refresh()    # Needed for Windows
@@ -704,10 +706,12 @@
                 widget = self.widgets[index]
                 self.__current_row_color_save = \
                         widget.GetParent().GetBackgroundColour()
-                widget.SetForegroundColour(
-                    wx.SystemSettings_GetColour(wx.SYS_COLOUR_HIGHLIGHTTEXT))
-                widget._gnue_label_.SetForegroundColour(
-                    wx.SystemSettings_GetColour(wx.SYS_COLOUR_HIGHLIGHTTEXT))
+                if widget._gnue_label_ is not None:
+                    widget._gnue_label_.SetForegroundColour(
+                        
wx.SystemSettings_GetColour(wx.SYS_COLOUR_HIGHLIGHTTEXT))
+                else:
+                    widget.SetForegroundColour(
+                        
wx.SystemSettings_GetColour(wx.SYS_COLOUR_HIGHLIGHTTEXT))
                 widget.GetParent().SetBackgroundColour(
                     wx.SystemSettings_GetColour(wx.SYS_COLOUR_HIGHLIGHT))
                 widget.GetParent().Refresh()    # Needed for Windows