X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-studio%2Ftrunk%2Fsrc%2Fgtkmm%2Fstate_width.cpp;h=59e58a6abcf6c20ab6a6f31869b22f1a2c440841;hb=e80892e3962af6e7491741d6e13670c94b837201;hp=bbe802dee8363e959aa363bab8a2d5bedbe09728;hpb=c6af6e1c3816eb3b15c573089b32e6ae65cd2f49;p=synfig.git

diff --git a/synfig-studio/trunk/src/gtkmm/state_width.cpp b/synfig-studio/trunk/src/gtkmm/state_width.cpp
index bbe802d..59e58a6 100644
--- a/synfig-studio/trunk/src/gtkmm/state_width.cpp
+++ b/synfig-studio/trunk/src/gtkmm/state_width.cpp
@@ -2,7 +2,7 @@
 /*!	\file state_width.cpp
 **	\brief Template File
 **
-**	$Id: state_width.cpp,v 1.1.1.1 2005/01/07 03:34:37 darco Exp $
+**	$Id$
 **
 **	\legal
 **	Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
@@ -55,6 +55,8 @@
 
 #include <ETL/clock>
 
+#include "general.h"
+
 #endif
 
 /* === U S I N G =========================================================== */
@@ -149,7 +151,7 @@ public:
 	void save_settings();
 	void reset();
 
-};	// END of class StateGradient_Context
+};	// END of class StateWidth_Context
 
 /* === M E T H O D S ======================================================= */
 
@@ -208,8 +210,8 @@ StateWidth_Context::reset()
 StateWidth_Context::StateWidth_Context(CanvasView* canvas_view):
 	canvas_view_(canvas_view),
 	is_working(*canvas_view),
-	prev_workarea_layer_clicking(get_work_area()->allow_layer_clicks),
-	prev_workarea_duck_clicking(get_work_area()->allow_duck_clicks),
+	prev_workarea_layer_clicking(get_work_area()->get_allow_layer_clicks()),
+	prev_workarea_duck_clicking(get_work_area()->get_allow_duck_clicks()),
 	old_duckmask(get_work_area()->get_type_mask()),
 
 	settings(synfigapp::Main::get_selected_input_device()->settings()),
@@ -243,7 +245,7 @@ StateWidth_Context::StateWidth_Context(CanvasView* canvas_view):
 	App::dialog_tool_options->present();
 
 	// Turn off layer clicking
-	get_work_area()->allow_layer_clicks=false;
+	get_work_area()->set_allow_layer_clicks(false);
 
 	// clear out the ducks
 	//get_work_area()->clear_ducks();
@@ -278,7 +280,7 @@ StateWidth_Context::StateWidth_Context(CanvasView* canvas_view):
 	}
 
 	//Disable duck clicking for the maximum coolness :)
-	get_work_area()->allow_duck_clicks = false;
+	get_work_area()->set_allow_duck_clicks(false);
 	get_work_area()->set_type_mask((Duck::Type)((int)Duck::TYPE_WIDTH + (int)Duck::TYPE_RADIUS));
 
 	// Turn the mouse pointer to crosshairs
@@ -288,8 +290,8 @@ StateWidth_Context::StateWidth_Context(CanvasView* canvas_view):
 	//prev_table_status=get_canvas_view()->tables_are_visible();
 	//if(prev_table_status)get_canvas_view()->hide_tables();
 
-	// Hide the time bar
-	//get_canvas_view()->hide_timebar();
+	// Disable the time bar
+	//get_canvas_view()->set_sensitive_timebar(false);
 
 	// Connect a signal
 	//get_work_area()->signal_user_click().connect(sigc::mem_fun(*this,&studio::StateWidth_Context::on_user_click));
@@ -307,7 +309,7 @@ StateWidth_Context::refresh_tool_options()
 }
 
 Smach::event_result
-StateWidth_Context::event_refresh_tool_options(const Smach::event& x)
+StateWidth_Context::event_refresh_tool_options(const Smach::event& /*x*/)
 {
 	refresh_tool_options();
 	return Smach::RESULT_ACCEPT;
@@ -327,10 +329,10 @@ StateWidth_Context::~StateWidth_Context()
 	}
 
 	// Restore Duck clicking
-	get_work_area()->allow_duck_clicks = prev_workarea_duck_clicking;
+	get_work_area()->set_allow_duck_clicks(prev_workarea_duck_clicking);
 
 	// Restore layer clicking
-	get_work_area()->allow_layer_clicks = prev_workarea_layer_clicking;
+	get_work_area()->set_allow_layer_clicks(prev_workarea_layer_clicking);
 
 	// Restore the mouse pointer
 	get_work_area()->reset_cursor();
@@ -341,9 +343,8 @@ StateWidth_Context::~StateWidth_Context()
 	// Tool options be rid of ye!!
 	App::dialog_tool_options->clear();
 
-	// Show the time bar
-	if(get_canvas_view()->get_canvas()->rend_desc().get_time_start()!=get_canvas_view()->get_canvas()->rend_desc().get_time_end())
-		get_canvas_view()->show_timebar();
+	// Enable the time bar
+	//get_canvas_view()->set_sensitive_timebar(true);
 
 	// Bring back the tables if they were out before
 	//if(prev_table_status)get_canvas_view()->show_tables();
@@ -355,13 +356,13 @@ StateWidth_Context::~StateWidth_Context()
 }
 
 Smach::event_result
-StateWidth_Context::event_stop_handler(const Smach::event& x)
+StateWidth_Context::event_stop_handler(const Smach::event& /*x*/)
 {
 	throw Smach::egress_exception();
 }
 
 Smach::event_result
-StateWidth_Context::event_refresh_handler(const Smach::event& x)
+StateWidth_Context::event_refresh_handler(const Smach::event& /*x*/)
 {
 	refresh_ducks();
 	return Smach::RESULT_ACCEPT;
@@ -462,7 +463,7 @@ StateWidth_Context::event_mouse_handler(const Smach::event& x)
 {
 	const EventMouse& event(*reinterpret_cast<const EventMouse*>(&x));
 
-	//handle ze click
+	//handle the click
 	if( (event.key == EVENT_WORKAREA_MOUSE_BUTTON_DOWN || event.key == EVENT_WORKAREA_MOUSE_BUTTON_DRAG)
 			&& event.button == BUTTON_LEFT )
 	{