using namespace etl;
using namespace synfig;
using namespace studio;
-using namespace SigC;
+using namespace sigc;
/* === M A C R O S ========================================================= */
filemenu->items().push_back(Gtk::Menu_Helpers::StockMenuElem(Gtk::Stock::CLOSE,
sigc::ptr_fun(close_selected_instance)));
filemenu->items().push_back(Gtk::Menu_Helpers::SeparatorElem());
- filemenu->items().push_back(Gtk::Menu_Helpers::MenuElem(_("Dialogs"),*dock_dialogs));
+ filemenu->items().push_back(Gtk::Menu_Helpers::MenuElem(_("Panels"),*dock_dialogs));
//filemenu->items().push_back(Gtk::Menu_Helpers::MenuElem(_("Canvas Browser..."),
// sigc::mem_fun(studio::App::show_comp_view)));
file_buttons->show();
- tool_table=manage(new class Gtk::Table(4, 4, false));
+ tool_table=manage(new class Gtk::Table());
tool_table->show();
Gtk::HandleBox* handle_tools(manage(new Gtk::HandleBox()));
handle_tools->add(*tool_table);
}
void
-Toolbox::set_active_state(const String& statename)
+Toolbox::set_active_state(const synfig::String& statename)
{
std::map<synfig::String,Gtk::ToggleButton *>::iterator iter;
icon->show();
button->show();
- int row=state_button_map.size()/4;
- int col=state_button_map.size()%4;
+ int row=state_button_map.size()/5;
+ int col=state_button_map.size()%5;
tool_table->attach(*button,col,col+1,row,row+1, Gtk::SHRINK, Gtk::SHRINK, 0, 0);