diff --git a/livesupport/modules/widgets/include/LiveSupport/Widgets/WhiteWindow.h b/livesupport/modules/widgets/include/LiveSupport/Widgets/WhiteWindow.h index f725e91ec..cdbe7287e 100644 --- a/livesupport/modules/widgets/include/LiveSupport/Widgets/WhiteWindow.h +++ b/livesupport/modules/widgets/include/LiveSupport/Widgets/WhiteWindow.h @@ -22,7 +22,7 @@ Author : $Author: maroy $ - Version : $Revision: 1.2 $ + Version : $Revision: 1.3 $ Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/widgets/include/LiveSupport/Widgets/WhiteWindow.h,v $ ------------------------------------------------------------------------------*/ @@ -69,7 +69,7 @@ using namespace LiveSupport::Core; * A container holding exactly one child, habing a light blue border to it. * * @author $Author: maroy $ - * @version $Revision: 1.2 $ + * @version $Revision: 1.3 $ */ class WhiteWindow : public Gtk::Window { @@ -233,10 +233,12 @@ class WhiteWindow : public Gtk::Window /** * Constructor. * + * @param title the title of the window. * @param backgroundColor the RGB value for the background color. * @param cornerImages the corner images. */ - WhiteWindow(unsigned int backgroundColor, + WhiteWindow(Glib::ustring title, + unsigned int backgroundColor, Ptr::Ref cornerImages) throw (); diff --git a/livesupport/modules/widgets/src/TestWindow.cxx b/livesupport/modules/widgets/src/TestWindow.cxx index 74fcd6dbb..2e3cf9a91 100644 --- a/livesupport/modules/widgets/src/TestWindow.cxx +++ b/livesupport/modules/widgets/src/TestWindow.cxx @@ -22,7 +22,7 @@ Author : $Author: maroy $ - Version : $Revision: 1.6 $ + Version : $Revision: 1.7 $ Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/widgets/src/TestWindow.cxx,v $ ------------------------------------------------------------------------------*/ @@ -57,7 +57,8 @@ using namespace LiveSupport::Widgets; *----------------------------------------------------------------------------*/ TestWindow :: TestWindow (void) throw () - : WhiteWindow(0xffffff, + : WhiteWindow("test window", + 0xffffff, WidgetFactory::getInstance()->getWhiteWindowCorners()) { Ptr::Ref widgetFactory = WidgetFactory::getInstance(); diff --git a/livesupport/modules/widgets/src/WhiteWindow.cxx b/livesupport/modules/widgets/src/WhiteWindow.cxx index f1b77526a..c5d64499c 100644 --- a/livesupport/modules/widgets/src/WhiteWindow.cxx +++ b/livesupport/modules/widgets/src/WhiteWindow.cxx @@ -22,7 +22,7 @@ Author : $Author: maroy $ - Version : $Revision: 1.2 $ + Version : $Revision: 1.3 $ Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/widgets/src/WhiteWindow.cxx,v $ ------------------------------------------------------------------------------*/ @@ -56,7 +56,8 @@ using namespace LiveSupport::Widgets; /*------------------------------------------------------------------------------ * Constructor. *----------------------------------------------------------------------------*/ -WhiteWindow :: WhiteWindow(unsigned int backgroundColor, +WhiteWindow :: WhiteWindow(Glib::ustring title, + unsigned int backgroundColor, Ptr::Ref cornerImages) throw () : Gtk::Window(Gtk::WINDOW_TOPLEVEL) @@ -77,14 +78,14 @@ WhiteWindow :: WhiteWindow(unsigned int backgroundColor, colormap->alloc_color(bgColor); // set the window title - title.reset(new Gtk::Label("Window Title")); + this->title.reset(new Gtk::Label(title)); titleAlignment.reset(new Gtk::Alignment(Gtk::ALIGN_LEFT, Gtk::ALIGN_CENTER, 0, 0)); titleEventBox.reset(new Gtk::EventBox()); titleEventBox->set_visible_window(); titleEventBox->modify_bg(Gtk::STATE_NORMAL, bgColor); - titleAlignment->add(*title); + titleAlignment->add(*this->title); titleEventBox->add(*titleAlignment); layout->attach(*titleEventBox, 0, 1, 0, 1, Gtk::FILL, Gtk::SHRINK);