Module: synfig
Branch: zelgadis_master
Commit: 37e70ada40533e1d3a623c5ebb560d7e88f83809
URL:
http://synfig.git.sourceforge.net/git/gitweb.cgi?p=synfig;a=commit;h=37e70ada40533e1d3a623c5ebb560d7e88f83809
Author: Carlos Lopez <car...@pcnuevo.(none)>
Date: Wed Jun 24 22:24:31 2009 +0200
Deprecate intermediate Gtk::Table variable 'table'. Not needed.
---
synfig-studio/trunk/src/gtkmm/canvasview.cpp | 27 ++++++++++++-------------
synfig-studio/trunk/src/gtkmm/canvasview.h | 2 +-
2 files changed, 14 insertions(+), 15 deletions(-)
diff --git a/synfig-studio/trunk/src/gtkmm/canvasview.cpp
b/synfig-studio/trunk/src/gtkmm/canvasview.cpp
index 64bf34a..caeb737 100644
--- a/synfig-studio/trunk/src/gtkmm/canvasview.cpp
+++ b/synfig-studio/trunk/src/gtkmm/canvasview.cpp
@@ -1044,24 +1044,23 @@ CanvasView::create_time_bar()
);
toggleducksdial->show();
- Gtk::Table *table = manage(new class Gtk::Table(5, 4, false));
- timebar = table;
+ timebar = manage(new class Gtk::Table(5, 4, false));
- //Attach widgets to the time bar table
- table->attach(*manage(disp_audio), 1, 5, 0, 1, Gtk::EXPAND|Gtk::FILL,
Gtk::SHRINK);
- table->attach(*framedial, 0, 1, 2, 3,Gtk::SHRINK, Gtk::SHRINK);
- table->attach(*current_time_widget, 0, 1, 1, 2, Gtk::SHRINK|Gtk::FILL,
Gtk::SHRINK|Gtk::FILL, 0, 0);
- table->attach(*timeslider, 1, 3, 1, 2, Gtk::EXPAND|Gtk::FILL,
Gtk::SHRINK);
- table->attach(*time_window_scroll, 1, 3, 2, 3, Gtk::EXPAND|Gtk::FILL,
Gtk::SHRINK);
- table->attach(*keyframedial, 3, 4, 1, 2, Gtk::SHRINK, Gtk::SHRINK);
- table->attach(*animatebutton, 4, 5, 1, 2, Gtk::SHRINK, Gtk::SHRINK);
- //table->attach(*keyframebutton, 1, 2, 3, 4, Gtk::SHRINK, Gtk::SHRINK);
- table->attach(*toggleducksdial, 0, 5, 0, 1, Gtk::SHRINK, Gtk::SHRINK);
+ //Attach widgets to the timebar
+ timebar->attach(*manage(disp_audio), 1, 5, 0, 1, Gtk::EXPAND|Gtk::FILL,
Gtk::SHRINK);
+ timebar->attach(*framedial, 0, 1, 2, 3,Gtk::SHRINK, Gtk::SHRINK);
+ timebar->attach(*current_time_widget, 0, 1, 1, 2,
Gtk::SHRINK|Gtk::FILL, Gtk::SHRINK|Gtk::FILL, 0, 0);
+ timebar->attach(*timeslider, 1, 3, 1, 2, Gtk::EXPAND|Gtk::FILL,
Gtk::SHRINK);
+ timebar->attach(*time_window_scroll, 1, 3, 2, 3, Gtk::EXPAND|Gtk::FILL,
Gtk::SHRINK);
+ timebar->attach(*keyframedial, 3, 4, 1, 2, Gtk::SHRINK, Gtk::SHRINK);
+ timebar->attach(*animatebutton, 4, 5, 1, 2, Gtk::SHRINK, Gtk::SHRINK);
+ //timebar->attach(*keyframebutton, 1, 2, 3, 4, Gtk::SHRINK,
Gtk::SHRINK);
+ timebar->attach(*toggleducksdial, 0, 5, 0, 1, Gtk::SHRINK, Gtk::SHRINK);
- table->show();
+ timebar->show();
- return table;
+ return timebar;
}
Gtk::Widget *
diff --git a/synfig-studio/trunk/src/gtkmm/canvasview.h
b/synfig-studio/trunk/src/gtkmm/canvasview.h
index 844a57f..2ed261e 100644
--- a/synfig-studio/trunk/src/gtkmm/canvasview.h
+++ b/synfig-studio/trunk/src/gtkmm/canvasview.h
@@ -261,7 +261,7 @@ private:
Gtk::Button *refreshbutton;
Gtk::Button *treetogglebutton; // not used
Gtk::Notebook *notebook; // not used
- Gtk::Widget *timebar;
+ Gtk::Table *timebar;
Gtk::Button *animatebutton;
Gtk::Button *keyframebutton;
FrameDial *framedial;
------------------------------------------------------------------------------
Enter the BlackBerry Developer Challenge
This is your chance to win up to $100,000 in prizes! For a limited time,
vendors submitting new applications to BlackBerry App World(TM) will have
the opportunity to enter the BlackBerry Developer Challenge. See full prize
details at: http://p.sf.net/sfu/Challenge
_______________________________________________
Synfig-devl mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/synfig-devl
