diff options
| author | Jabier Arraiza Cenoz <jabier.arraiza@marker.es> | 2016-03-24 01:28:21 +0000 |
|---|---|---|
| committer | Jabiertxof <jtx@jtx.marker.es> | 2016-03-24 01:28:21 +0000 |
| commit | 718f5323cdab58042763107010fafbdc697c3c4f (patch) | |
| tree | 164e442357777ac1714464415943e6869b901a8a /src/widgets/toolbox.cpp | |
| parent | Fixing Krzysztof review (diff) | |
| parent | "Backport" some Krzysztof review parts of mirror symmetry LPE also hapens on ... (diff) | |
| download | inkscape-718f5323cdab58042763107010fafbdc697c3c4f.tar.gz inkscape-718f5323cdab58042763107010fafbdc697c3c4f.zip | |
update to trunk
(bzr r13682.1.37)
Diffstat (limited to 'src/widgets/toolbox.cpp')
| -rw-r--r-- | src/widgets/toolbox.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/widgets/toolbox.cpp b/src/widgets/toolbox.cpp index f4d7ebf25..3389f82f9 100644 --- a/src/widgets/toolbox.cpp +++ b/src/widgets/toolbox.cpp @@ -516,7 +516,7 @@ static gchar const * ui_descr = " <toolitem action='TextSubscriptAction' />" " <separator />" " <toolitem action='TextLineHeightAction' />" - " <toolitem action='TextLineHeightUnitAction' />" + " <toolitem action='TextLineHeightUnitsAction' />" " <toolitem action='TextLetterSpacingAction' />" " <toolitem action='TextWordSpacingAction' />" " <toolitem action='TextDxAction' />" @@ -1126,7 +1126,7 @@ EgeAdjustmentAction * create_adjustment_action( gchar const *name, if (unit_tracker) { unit_tracker->addAdjustment(adj); - } + } // Using a cast just to make sure we pass in the right kind of function pointer g_object_set( G_OBJECT(act), "tool-post", static_cast<EgeWidgetFixup>(sp_set_font_size_smaller), NULL ); |