[gnue] r8710 - trunk/gnue-forms/src/uidrivers/wx26/widgets

[reinhard]

Author: reinhard
Date: 2006-10-05 05:17:48 -0500 (Thu, 05 Oct 2006)
New Revision: 8710

Modified:
   trunk/gnue-forms/src/uidrivers/wx26/widgets/grid.py
Log:
Removed an unused variable and made two other variables private.


Modified: trunk/gnue-forms/src/uidrivers/wx26/widgets/grid.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/wx26/widgets/grid.py 2006-10-05 10:17:00 UTC 
(rev 8709)
+++ trunk/gnue-forms/src/uidrivers/wx26/widgets/grid.py 2006-10-05 10:17:48 UTC 
(rev 8710)
@@ -48,9 +48,8 @@
     def __init__(self, event):
 
         _base.UIHelper.__init__(self, event)
-        self._max = 0
-        self._current_records = 0
-        self._visible = 0
+        self.__max = 0
+        self.__visible = 0
 
 
     # -------------------------------------------------------------------------
@@ -100,10 +99,9 @@
         self.scroll.Bind(wx.EVT_SCROLL, self.__on_scroll)
         self.do_adjust_scrollbar(crec, recs)
 
-        self._max = self._gfObject.rows
-        self._visible = self._max
+        self.__max = self._gfObject.rows
+        self.__visible = self.__max
 
-        self._current_records = self._gfObject.rows
         self.__build_header()
 
         owner.add_widgets(self, spacer)
@@ -187,13 +185,13 @@
             num_recs = (height - hd_height) / rech
 
             # Get the diff
-            if num_recs > self._visible:
-                self.__add_new_records(num_recs - self._visible)
+            if num_recs > self.__visible:
+                self.__add_new_records(num_recs - self.__visible)
                 self.walk(self.__child_rows_walker)
                 self._form.refreshDisplay(self._gfObject)
 
-            elif num_recs < self._visible:
-                self.__hide_records(self._visible - num_recs)
+            elif num_recs < self.__visible:
+                self.__hide_records(self.__visible - num_recs)
                 self.walk(self.__child_rows_walker)
 
         finally:
@@ -229,15 +227,15 @@
     def __add_new_records(self, num_recs):
 
         for index in range(num_recs):
-            record = self._visible + index
+            record = self.__visible + index
 
-            if record >= self._max:
+            if record >= self.__max:
                 self.walk(self.__child_add_walker, record)
-                self._max += 1
+                self.__max += 1
             else:
                 self.__change_visibility(record, True)
 
-        self._visible += num_recs
+        self.__visible += num_recs
 
         self._uiForm.main_window.Layout()
 
@@ -278,15 +276,15 @@
     def __hide_records(self, num_recs):
 
         for index in range(num_recs):
-            self.__change_visibility(self._visible-1, False)
-            self._visible -= 1
+            self.__change_visibility(self.__visible-1, False)
+            self.__visible -= 1
 
-        if self._uiDriver._uiFocusIndex > self._visible - 1:
+        if self._uiDriver._uiFocusIndex > self.__visible - 1:
             focus = self._uiDriver._uiFocusWidget
             focus.lose_focus(self._uiDriver._uiFocusIndex)
 
-            self._uiDriver._uiFocusIndex = self._visible - 1
-            focus.indexed_focus(self._visible - 1)
+            self._uiDriver._uiFocusIndex = self.__visible - 1
+            focus.indexed_focus(self.__visible - 1)
 
         self._uiForm.main_window.Layout()
 
@@ -300,7 +298,7 @@
         if item == self:
             return
 
-        item._gfObject._rows = self._visible
+        item._gfObject._rows = self.__visible
 
     def do_adjust_scrollbar(self, position, count):
         """