[Idle-dev] CVS: idle SearchDialogBase.py,1.5,1.6

Kurt B. Kaiser kbk@users.sourceforge.net
Wed, 20 Nov 2002 19:02:19 -0800


Update of /cvsroot/idlefork/idle
In directory sc8-pr-cvs1:/tmp/cvs-serv6486

Modified Files:
	SearchDialogBase.py 
Log Message:
Apply Nicolas Riley's Patch. 

[ 634250 ] SearchDialogBase.py fix for Tk 8.4.1

SearchDialogBase refers to the grid 'col' option
considered ambiguous with Python 2.2.2 and Tk 8.4.1.
The correct name is 'column'.


Index: SearchDialogBase.py
===================================================================
RCS file: /cvsroot/idlefork/idle/SearchDialogBase.py,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** SearchDialogBase.py	6 Nov 2002 02:18:45 -0000	1.5
--- SearchDialogBase.py	21 Nov 2002 03:02:17 -0000	1.6
***************
*** 52,58 ****
      def make_entry(self, label, var):
          l = Label(self.top, text=label)
!         l.grid(row=self.row, col=0, sticky="nw")
          e = Entry(self.top, textvariable=var, exportselection=0)
!         e.grid(row=self.row, col=1, sticky="nwe")
          self.row = self.row + 1
          return e
--- 52,58 ----
      def make_entry(self, label, var):
          l = Label(self.top, text=label)
!         l.grid(row=self.row, column=0, sticky="nw")
          e = Entry(self.top, textvariable=var, exportselection=0)
!         e.grid(row=self.row, column=1, sticky="nwe")
          self.row = self.row + 1
          return e
***************
*** 61,67 ****
          if labeltext:
              l = Label(self.top, text=labeltext)
!             l.grid(row=self.row, col=0, sticky="nw")
          f = Frame(self.top)
!         f.grid(row=self.row, col=1, columnspan=1, sticky="nwe")
          self.row = self.row + 1
          return f
--- 61,67 ----
          if labeltext:
              l = Label(self.top, text=labeltext)
!             l.grid(row=self.row, column=0, sticky="nw")
          f = Frame(self.top)
!         f.grid(row=self.row, column=1, columnspan=1, sticky="nwe")
          self.row = self.row + 1
          return f
***************
*** 135,139 ****
          # place button frame on the right
          f = self.buttonframe = Frame(self.top)
!         f.grid(row=0,col=2,padx=2,pady=2,ipadx=2,ipady=2)
  
          b = self.make_button("close", self.close)
--- 135,139 ----
          # place button frame on the right
          f = self.buttonframe = Frame(self.top)
!         f.grid(row=0,column=2,padx=2,pady=2,ipadx=2,ipady=2)
  
          b = self.make_button("close", self.close)