ichthyo/LUMIERA.clone
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed set_icon_size for temporary Debian Etch compatibility

Browse source
This commit is contained in:
Joel Holdsworth 2008-12-16 22:55:32 +00:00
parent 21ba2de6ed
commit 1ecccb5925
2 changed files with 19 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
configure.ac
View file

@ -135,8 +135,13 @@ PKG_CHECK_MODULES(LUMIERA_COMMON_LIBS, [sigc++-2.0 >= 2.0.18])
# END Internatinalization
############## Gtk Dependancies
# gtk+-2.0 >= 2.8 gtkmm-2.4 >= 2.8 for Debian Etch compatibility
# gtk+-2.0 >= 2.12 gtkmm-2.4 >= 2.12 for Debian Lenny compatibility
PKG_CHECK_MODULES(LUMIERA_GUI, [
gtkmm-2.4 >= 2.8 gdl-1.0 >= 0.6.1 cairomm-1.0 >= 0.6.0
gtk+-2.0 >= 2.8 gtkmm-2.4 >= 2.8
gdl-1.0 >= 0.6.1 cairomm-1.0 >= 0.6.0
gavl >= 0.2.5 librsvg-2.0 >= 2.18.1])
# END Gtk Dependancies

15
src/gui/widgets/timeline/timeline-track.cpp
View file

@ -20,6 +20,9 @@
* *****************************************************/
#warning This header must soon be removed when we drop Etch compatibility
#include <gtk/gtktoolbar.h>
#include "timeline-track.hpp"
#include "../../window-manager.hpp"
@ -38,8 +41,16 @@ Track::Track() :
buttonBar.append(lockButton);
buttonBar.set_toolbar_style(TOOLBAR_ICONS);
//buttonBar.set_icon_size(WindowManager::MenuIconSize);
//TODO uncommented for now, doesn't compile on etch. 12/15/08 ichthyo
#if 0
buttonBar.set_icon_size(WindowManager::MenuIconSize);
#else
#warning This code soon be removed when we drop Etch compatibility
// Temporary bodge for etch compatibility - will be removed soon
gtk_toolbar_set_icon_size (buttonBar.gobj(),
(GtkIconSize)(int)WindowManager::MenuIconSize);
#endif
headerWidget.pack_start(titleBox, PACK_SHRINK);
headerWidget.pack_start(buttonBar, PACK_SHRINK);