summaryrefslogtreecommitdiffstats
path: root/src/ui/widget/labelled.cpp
diff options
context:
space:
mode:
authorAndrew Higginson <at.higginson@gmail.com>2011-12-27 21:04:47 +0000
committerAndrew <at.higginson@gmail.com>2011-12-27 21:04:47 +0000
commit80960b623a99aae1402ab651b2974ef544ed3b03 (patch)
treeba49d42c2789e9e11f805e2d5263e10f9fedeef8 /src/ui/widget/labelled.cpp
parenttry to fix bug (diff)
parentGDL: Cherry-pick upstream patch 73852 (2011-03-23) - Add missing return value. (diff)
downloadinkscape-80960b623a99aae1402ab651b2974ef544ed3b03.tar.gz
inkscape-80960b623a99aae1402ab651b2974ef544ed3b03.zip
merged with trunk so I can build again...
(bzr r10092.1.36)
Diffstat (limited to 'src/ui/widget/labelled.cpp')
-rw-r--r--src/ui/widget/labelled.cpp20
1 files changed, 1 insertions, 19 deletions
diff --git a/src/ui/widget/labelled.cpp b/src/ui/widget/labelled.cpp
index c55b57616..0a13d6347 100644
--- a/src/ui/widget/labelled.cpp
+++ b/src/ui/widget/labelled.cpp
@@ -1,7 +1,4 @@
-/**
- * \brief Labelled Widget - Adds a label with optional icon or suffix to
- * another widget.
- *
+/*
* Authors:
* Carl Hetherington <inkscape@carlh.net>
* Derek P. Moore <derekm@hackunix.org>
@@ -24,18 +21,6 @@ namespace Inkscape {
namespace UI {
namespace Widget {
-/**
- * Construct a Labelled Widget.
- *
- * \param label Label.
- * \param widget Widget to label; should be allocated with new, as it will
- * be passed to Gtk::manage().
- * \param suffix Suffix, placed after the widget (defaults to "").
- * \param icon Icon filename, placed before the label (defaults to "").
- * \param mnemonic Mnemonic toggle; if true, an underscore (_) in the text
- * indicates the next character should be used for the
- * mnemonic accelerator key (defaults to true).
- */
Labelled::Labelled(Glib::ustring const &label, Glib::ustring const &tooltip,
Gtk::Widget *widget,
Glib::ustring const &suffix,
@@ -60,9 +45,6 @@ Labelled::Labelled(Glib::ustring const &label, Glib::ustring const &tooltip,
}
-/**
- * Allow the setting of the width of the labelled widget
- */
void Labelled::setWidgetSizeRequest(int width, int height)
{
if (_widget)