Skip to content

Commit 65310cf

Browse files
committed
Don't use new() in widgets.py
1 parent 5eca7db commit 65310cf

File tree

1 file changed

+23
-11
lines changed

1 file changed

+23
-11
lines changed

src/diffuse/widgets.py

Lines changed: 23 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -63,8 +63,8 @@ def __init__(self, hadj, vadj):
6363
self.partial_redraw = False
6464

6565
self.hadj, self.vadj = hadj, vadj
66-
vport = Gtk.Viewport.new()
67-
darea = Gtk.DrawingArea.new()
66+
vport = Gtk.Viewport()
67+
darea = Gtk.DrawingArea()
6868
darea.add_events(Gdk.EventMask.SCROLL_MASK)
6969
self.darea = darea
7070
# replace darea's queue_draw_area with our own so we can tell when
@@ -78,11 +78,11 @@ def __init__(self, hadj, vadj):
7878
vport.set_hexpand(True)
7979
vport.show()
8080

81-
self.vbar = Gtk.Scrollbar.new(Gtk.Orientation.VERTICAL, vadj)
81+
self.vbar = Gtk.Scrollbar(orientation=Gtk.Orientation.VERTICAL, adjustment=vadj)
8282
self.attach(self.vbar, 1, 0, 1, 1)
8383
self.vbar.show()
8484

85-
self.hbar = Gtk.Scrollbar.new(Gtk.Orientation.HORIZONTAL, hadj)
85+
self.hbar = Gtk.Scrollbar(orientation=Gtk.Orientation.HORIZONTAL, adjustment=hadj)
8686
self.attach(self.hbar, 0, 1, 1, 1)
8787
self.hbar.show()
8888

@@ -319,8 +319,20 @@ def __init__(self, n, prefs):
319319
# create panes
320320
self.dareas: List[Gtk.DrawingArea] = []
321321
self.panes: List[FileDiffViewerBase.Pane] = []
322-
self.hadj = Gtk.Adjustment.new(0, 0, 0, 0, 0, 0)
323-
self.vadj = Gtk.Adjustment.new(0, 0, 0, 0, 0, 0)
322+
self.hadj = Gtk.Adjustment(
323+
value=0,
324+
lower=0,
325+
upper=0,
326+
step_increment=0,
327+
page_increment=0,
328+
page_size=0)
329+
self.vadj = Gtk.Adjustment(
330+
value=0,
331+
lower=0,
332+
upper=0,
333+
step_increment=0,
334+
page_increment=0,
335+
page_size=0)
324336
for i in range(n):
325337
pane = FileDiffViewerBase.Pane()
326338
self.panes.append(pane)
@@ -343,7 +355,7 @@ def __init__(self, n, prefs):
343355
self.vadj.connect('value-changed', self.vadj_changed_cb)
344356

345357
# add diff map
346-
self.diffmap = diffmap = Gtk.DrawingArea.new()
358+
self.diffmap = diffmap = Gtk.DrawingArea()
347359
diffmap.add_events(Gdk.EventMask.BUTTON_PRESS_MASK |
348360
Gdk.EventMask.BUTTON1_MOTION_MASK |
349361
Gdk.EventMask.SCROLL_MASK)
@@ -361,7 +373,7 @@ def __init__(self, n, prefs):
361373
self.connect('key-press-event', self.key_press_cb)
362374

363375
# input method
364-
self.im_context = im = Gtk.IMMulticontext.new()
376+
self.im_context = im = Gtk.IMMulticontext()
365377
im.connect('commit', self.im_commit_cb)
366378
im.connect('preedit-changed', self.im_preedit_changed_cb)
367379
im.connect('retrieve-surrounding', self.im_retrieve_surrounding_cb)
@@ -3698,7 +3710,7 @@ def merge_from_right_then_left(self):
36983710

36993711
# convenience method for creating a menu according to a template
37003712
def createMenu(specs, radio=None, accel_group=None):
3701-
menu = Gtk.Menu.new()
3713+
menu = Gtk.Menu()
37023714
for spec in specs:
37033715
if len(spec) > 0:
37043716
if len(spec) > 7 and spec[7] is not None:
@@ -3716,7 +3728,7 @@ def createMenu(specs, radio=None, accel_group=None):
37163728
data = spec[2]
37173729
item.connect('activate', cb, data)
37183730
if len(spec) > 3 and spec[3] is not None:
3719-
image = Gtk.Image.new()
3731+
image = Gtk.Image()
37203732
image.set_from_stock(spec[3], Gtk.IconSize.MENU)
37213733
item.set_image(image)
37223734
if accel_group is not None and len(spec) > 4:
@@ -3735,7 +3747,7 @@ def createMenu(specs, radio=None, accel_group=None):
37353747
item.set_submenu(createMenu(spec[6], radio, accel_group))
37363748
item.set_use_underline(True)
37373749
else:
3738-
item = Gtk.SeparatorMenuItem.new()
3750+
item = Gtk.SeparatorMenuItem()
37393751
item.show()
37403752
menu.append(item)
37413753
return menu

0 commit comments

Comments
 (0)