diff --git a/livesupport/modules/widgets/include/LiveSupport/Widgets/BlueBin.h b/livesupport/modules/widgets/include/LiveSupport/Widgets/BlueBin.h index 46041d46c..7ab4bdd20 100644 --- a/livesupport/modules/widgets/include/LiveSupport/Widgets/BlueBin.h +++ b/livesupport/modules/widgets/include/LiveSupport/Widgets/BlueBin.h @@ -22,7 +22,7 @@ Author : $Author: maroy $ - Version : $Revision: 1.4 $ + Version : $Revision: 1.5 $ Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/widgets/include/LiveSupport/Widgets/BlueBin.h,v $ ------------------------------------------------------------------------------*/ @@ -63,7 +63,7 @@ using namespace LiveSupport::Core; * A container holding exactly one child, habing a light blue border to it. * * @author $Author: maroy $ - * @version $Revision: 1.4 $ + * @version $Revision: 1.5 $ */ class BlueBin : public Gtk::Bin { @@ -112,6 +112,7 @@ class BlueBin : public Gtk::Bin int x, int y) throw (); + protected: /** * Return the background color. diff --git a/livesupport/modules/widgets/include/LiveSupport/Widgets/Button.h b/livesupport/modules/widgets/include/LiveSupport/Widgets/Button.h index cc351fc26..0670e7710 100644 --- a/livesupport/modules/widgets/include/LiveSupport/Widgets/Button.h +++ b/livesupport/modules/widgets/include/LiveSupport/Widgets/Button.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/Button.h,v $ ------------------------------------------------------------------------------*/ @@ -63,7 +63,7 @@ using namespace LiveSupport::Core; * A button holding a text. * * @author $Author: maroy $ - * @version $Revision: 1.2 $ + * @version $Revision: 1.3 $ */ class Button : public Gtk::Button { @@ -86,7 +86,7 @@ class Button : public Gtk::Button /** * The text displayed inside the button. */ - Ptr::Ref label; + Gtk::Label * label; /** * The state of the button. diff --git a/livesupport/modules/widgets/include/LiveSupport/Widgets/ComboBoxText.h b/livesupport/modules/widgets/include/LiveSupport/Widgets/ComboBoxText.h index 87c94d942..a55646217 100644 --- a/livesupport/modules/widgets/include/LiveSupport/Widgets/ComboBoxText.h +++ b/livesupport/modules/widgets/include/LiveSupport/Widgets/ComboBoxText.h @@ -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/include/LiveSupport/Widgets/ComboBoxText.h,v $ ------------------------------------------------------------------------------*/ @@ -64,7 +64,7 @@ using namespace LiveSupport::Core; * A combo box holding text entries. * * @author $Author: maroy $ - * @version $Revision: 1.1 $ + * @version $Revision: 1.2 $ */ class ComboBoxText : public Gtk::ComboBoxText { @@ -82,7 +82,7 @@ class ComboBoxText : public Gtk::ComboBoxText /** * The text displayed inside the button. */ - Ptr::Ref label; + Gtk::Label * label; /** * The X coordinate of the label. diff --git a/livesupport/modules/widgets/include/LiveSupport/Widgets/EntryBin.h b/livesupport/modules/widgets/include/LiveSupport/Widgets/EntryBin.h index 8ffdfe64a..b5c1a43f5 100644 --- a/livesupport/modules/widgets/include/LiveSupport/Widgets/EntryBin.h +++ b/livesupport/modules/widgets/include/LiveSupport/Widgets/EntryBin.h @@ -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/include/LiveSupport/Widgets/EntryBin.h,v $ ------------------------------------------------------------------------------*/ @@ -64,7 +64,7 @@ using namespace LiveSupport::Core; * A container, holding a Gtk::Entry as its only child. * * @author $Author: maroy $ - * @version $Revision: 1.1 $ + * @version $Revision: 1.2 $ */ class EntryBin : public BlueBin { @@ -72,7 +72,7 @@ class EntryBin : public BlueBin /** * The text entry for this container. */ - Ptr::Ref entry; + Gtk::Entry * entry; public: @@ -97,7 +97,7 @@ class EntryBin : public BlueBin * * @return the entry held in this container. */ - Ptr::Ref + Gtk::Entry * getEntry(void) throw () { return entry; diff --git a/livesupport/modules/widgets/include/LiveSupport/Widgets/WhiteWindow.h b/livesupport/modules/widgets/include/LiveSupport/Widgets/WhiteWindow.h index cdbe7287e..e0171464f 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.3 $ + Version : $Revision: 1.4 $ 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.3 $ + * @version $Revision: 1.4 $ */ class WhiteWindow : public Gtk::Window { @@ -77,42 +77,42 @@ class WhiteWindow : public Gtk::Window /** * The rounded container for the window. */ - Ptr::Ref blueBin; + BlueBin * blueBin; /** * The layout of the window. */ - Ptr::Ref layout; + Gtk::Table * layout; /** * The event box for the title, enabling capturing mouse events. */ - Ptr::Ref titleEventBox; + Gtk::EventBox * titleEventBox; /** * The left alignment contaner for the title. */ - Ptr::Ref titleAlignment; + Gtk::Alignment * titleAlignment; /** * The title of the window. */ - Ptr::Ref title; + Gtk::Label * title; /** * The right alignment contaner for the close button. */ - Ptr::Ref closeButtonAlignment; + Gtk::Alignment * closeButtonAlignment; /** * The close button. */ - Ptr::Ref closeButton; + ImageButton * closeButton; /** * Just a container for the main content of the window. */ - Ptr::Ref childContainer; + Gtk::Alignment * childContainer; /** * The event handler for the title being clicked on. @@ -247,6 +247,22 @@ class WhiteWindow : public Gtk::Window */ virtual ~WhiteWindow(void) throw (); + + /** + * Set the title of the window. + * + * @param title the title of the window. + */ + void + set_title(const Glib::ustring & title) throw (); + + /** + * Get the title of the window. + * + * @return the title of the window. + */ + Glib::ustring + get_title(void) const throw (); }; diff --git a/livesupport/modules/widgets/include/LiveSupport/Widgets/WidgetFactory.h b/livesupport/modules/widgets/include/LiveSupport/Widgets/WidgetFactory.h index 2458c989a..dcaa83aae 100644 --- a/livesupport/modules/widgets/include/LiveSupport/Widgets/WidgetFactory.h +++ b/livesupport/modules/widgets/include/LiveSupport/Widgets/WidgetFactory.h @@ -22,7 +22,7 @@ Author : $Author: maroy $ - Version : $Revision: 1.5 $ + Version : $Revision: 1.6 $ Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/widgets/include/LiveSupport/Widgets/WidgetFactory.h,v $ ------------------------------------------------------------------------------*/ @@ -84,7 +84,7 @@ using namespace LiveSupport::Core; * * * @author $Author: maroy $ - * @version $Revision: 1.5 $ + * @version $Revision: 1.6 $ */ class WidgetFactory : virtual public Configurable @@ -241,50 +241,64 @@ class WidgetFactory : /** * Create and return a button. + * It is the reponsibility of the caller to dispose of the created + * object properly. * * @param label the label shown inside the button. + * @return a button with the specified label. */ - Ptr