diff options
| author | Martin Owens <doctormo@gmail.com> | 2016-10-06 21:12:33 +0000 |
|---|---|---|
| committer | Martin Owens <doctormo@gmail.com> | 2016-10-06 21:12:33 +0000 |
| commit | 032cb7a6b8f3b83b75f71048a896f03907436f9e (patch) | |
| tree | 672d01cd146779e67916c4553a27134b20c2ba42 /src/ui/widget/text.cpp | |
| parent | xverbs branch merge by dmitry-zhulanov (diff) | |
| parent | Fix on delete line (diff) | |
| download | inkscape-032cb7a6b8f3b83b75f71048a896f03907436f9e.tar.gz inkscape-032cb7a6b8f3b83b75f71048a896f03907436f9e.zip | |
Merge jabier's Measure line LPE
(bzr r15148)
Diffstat (limited to 'src/ui/widget/text.cpp')
| -rw-r--r-- | src/ui/widget/text.cpp | 6 |
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 |