Cyclone-Team/gramps
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

2008-02-05 Benny Malengier <benny.malengier@gramps-project.org>

Browse Source 
* src/GrampsWidgets.py: remove conditional test on pygtk 2.6, 3.0 
	  requires 2.10+, so 2.6 code should never be used.



svn: r9995
This commit is contained in:
Benny Malengier 2008-02-05 10:13:25 +00:00
parent 534a306579
commit d0b50fcf5b
2 changed files with 9 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,3 +1,7 @@
2008-02-05 Benny Malengier <benny.malengier@gramps-project.org>
* src/GrampsWidgets.py: remove conditional test on pygtk 2.6, 3.0
requires 2.10+, so 2.6 code should never be used.
2008-02-02 Raphael Ackermann <raphael.ackermann@gmail.com> 2008-02-02 Raphael Ackermann <raphael.ackermann@gmail.com>
* src/DataViews/GrampletView.py * src/DataViews/GrampletView.py
* src/ReportBase/_ReportUtils.py * src/ReportBase/_ReportUtils.py

24
src/GrampsWidgets.py
View File

@ -1750,8 +1750,6 @@ class IconEntry(object):
self._locked = False self._locked = False
HAVE_2_6 = gtk.pygtk_version[:2] == (2, 6)
(DIRECTION_LEFT, DIRECTION_RIGHT) = (1, -1) (DIRECTION_LEFT, DIRECTION_RIGHT) = (1, -1)
(INPUT_ASCII_LETTER, (INPUT_ASCII_LETTER,
@ -1830,24 +1828,12 @@ class MaskedEntry(gtk.Entry):
self._block_insert = False self._block_insert = False
self._block_delete = False self._block_delete = False
# Virtual methods # Virtual methods, note do_size_alloc needs gtk 2.9 +
# PyGTK 2.6 does not support the virtual method do_size_allocate so def do_size_allocate(self, allocation):
# we have to use the signal instead gtk.Entry.do_size_allocate(self, allocation)
# PyGTK 2.9.0 and later (bug #327715) does not work using the old code,
# so we have to make this conditionally
if HAVE_2_6:
gsignal('size-allocate', 'override')
def do_size_allocate(self, allocation):
self.chain(allocation)
if self.flags() & gtk.REALIZED: if self.flags() & gtk.REALIZED:
self._icon.resize_windows() self._icon.resize_windows()
else:
def do_size_allocate(self, allocation):
gtk.Entry.do_size_allocate(self, allocation)
if self.flags() & gtk.REALIZED:
self._icon.resize_windows()
def do_expose_event(self, event): def do_expose_event(self, event):
gtk.Entry.do_expose_event(self, event) gtk.Entry.do_expose_event(self, event)