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

[reinhard]

Author: reinhard
Date: 2010-10-28 13:52:29 -0500 (Thu, 28 Oct 2010)
New Revision: 10220

Modified:
   trunk/gnue-forms/
   trunk/gnue-forms/src/uidrivers/wx/widgets/button.py
   trunk/gnue-forms/src/uidrivers/wx/widgets/entry.py
Log:
Avoid exception if kill_focus is called without previous call to set_foucs.



Property changes on: trunk/gnue-forms
___________________________________________________________________
Name: bzr:revision-info
   - timestamp: 2010-10-20 22:20:48.809000015 +0200
committer: Reinhard Müller <address@hidden>
properties: 
        branch-nick: forms

   + timestamp: 2010-10-27 23:12:56.453000069 +0200
committer: Reinhard Müller <address@hidden>
properties: 
        branch-nick: forms

Name: bzr:file-ids
   - src/GFObjects/GFBlock.py   
address@hidden:trunk%2Fgnue-forms:src%2FGFObjects%2FGFBlock.py
src/GFObjects/GFField.py        
address@hidden:trunk%2Fgnue-forms:src%2FGFObjects%2FGFField.py

   + src/uidrivers/wx/widgets/button.py 
address@hidden:trunk%2Fgnue-forms:src%2Fuidrivers%2Fwx%2Fwidgets%2Fbutton.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

   + 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

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

   + src/uidrivers/wx/widgets/button.py 
svn-v3-single1-dHJ1bmsvZ251ZS1mb3Jtcw..:3a364389-8fce-0310-8f11-cc363fde16c7:trunk%2Fgnue-forms:10116
src/uidrivers/wx/widgets/entry.py       address@hidden


Modified: trunk/gnue-forms/src/uidrivers/wx/widgets/button.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/wx/widgets/button.py 2010-10-28 18:52:06 UTC 
(rev 10219)
+++ trunk/gnue-forms/src/uidrivers/wx/widgets/button.py 2010-10-28 18:52:29 UTC 
(rev 10220)
@@ -74,6 +74,8 @@
 
         owner.add_widgets(self, spacer)
 
+        self.__old_background = None
+
         return self.widget
 
 
@@ -155,7 +157,8 @@
 
         # Change background color of widget if requested.
         if gConfigForms('focus_color'):
-            widget.SetBackgroundColour(self.__old_background)
+            if self.__old_background is not None:
+                widget.SetBackgroundColour(self.__old_background)
 
 
     # -------------------------------------------------------------------------

Modified: trunk/gnue-forms/src/uidrivers/wx/widgets/entry.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/wx/widgets/entry.py  2010-10-28 18:52:06 UTC 
(rev 10219)
+++ trunk/gnue-forms/src/uidrivers/wx/widgets/entry.py  2010-10-28 18:52:29 UTC 
(rev 10220)
@@ -72,6 +72,8 @@
         self.__current_row = None
         self.__current_row_color_save = None
 
+        self.__old_background = None
+
         # We return the entry object here, since we will bind events to it
         # later
         return self.widget
@@ -306,7 +308,8 @@
 
         # Change background color of widget if requested.
         if gConfigForms('focus_color'):
-            widget.SetBackgroundColour(self.__old_background)
+            if self.__old_background is not None:
+                widget.SetBackgroundColour(self.__old_background)
 
     # -------------------------------------------------------------------------