X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=examples%2Fwidgetdemo%2Fentrydemo.cpp;h=ad94010d6a919f0429f28d1550e9897d0d903160;hb=HEAD;hp=64a7bcb1503b735edfef0f064b03e74033ebfb5c;hpb=68c6a79c86c595fa2ec5a7109568d5baefc50afd;p=libs%2Fgltk.git diff --git a/examples/widgetdemo/entrydemo.cpp b/examples/widgetdemo/entrydemo.cpp index 64a7bcb..ad94010 100644 --- a/examples/widgetdemo/entrydemo.cpp +++ b/examples/widgetdemo/entrydemo.cpp @@ -6,29 +6,25 @@ using namespace Msp; EntryDemo::EntryDemo() { - set_layout(new GLtk::Layout); + get_or_create_layout(); - GLtk::Label *lbl = new GLtk::Label("Single-line entries:"); - add(*lbl); + GLtk::Label *lbl = &add_new("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(); 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("Multi-line entry:"); layout->add_constraint(*lbl, GLtk::Layout::BELOW, *prev); prev = lbl; - GLtk::Entry *ent = new GLtk::Entry; + GLtk::Entry *ent = &add_new(); ent->set_multiline(true); ent->set_edit_size(60, 5); - add(*ent); layout->add_constraint(*ent, GLtk::Layout::BELOW, *prev); }