summaryrefslogtreecommitdiffstats
path: root/src/ui/widget/text.cpp
diff options
context:
space:
mode:
authorJabier Arraiza Cenoz <jabier.arraiza@marker.es>2016-10-08 00:30:57 +0000
committerjabiertxof <info@marker.es>2016-10-08 00:30:57 +0000
commitbf899f7b2615bc40094815c81f7a127a42822f8e (patch)
tree8b30db7baf42c2051c1de654779dcb3082cbe39a /src/ui/widget/text.cpp
parentDoc rotate start (diff)
parentFix bug:1622321 on powerstroke (diff)
downloadinkscape-bf899f7b2615bc40094815c81f7a127a42822f8e.tar.gz
inkscape-bf899f7b2615bc40094815c81f7a127a42822f8e.zip
Update to trunk
(bzr r15142.1.2)
Diffstat (limited to 'src/ui/widget/text.cpp')
-rw-r--r--src/ui/widget/text.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/ui/widget/text.cpp b/src/ui/widget/text.cpp
index ec58d5bb4..e6795b138 100644
--- a/src/ui/widget/text.cpp
+++ b/src/ui/widget/text.cpp
@@ -28,13 +28,13 @@ Text::Text(Glib::ustring const &label, Glib::ustring const &tooltip,
{
}
-const char *Text::getText() const
+Glib::ustring const Text::getText() const
{
g_assert(_widget != NULL);
- return static_cast<Gtk::Entry*>(_widget)->get_text().c_str();
+ return static_cast<Gtk::Entry*>(_widget)->get_text();
}
-void Text::setText(const char* text)
+void Text::setText(Glib::ustring const text)
{
g_assert(_widget != NULL);
setProgrammatically = true; // callback is supposed to reset back, if it cares