diff options
| author | su_v <suv-sf@users.sourceforge.net> | 2012-11-14 16:07:45 +0000 |
|---|---|---|
| committer | ~suv <suv-sf@users.sourceforge.net> | 2012-11-14 16:07:45 +0000 |
| commit | 0d3cb2271366191c5cc414fc1bf8f41aaa046068 (patch) | |
| tree | 56015cf8999ee17546cdc448b7f9fdae389e0fe5 /src/widgets/measure-toolbar.cpp | |
| parent | changes_2012_11_13a.patch (diff) | |
| parent | emf import. modify sequence of operations to load file EMF_Illustrator_a4.emf... (diff) | |
| download | inkscape-0d3cb2271366191c5cc414fc1bf8f41aaa046068.tar.gz inkscape-0d3cb2271366191c5cc414fc1bf8f41aaa046068.zip | |
merge from trunk (r11871)
(bzr r11668.1.41)
Diffstat (limited to 'src/widgets/measure-toolbar.cpp')
| -rw-r--r-- | src/widgets/measure-toolbar.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/widgets/measure-toolbar.cpp b/src/widgets/measure-toolbar.cpp index 2153aba51..f556c0c7b 100644 --- a/src/widgets/measure-toolbar.cpp +++ b/src/widgets/measure-toolbar.cpp @@ -72,7 +72,7 @@ using Inkscape::UI::PrefPusher; static void sp_measure_fontsize_value_changed(GtkAdjustment *adj, GObject *tbl) { - SPDesktop *desktop = (SPDesktop *) g_object_get_data( tbl, "desktop" ); + SPDesktop *desktop = static_cast<SPDesktop *>(g_object_get_data( tbl, "desktop" )); if (DocumentUndo::getUndoSensitive(sp_desktop_document(desktop))) { Inkscape::Preferences *prefs = Inkscape::Preferences::get(); @@ -122,7 +122,7 @@ void sp_measure_toolbox_prep(SPDesktop * desktop, GtkActionGroup* mainActions, G // units menu { GtkAction* act = tracker->createAction( "MeasureUnitsAction", _("Units:"), _("The units to be used for the measurements") ); - g_signal_connect_after( G_OBJECT(act), "changed", G_CALLBACK(measure_unit_changed), (GObject*)holder ); + g_signal_connect_after( G_OBJECT(act), "changed", G_CALLBACK(measure_unit_changed), holder ); gtk_action_group_add_action( mainActions, act ); } } // end of sp_measure_toolbox_prep() |