casa-mp-base

diff -uNr Pmw-2.0.0/Pmw/Pmw_2_0_0/demos/HistoryText.py Pmw-2.0.0.hg/Pmw/Pmw_2_0_0/demos/HistoryText.py

--- Pmw-2.0.0/Pmw/Pmw_2_0_0/demos/HistoryText.py    2012-08-03 20:56:51.000000000 -0400

+++ Pmw-2.0.0.hg/Pmw/Pmw_2_0_0/demos/HistoryText.py 2015-03-23 09:56:09.000000000 -0400

@@ -38,7 +38,7 @@

             ['Redo', self.historyText.redo],

             [20, None],

             ['Prev', self.historyText.prev],

-            ['Next', self.historyText.__next__],

+            ['Next', self.historyText.next],

             [30, None],

             ['Execute', Pmw.busycallback(self.executeQuery)],

         )

diff -uNr Pmw-2.0.0/Pmw/Pmw_2_0_0/lib/PmwBase.py Pmw-2.0.0.hg/Pmw/Pmw_2_0_0/lib/PmwBase.py

--- Pmw-2.0.0/Pmw/Pmw_2_0_0/lib/PmwBase.py  2013-04-25 16:33:16.000000000 -0400

+++ Pmw-2.0.0.hg/Pmw/Pmw_2_0_0/lib/PmwBase.py   2015-03-23 09:56:09.000000000 -0400

@@ -22,6 +22,22 @@

 import tkinter

 import collections

+# tkinter 8.5 -> 8.6 fixed a problem in which selected indexes

+# were reported as strings instead of ints

+# by default emulate the same functionality so we don't break 

+# existing interfaces but allow for easy switching

+#_forceTkinter85Compatibility = True

+

+#def setTkinter85Compatible(value):

+#    global _forceTkinter85Compatibility

+#    if isinstance(value, bool):

+#        _forceTkinter85Compatibility = value and tkinter.TkVersion > 8.5

+        

+#def emulateTk85():

+#    global _forceTkinter85Compatibility

+#    return _forceTkinter85Compatibility

+

+

 # Special values used in index() methods of several megawidgets.

 END = ['end']

 SELECT = ['select']

diff -uNr Pmw-2.0.0/Pmw/Pmw_2_0_0/lib/PmwComboBox.py Pmw-2.0.0.hg/Pmw/Pmw_2_0_0/lib/PmwComboBox.py

--- Pmw-2.0.0/Pmw/Pmw_2_0_0/lib/PmwComboBox.py  2012-09-08 09:10:06.000000000 -0400

+++ Pmw-2.0.0.hg/Pmw/Pmw_2_0_0/lib/PmwComboBox.py   2015-03-23 09:56:09.000000000 -0400

@@ -32,14 +32,14 @@

         # Create the components.

         interior = self.interior()

-

+        

         self._entryfield = self.createcomponent('entryfield',

                 (('entry', 'entryfield_entry'),), None,

                 Pmw.EntryField, (interior,))

         self._entryfield.grid(column=2, row=2, sticky=self['sticky'])

         interior.grid_columnconfigure(2, weight = 1)

         self._entryWidget = self._entryfield.component('entry')

-

+        

         if self['dropdown']:

             self._isPosted = 0

             interior.grid_rowconfigure(2, weight = 1)

diff -uNr Pmw-2.0.0/Pmw/Pmw_2_0_0/lib/PmwEntryField.py Pmw-2.0.0.hg/Pmw/Pmw_2_0_0/lib/PmwEntryField.py

--- Pmw-2.0.0/Pmw/Pmw_2_0_0/lib/PmwEntryField.py    2013-04-25 15:52:25.000000000 -0400

+++ Pmw-2.0.0.hg/Pmw/Pmw_2_0_0/lib/PmwEntryField.py 2015-03-23 09:56:09.000000000 -0400

@@ -416,9 +416,9 @@

             return ERROR