Add Text class with multiline support

[libs/gltk.git] / source / toggle.cpp

diff --git a/source/toggle.cpp b/source/toggle.cpp
index 8c264e4c9b4486194cfca18978c64c1d52a0a8c1..550d97a27584fbcba9a1e6699d4e4a23d2fffb6f 100644 (file)
--- a/source/toggle.cpp
+++ b/source/toggle.cpp
@@ -14,13 +14,15 @@ using namespace std;
 namespace Msp {
 namespace GLtk {
 
-Toggle::Toggle(const Resources &r):
+Toggle::Toggle(const Resources &r, const string &t):
        Widget(r),
+       text(style),
        pressed(false),
        value(false),
        exclusive(false)
 {
        update_style();
+       set_text(t);
 }
 
 void Toggle::set_text(const string &t)
@@ -71,7 +73,7 @@ void Toggle::button_release(int x, int y, unsigned btn)
 void Toggle::render_special(const Part &part) const
 {
        if(part.get_name()=="text")
-               render_text(part, text);
+               text.render(part, geom);
 }
 
 void Toggle::exclude_siblings()
@@ -88,7 +90,7 @@ Toggle::Loader::Loader(Toggle &t):
        Widget::Loader(t)
 {
        add("exclusive", &Toggle::exclusive);
-       add("text",      &Toggle::text);
+       add("text",      &Loader::text);
        add("value",     &Toggle::value);
 }
 
@@ -106,5 +108,10 @@ void Toggle::Loader::finish()
                tgl.state&=~ACTIVE;
 }
 
+void Toggle::Loader::text(const string &t)
+{
+       static_cast<Toggle &>(wdg).text=t;
+}
+
 } // namespace GLtk
 } // namespace Msp