[Python-checkins] CVS: python/dist/src/Lib/lib-tk Tkinter.py,1.159,1.160

Martin v. L?wis loewis@users.sourceforge.net
Sat, 13 Oct 2001 02:33:53 -0700


Update of /cvsroot/python/python/dist/src/Lib/lib-tk
In directory usw-pr-cvs1:/tmp/cvs-serv21653

Modified Files:
	Tkinter.py 
Log Message:
Move grid_location into Misc. Fixes bug #426892.


Index: Tkinter.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/lib-tk/Tkinter.py,v
retrieving revision 1.159
retrieving revision 1.160
diff -C2 -d -r1.159 -r1.160
*** Tkinter.py	2001/10/01 17:02:49	1.159
--- Tkinter.py	2001/10/13 09:33:51	1.160
***************
*** 1192,1195 ****
--- 1192,1202 ----
          return self._grid_configure('columnconfigure', index, cnf, kw)
      columnconfigure = grid_columnconfigure
+     def grid_location(self, x, y):
+         """Return a tuple of column and row which identify the cell
+         at which the pixel at position X and Y inside the master
+         widget is located."""
+         return self._getints(
+             self.tk.call(
+                 'grid', 'location', self._w, x, y)) or None
      def grid_propagate(self, flag=_noarg_):
          """Set or get the status for propagation of geometry information.
***************
*** 1702,1713 ****
          return dict
      info = grid_info
!     def grid_location(self, x, y):
!         """Return a tuple of column and row which identify the cell
!         at which the pixel at position X and Y inside the master
!         widget is located."""
!         return self._getints(
!             self.tk.call(
!                 'grid', 'location', self._w, x, y)) or None
!     location = grid_location
      propagate = grid_propagate = Misc.grid_propagate
      rowconfigure = grid_rowconfigure = Misc.grid_rowconfigure
--- 1709,1713 ----
          return dict
      info = grid_info
!     location = grid_location = Misc.grid_location
      propagate = grid_propagate = Misc.grid_propagate
      rowconfigure = grid_rowconfigure = Misc.grid_rowconfigure