diff options
| -rw-r--r-- | gtk2_ardour/SConscript | 2 | ||||
| -rw-r--r-- | gtk2_ardour/grouped_buttons.cc | 6 | ||||
| -rw-r--r-- | gtk2_ardour/grouped_buttons.h | 10 | ||||
| -rw-r--r-- | gtk2_ardour/gtk-custom-hruler.c | 10 | ||||
| -rw-r--r-- | gtk2_ardour/gtk-custom-ruler.c | 4 | ||||
| -rw-r--r-- | gtk2_ardour/vst_pluginui.cc | 2 |
6 files changed, 17 insertions, 17 deletions
diff --git a/gtk2_ardour/SConscript b/gtk2_ardour/SConscript index c883ff5247..7a75dd6b66 100644 --- a/gtk2_ardour/SConscript +++ b/gtk2_ardour/SConscript @@ -14,7 +14,7 @@ gtkardour = env.Copy() domain = 'gtk_ardour' -gtkardour.Append(DOMAIN=domain, MAJOR=1,MINOR=0,MICRO=0) +gtkardour.Append(DOMAIN=domain, MAJOR=1,MINOR=0,MICRO=1) gtkardour.Append(CXXFLAGS="-DPACKAGE=\\\"" + domain + "\\\"") gtkardour.Append(PACKAGE=domain) gtkardour.Append(POTFILE=domain + '.pot') diff --git a/gtk2_ardour/grouped_buttons.cc b/gtk2_ardour/grouped_buttons.cc index 544b3e1ed8..64c58d8197 100644 --- a/gtk2_ardour/grouped_buttons.cc +++ b/gtk2_ardour/grouped_buttons.cc @@ -18,7 +18,7 @@ $Id$ */ -#include <gtk--.h> +#include <gtkmm.h> #include "grouped_buttons.h" @@ -34,7 +34,7 @@ GroupedButtons::GroupedButtons (vector<Gtk::ToggleButton *>& buttonset) if ((*i)->get_active()) { current_active = n; } - (*i)->clicked.connect (bind (slot (*this, &GroupedButtons::one_clicked), n)); + (*i)->signal_clicked().connect (sigc::bind (mem_fun (*this, &GroupedButtons::one_clicked), n)); } } @@ -53,7 +53,7 @@ GroupedButtons::GroupedButtons (uint32_t nbuttons, uint32_t first_active) button->set_active (true); } - button->clicked.connect (bind (slot (*this, &GroupedButtons::one_clicked), n)); + button->signal_clicked().connect (sigc::bind (mem_fun (*this, &GroupedButtons::one_clicked), n)); buttons.push_back (button); } } diff --git a/gtk2_ardour/grouped_buttons.h b/gtk2_ardour/grouped_buttons.h index ff8051a120..2bb067fcd0 100644 --- a/gtk2_ardour/grouped_buttons.h +++ b/gtk2_ardour/grouped_buttons.h @@ -18,19 +18,19 @@ $Id$ */ -#ifndef __gtkmmext_grouped_buttons_h__ -#define __gtkmmext_grouped_buttons_h__ +#ifndef __gtkmm2ext_grouped_buttons_h__ +#define __gtkmm2ext_grouped_buttons_h__ #include <stdint.h> #include <vector> -#include <sigc++/signal_system.h> +#include <sigc++/signal.h> namespace Gtk { class ToggleButton; }; -class GroupedButtons : public SigC::Object +class GroupedButtons : public sigc::trackable { public: GroupedButtons (uint32_t nbuttons, uint32_t first_active); @@ -46,4 +46,4 @@ class GroupedButtons : public SigC::Object void one_clicked (uint32_t which); }; -#endif /* __gtkmmext_grouped_buttons_h__ */ +#endif /* __gtkmm2ext_grouped_buttons_h__ */ diff --git a/gtk2_ardour/gtk-custom-hruler.c b/gtk2_ardour/gtk-custom-hruler.c index d028d6472e..840b17ece3 100644 --- a/gtk2_ardour/gtk-custom-hruler.c +++ b/gtk2_ardour/gtk-custom-hruler.c @@ -85,8 +85,8 @@ gtk_custom_hruler_init (GtkCustomHRuler * custom_hruler) GtkWidget *widget; widget = GTK_WIDGET (custom_hruler); - widget->requisition.width = widget->style->klass->xthickness * 2 + 1; - widget->requisition.height = widget->style->klass->ythickness * 2 + RULER_HEIGHT; + widget->requisition.width = widget->style->xthickness * 2 + 1; + widget->requisition.height = widget->style->ythickness * 2 + RULER_HEIGHT; } @@ -143,7 +143,7 @@ gtk_custom_hruler_draw_ticks (GtkCustomRuler * ruler) gc = widget->style->fg_gc[GTK_STATE_NORMAL]; bg_gc = widget->style->bg_gc[GTK_STATE_NORMAL]; - font = widget->style->font; + font = gtk_style_get_font(widget->style); gtk_paint_box (widget->style, ruler->backing_store, GTK_STATE_NORMAL, GTK_SHADOW_NONE, @@ -208,8 +208,8 @@ gtk_custom_hruler_draw_pos (GtkCustomRuler * ruler) if (GTK_WIDGET_DRAWABLE (ruler) && (ruler->upper - ruler->lower) > 0) { widget = GTK_WIDGET (ruler); gc = widget->style->fg_gc[GTK_STATE_NORMAL]; - xthickness = widget->style->klass->xthickness; - ythickness = widget->style->klass->ythickness; + xthickness = widget->style->xthickness; + ythickness = widget->style->ythickness; width = widget->allocation.width; height = widget->allocation.height - ythickness * 2; diff --git a/gtk2_ardour/gtk-custom-ruler.c b/gtk2_ardour/gtk-custom-ruler.c index 8f63f82f01..4834be97f3 100644 --- a/gtk2_ardour/gtk-custom-ruler.c +++ b/gtk2_ardour/gtk-custom-ruler.c @@ -216,7 +216,7 @@ gtk_custom_ruler_draw_ticks (GtkCustomRuler * ruler) g_return_if_fail (ruler != NULL); g_return_if_fail (GTK_IS_CUSTOM_RULER (ruler)); - klass = GTK_CUSTOM_RULER_CLASS (GTK_OBJECT (ruler)->klass); + klass = GTK_CUSTOM_RULER_CLASS (GTK_OBJECT (ruler)); if (klass->draw_ticks) klass->draw_ticks (ruler); } @@ -228,7 +228,7 @@ gtk_custom_ruler_draw_pos (GtkCustomRuler * ruler) g_return_if_fail (ruler != NULL); g_return_if_fail (GTK_IS_CUSTOM_RULER (ruler)); - klass = GTK_CUSTOM_RULER_CLASS (GTK_OBJECT (ruler)->klass); + klass = GTK_CUSTOM_RULER_CLASS (GTK_OBJECT (ruler)); if (klass->draw_pos && ruler->show_position) klass->draw_pos (ruler); } diff --git a/gtk2_ardour/vst_pluginui.cc b/gtk2_ardour/vst_pluginui.cc index bdb7ecded8..1dcd2940f0 100644 --- a/gtk2_ardour/vst_pluginui.cc +++ b/gtk2_ardour/vst_pluginui.cc @@ -69,7 +69,7 @@ VSTPluginUI::package (Gtk::Window& win) /* forward configure events to plugin window */ - win.configure_event.connect (bind (slot (*this, &VSTPluginUI::configure_handler), socket.gtkobj())); + win.configure_event.connect (bind (slot (*this, &VSTPluginUI::configure_handler), socket.gobj())); /* XXX in GTK2, use add_id() instead of steal, although add_id() assumes that the window's owner understands the XEmbed protocol. |