@@ -125,7 +125,6 @@ def __init__(self, figure):
125125
126126 self .set_events (self .__class__ .event_mask )
127127
128- self .set_double_buffered (True )
129128 self .set_can_focus (True )
130129
131130 renderer_init = _api .deprecate_method_override (
@@ -181,7 +180,7 @@ def key_release_event(self, widget, event):
181180
182181 def motion_notify_event (self , widget , event ):
183182 if event .is_hint :
184- t , x , y , state = event .window .get_pointer ( )
183+ t , x , y , state = event .window .get_device_position ( event . device )
185184 else :
186185 x , y = event .x , event .y
187186
@@ -339,20 +338,16 @@ def __init__(self, canvas, num):
339338
340339 self .toolbar = self ._get_toolbar ()
341340
342- def add_widget (child ):
343- child .show ()
344- self .vbox .pack_end (child , False , False , 0 )
345- size_request = child .size_request ()
346- return size_request .height
347-
348341 if self .toolmanager :
349342 backend_tools .add_tools_to_manager (self .toolmanager )
350343 if self .toolbar :
351344 backend_tools .add_tools_to_container (self .toolbar )
352345
353346 if self .toolbar is not None :
354347 self .toolbar .show ()
355- h += add_widget (self .toolbar )
348+ self .vbox .pack_end (self .toolbar , False , False , 0 )
349+ min_size , nat_size = self .toolbar .get_preferred_size ()
350+ h += nat_size .height
356351
357352 self .window .set_default_size (w , h )
358353
0 commit comments