Rework how widget ownership works in Container

[libs/gltk.git] / examples / widgetdemo / entrydemo.cpp

diff --git a/examples/widgetdemo/entrydemo.cpp b/examples/widgetdemo/entrydemo.cpp
index 062ce8bf8e581c4c93df4c6eb4736241c148c137..ad94010d6a919f0429f28d1550e9897d0d903160 100644 (file)
--- a/examples/widgetdemo/entrydemo.cpp
+++ b/examples/widgetdemo/entrydemo.cpp
@@ -8,27 +8,23 @@ EntryDemo::EntryDemo()
 {
        get_or_create_layout();
 
-       GLtk::Label *lbl = new GLtk::Label("Single-line entries:");
-       add(*lbl);
+       GLtk::Label *lbl = &add_new<GLtk::Label>("Single-line entries:");
 
        GLtk::Widget *prev = lbl;
        for(unsigned i=0; i<2; ++i)
        {
-               GLtk::Entry *ent = new GLtk::Entry;
+               GLtk::Entry *ent = &add_new<GLtk::Entry>();
                ent->set_edit_size(20+i*40, 1);
-               add(*ent);
                layout->add_constraint(*ent, GLtk::Layout::BELOW, *prev);
                prev = ent;
        }
 
-       lbl = new GLtk::Label("Multi-line entry:");
-       add(*lbl);
+       lbl = &add_new<GLtk::Label>("Multi-line entry:");
        layout->add_constraint(*lbl, GLtk::Layout::BELOW, *prev);
        prev = lbl;
 
-       GLtk::Entry *ent = new GLtk::Entry;
+       GLtk::Entry *ent = &add_new<GLtk::Entry>();
        ent->set_multiline(true);
        ent->set_edit_size(60, 5);
-       add(*ent);
        layout->add_constraint(*ent, GLtk::Layout::BELOW, *prev);
 }