The star and circle tool were both causing warnings from gtkmm 2.14. This prevents...

git-svn-id: https://synfig.svn.sourceforge.net/svnroot/synfig@2110 1f10aa63-cdf2-0310-b900-c93c546f37ac

diff --git a/synfig-studio/trunk/src/gtkmm/state_circle.cpp b/synfig-studio/trunk/src/gtkmm/state_circle.cpp
index 09667ad..38dd7b3 100644 (file)
--- a/synfig-studio/trunk/src/gtkmm/state_circle.cpp
+++ b/synfig-studio/trunk/src/gtkmm/state_circle.cpp
@@ -382,10 +382,10 @@ StateCircle_Context::StateCircle_Context(CanvasView* canvas_view):
        duckmatic_push(get_work_area()),
        prev_workarea_layer_status_(get_work_area()->get_allow_layer_clicks()),
        settings(synfigapp::Main::get_selected_input_device()->settings()),
-       entry_id(),
-       adj_feather(0,0,1,0.01,0.1),
-       adj_number_of_bline_points(4,2,120,1,1,1), // value, lower, upper, step_increment, page_increment, page_size
-       adj_bline_point_angle_offset(0,-360,360,.1,1,1), // value, lower, upper, step_increment, page_increment, page_size
+       entry_id(),                             //   value lower upper  step page
+       adj_feather(                                    0,    0,    1, 0.01, 0.1),
+       adj_number_of_bline_points(             0,    2,  120, 1   , 1  ),
+       adj_bline_point_angle_offset(   0, -360,  360, 0.1 , 1  ),
        spin_feather(adj_feather,0.1,3),
        spin_number_of_bline_points(adj_number_of_bline_points,1,0),
        spin_bline_point_angle_offset(adj_bline_point_angle_offset,1,1),

diff --git a/synfig-studio/trunk/src/gtkmm/state_star.cpp b/synfig-studio/trunk/src/gtkmm/state_star.cpp
index df75ec9..ed8c75e 100644 (file)
--- a/synfig-studio/trunk/src/gtkmm/state_star.cpp
+++ b/synfig-studio/trunk/src/gtkmm/state_star.cpp
@@ -409,15 +409,15 @@ StateStar_Context::StateStar_Context(CanvasView* canvas_view):
        duckmatic_push(get_work_area()),
        prev_workarea_layer_status_(get_work_area()->get_allow_layer_clicks()),
        settings(synfigapp::Main::get_selected_input_device()->settings()),
-       entry_id(),
-       adj_feather(0,0,1,0.01,0.1),
-       adj_number_of_points(4,2,120,1,1,1), // value, lower, upper, step_increment, page_increment, page_size
-       adj_inner_tangent(0,-10,10,.01,.1,.1),
-       adj_outer_tangent(0,-10,10,.01,.1,.1),
-       adj_inner_width(1,-10,10,.01,.1,.1),
-       adj_outer_width(1,-10,10,.01,.1,.1),
-       adj_radius_ratio(0.5,-10,10,.01,.1,.1), // value, lower, upper, step_increment, page_increment, page_size
-       adj_angle_offset(0,-360,360,.1,1,1), // value, lower, upper, step_increment, page_increment, page_size
+       entry_id(),             //   value lower upper  step page
+       adj_feather(                    0,    0,    1, 0.01, 0.1),
+       adj_number_of_points(   0,    2,  120, 1   , 1  ),
+       adj_inner_tangent(              0,  -10,   10, 0.01, 0.1),
+       adj_outer_tangent(              0,  -10,   10, 0.01, 0.1),
+       adj_inner_width(                0,  -10,   10, 0.01, 0.1),
+       adj_outer_width(                0,  -10,   10, 0.01, 0.1),
+       adj_radius_ratio(               0,  -10,   10, 0.01, 0.1),
+       adj_angle_offset(               0, -360,  360, 0.1 , 1  ),
        spin_feather(adj_feather,0.1,3),
        spin_number_of_points(adj_number_of_points,1,0),
        spin_inner_tangent(adj_inner_tangent,1,2),