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/box3d-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/box3d-toolbar.cpp')
| -rw-r--r-- | src/widgets/box3d-toolbar.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/widgets/box3d-toolbar.cpp b/src/widgets/box3d-toolbar.cpp index 2192ebfdc..cb4951660 100644 --- a/src/widgets/box3d-toolbar.cpp +++ b/src/widgets/box3d-toolbar.cpp @@ -227,7 +227,7 @@ static void box3d_toolbox_selection_changed(Inkscape::Selection *selection, GObj static void box3d_angle_value_changed(GtkAdjustment *adj, GObject *dataKludge, Proj::Axis axis) { - SPDesktop *desktop = (SPDesktop *) g_object_get_data( dataKludge, "desktop" ); + SPDesktop *desktop = static_cast<SPDesktop *>(g_object_get_data( dataKludge, "desktop" )); SPDocument *document = sp_desktop_document(desktop); // quit if run by the attr_changed or selection changed listener @@ -431,7 +431,7 @@ void box3d_toolbox_prep(SPDesktop *desktop, GtkActionGroup* mainActions, GObject } sigc::connection *connection = new sigc::connection( - sp_desktop_selection(desktop)->connectChanged(sigc::bind(sigc::ptr_fun(box3d_toolbox_selection_changed), (GObject *)holder)) + sp_desktop_selection(desktop)->connectChanged(sigc::bind(sigc::ptr_fun(box3d_toolbox_selection_changed), G_OBJECT(holder))) ); g_signal_connect(holder, "destroy", G_CALLBACK(delete_connection), connection); g_signal_connect(holder, "destroy", G_CALLBACK(purge_repr_listener), holder); |