projects
/
synfig.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Prevent the "Gtk-CRITICAL **: gtk_label_set_label: assertion `str != NULL' failed...
[synfig.git]
/
synfig-studio
/
trunk
/
src
/
gtkmm
/
state_sketch.cpp
diff --git
a/synfig-studio/trunk/src/gtkmm/state_sketch.cpp
b/synfig-studio/trunk/src/gtkmm/state_sketch.cpp
index
32ab3d3
..
6d7121e
100644
(file)
--- a/
synfig-studio/trunk/src/gtkmm/state_sketch.cpp
+++ b/
synfig-studio/trunk/src/gtkmm/state_sketch.cpp
@@
-230,7
+230,7
@@
StateSketch_Context::StateSketch_Context(CanvasView* canvas_view):
action_group(Gtk::ActionGroup::create()),
canvas_view_(canvas_view),
is_working(*canvas_view),
action_group(Gtk::ActionGroup::create()),
canvas_view_(canvas_view),
is_working(*canvas_view),
- prev_workarea_layer_status_(get_work_area()->
allow_layer_clicks
),
+ prev_workarea_layer_status_(get_work_area()->
get_allow_layer_clicks()
),
button_clear_sketch(_("Clear Sketch")),
button_undo_stroke(_("Undo Stroke")),
button_save_sketch(_("Save Sketch")),
button_clear_sketch(_("Clear Sketch")),
button_undo_stroke(_("Undo Stroke")),
button_save_sketch(_("Save Sketch")),
@@
-333,12
+333,12
@@
StateSketch_Context::StateSketch_Context(CanvasView* canvas_view):
App::dialog_tool_options->present();
// Turn off layer clicking
App::dialog_tool_options->present();
// Turn off layer clicking
- get_work_area()->
allow_layer_clicks=false
;
+ get_work_area()->
set_allow_layer_clicks(false)
;
get_canvas_view()->work_area->set_cursor(Gdk::PENCIL);
// Turn off duck clicking
get_canvas_view()->work_area->set_cursor(Gdk::PENCIL);
// Turn off duck clicking
- get_work_area()->
allow_duck_clicks=false
;
+ get_work_area()->
set_allow_duck_clicks(false)
;
// clear out the ducks
//get_work_area()->clear_ducks();
// clear out the ducks
//get_work_area()->clear_ducks();
@@
-350,8
+350,8
@@
StateSketch_Context::StateSketch_Context(CanvasView* canvas_view):
prev_table_status=get_canvas_view()->tables_are_visible();
//if(prev_table_status)get_canvas_view()->hide_tables();
prev_table_status=get_canvas_view()->tables_are_visible();
//if(prev_table_status)get_canvas_view()->hide_tables();
- //
Hid
e the time bar
- //get_canvas_view()->
hide_timebar(
);
+ //
Disabl
e 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::StateSketch_Context::on_user_click));
// Connect a signal
//get_work_area()->signal_user_click().connect(sigc::mem_fun(*this,&studio::StateSketch_Context::on_user_click));
@@
-366,14
+366,13
@@
StateSketch_Context::~StateSketch_Context()
App::dialog_tool_options->clear();
// Restore layer clicking
App::dialog_tool_options->clear();
// Restore layer clicking
- get_work_area()->
allow_layer_clicks=prev_workarea_layer_status_
;
+ get_work_area()->
set_allow_layer_clicks(prev_workarea_layer_status_)
;
// Restore duck clicking
// Restore duck clicking
- get_work_area()->
allow_duck_clicks=true
;
+ get_work_area()->
set_allow_duck_clicks(true)
;
- // 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();
// Bring back the tables if they were out before
if(prev_table_status)get_canvas_view()->show_tables();
@@
-449,27
+448,27
@@
StateSketch_Context::refresh_tool_options()
}
Smach::event_result
}
Smach::event_result
-StateSketch_Context::event_refresh_tool_options(const Smach::event&
x
)
+StateSketch_Context::event_refresh_tool_options(const Smach::event&
/*x*/
)
{
refresh_tool_options();
return Smach::RESULT_ACCEPT;
}
Smach::event_result
{
refresh_tool_options();
return Smach::RESULT_ACCEPT;
}
Smach::event_result
-StateSketch_Context::event_yield_tool_options(const Smach::event&
x
)
+StateSketch_Context::event_yield_tool_options(const Smach::event&
/*x*/
)
{
yield_tool_options();
return Smach::RESULT_ACCEPT;
}
Smach::event_result
{
yield_tool_options();
return Smach::RESULT_ACCEPT;
}
Smach::event_result
-StateSketch_Context::event_stop_handler(const Smach::event&
x
)
+StateSketch_Context::event_stop_handler(const Smach::event&
/*x*/
)
{
throw Smach::egress_exception();
}
Smach::event_result
{
throw Smach::egress_exception();
}
Smach::event_result
-StateSketch_Context::event_refresh_handler(const Smach::event&
x
)
+StateSketch_Context::event_refresh_handler(const Smach::event&
/*x*/
)
{
return Smach::RESULT_ACCEPT;
}
{
return Smach::RESULT_ACCEPT;
}