Merge commit 'origin' into new_eth

Conflicts:
	.gitignore

1 files changed, 9 insertions, 2 deletions

diff --git a/gr-wxgui/src/python/forms/forms.py b/gr-wxgui/src/python/forms/forms.py
index c69315b03..8dc58367d 100644
--- a/gr-wxgui/src/python/forms/forms.py
+++ b/gr-wxgui/src/python/forms/forms.py
@@ -176,7 +176,7 @@ class _slider_base(_form_base):
 		self._add_widget(self._slider, label, flag=wx.EXPAND)
 
 	def _handle(self, event): self[INT_KEY] = self._slider.GetValue()
-	def _update(self, value): self._slider.SetValue(value)
+	def _update(self, value): self._slider.SetValue(int(round(value)))
 
 ########################################################################
 # Static Text Form
@@ -224,11 +224,18 @@ class text_box(_form_base):
 	def __init__(self, label='', width=-1, converter=converters.eval_converter(), **kwargs):
 		_form_base.__init__(self, converter=converter, **kwargs)
 		self._text_box = wx.TextCtrl(self._parent, size=wx.Size(width, -1), style=wx.TE_PROCESS_ENTER)
+		self._default_bg_colour = self._text_box.GetBackgroundColour()
 		self._text_box.Bind(wx.EVT_TEXT_ENTER, self._handle)
+		self._text_box.Bind(wx.EVT_TEXT, self._update_color)
 		self._add_widget(self._text_box, label)
 
+	def _update_color(self, *args):
+		if self._text_box.GetValue() == self[INT_KEY]:
+			self._text_box.SetBackgroundColour(self._default_bg_colour)
+		else: self._text_box.SetBackgroundColour('#EEDDDD')
+
 	def _handle(self, event): self[INT_KEY] = self._text_box.GetValue()
-	def _update(self, value): self._text_box.SetValue(value)
+	def _update(self, value): self._text_box.SetValue(value); self._update_color()
 
 ########################################################################
 # Slider Form