diff --git a/livesupport/modules/widgets/src/Button.cxx b/livesupport/modules/widgets/src/Button.cxx index 7c46b1ae1..1daa99bc0 100644 --- a/livesupport/modules/widgets/src/Button.cxx +++ b/livesupport/modules/widgets/src/Button.cxx @@ -22,7 +22,7 @@ Author : $Author: maroy $ - Version : $Revision: 1.1 $ + Version : $Revision: 1.2 $ Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/widgets/src/Button.cxx,v $ ------------------------------------------------------------------------------*/ @@ -134,6 +134,7 @@ Button :: on_size_request(Gtk::Requisition* requisition) throw () void Button :: on_size_allocate(Gtk::Allocation& allocation) throw () { + allocation.set_height(passiveImageCenter->get_height()); set_allocation(allocation); if (gdkWindow) { @@ -155,6 +156,8 @@ Button :: on_size_allocate(Gtk::Allocation& allocation) throw () labelAlloc.set_height(passiveImageCenter->get_height()); label->size_allocate(labelAlloc); + + Gtk::Button::on_size_allocate(allocation); } diff --git a/livesupport/modules/widgets/src/ImageButton.cxx b/livesupport/modules/widgets/src/ImageButton.cxx index e91be93dd..1adacb713 100644 --- a/livesupport/modules/widgets/src/ImageButton.cxx +++ b/livesupport/modules/widgets/src/ImageButton.cxx @@ -22,7 +22,7 @@ Author : $Author: maroy $ - Version : $Revision: 1.1 $ + Version : $Revision: 1.2 $ Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/widgets/src/ImageButton.cxx,v $ ------------------------------------------------------------------------------*/ @@ -107,6 +107,8 @@ ImageButton :: on_size_request(Gtk::Requisition* requisition) throw () void ImageButton :: on_size_allocate(Gtk::Allocation& allocation) throw () { + allocation.set_width(passiveImage->get_width()); + allocation.set_height(passiveImage->get_height()); set_allocation(allocation); if (gdkWindow) { @@ -115,6 +117,8 @@ ImageButton :: on_size_allocate(Gtk::Allocation& allocation) throw () allocation.get_width(), allocation.get_height() ); } + + Gtk::Button::on_size_allocate(allocation); }