/b-gtk/fix-viz

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/b-gtk/fix-viz

« back to all changes in this revision

Viewing changes to diff.py

  • Committer: John Arbash Meinel
  • Date: 2007-10-30 20:36:16 UTC
  • mfrom: (322.1.1 trunk)
  • mto: (330.3.3 trunk)
  • mto: This revision was merged to the branch mainline in revision 368.
  • Revision ID: john@arbash-meinel.com-20071030203616-op14zvvmflw6ds1n
Merge in Jelmer's trunk update + conflict resolution.

Show diffs side-by-side

added added

removed removed

Lines of Context:
diff.py
34
34
from bzrlib.diff import show_diff_trees, internal_diff
35
35
from bzrlib.errors import NoSuchFile
36
36
from bzrlib.trace import warning
 
37
from bzrlib.plugins.gtk.window import Window
37
38
 
38
39
 
39
40
class DiffView(gtk.ScrolledWindow):
260
261
        self.buffer.set_text(decoded.encode('UTF-8'))
261
262
 
262
263
 
263
 
class DiffWindow(gtk.Window):
 
264
class DiffWindow(Window):
264
265
    """Diff window.
265
266
 
266
267
    This object represents and manages a single window containing the
267
268
    differences between two revisions on a branch.
268
269
    """
269
270
 
270
 
    def __init__(self):
271
 
        gtk.Window.__init__(self, gtk.WINDOW_TOPLEVEL)
 
271
    def __init__(self, parent=None):
 
272
        Window.__init__(self, parent)
272
273
        self.set_border_width(0)
273
274
        self.set_title("bzrk diff")
274
275