projects / ardour.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Removed gtkmm.h usage.
[ardour.git] / gtk2_ardour / automation_time_axis.cc
diff --git a/gtk2_ardour/automation_time_axis.cc b/gtk2_ardour/automation_time_axis.cc
index e90f7e61f90f1fbcdca2cea4947c4e5d0c4a378a..6f47905f02082cce1dd6e830e821146caee6e74f 100644 (file)
--- a/gtk2_ardour/automation_time_axis.cc
+++ b/gtk2_ardour/automation_time_axis.cc
@@ -53,8 +53,8 @@ AutomationTimeAxisView::AutomationTimeAxisView (Session& s, Route& r, PublicEdit
        auto_play_item = 0;
        ignore_state_request = false;
 
-       base_rect = gtk_canvas_item_new (GTK_CANVAS_GROUP(canvas_display),
-                                        gtk_canvas_simplerect_get_type(),
+       base_rect = gnome_canvas_item_new (GNOME_CANVAS_GROUP(canvas_display),
+                                        gnome_canvas_simplerect_get_type(),
                                         "x1", 0.0,
                                         "y1", 0.0,
                                         "x2", 1000000.0,
@@ -70,7 +70,7 @@ AutomationTimeAxisView::AutomationTimeAxisView (Session& s, Route& r, PublicEdit
                            (GtkSignalFunc) PublicEditor::canvas_automation_track_event,
                            this);
 
-       hide_button.add (*(manage (new Pixmap (small_x_xpm))));
+       hide_button.add (*(manage (new Gtk::Image (Gdk::Pixbuf::create_from_xpm_data(small_x_xpm)))));
 
        height_button.set_name ("TrackSizeButton");
        auto_button.set_name ("TrackVisualButton");
@@ -122,9 +122,9 @@ AutomationTimeAxisView::AutomationTimeAxisView (Session& s, Route& r, PublicEdit
                plugname->set_alignment (1.0, 0.5);
                name_label.set_name (X_("TrackParameterName"));
                controls_table.remove (name_hbox);
-               controls_table.attach (*plugname, 1, 6, 0, 1, GTK_FILL|GTK_EXPAND, GTK_FILL|GTK_EXPAND);
+               controls_table.attach (*plugname, 1, 6, 0, 1, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND);
                plugname_packed = true;
-               controls_table.attach (name_hbox, 1, 6, 1, 2, GTK_FILL|GTK_EXPAND, GTK_FILL|GTK_EXPAND);
+               controls_table.attach (name_hbox, 1, 6, 1, 2, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND);
        } else {
                plugname = 0;
                plugname_packed = false;
@@ -140,24 +140,24 @@ AutomationTimeAxisView::AutomationTimeAxisView (Session& s, Route& r, PublicEdit
        }
        
        /* add the buttons */
-       controls_table.attach (hide_button, 0, 1, 0, 1, GTK_FILL|GTK_EXPAND, GTK_FILL|GTK_EXPAND);
-       controls_table.attach (height_button, 0, 1, 1, 2, GTK_FILL|GTK_EXPAND, GTK_FILL|GTK_EXPAND);
+       controls_table.attach (hide_button, 0, 1, 0, 1, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND);
+       controls_table.attach (height_button, 0, 1, 1, 2, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND);
 
-       controls_table.attach (auto_button, 7, 9, 0, 1, GTK_FILL|GTK_EXPAND, GTK_FILL|GTK_EXPAND);
-       controls_table.attach (clear_button, 7, 9, 1, 2, GTK_FILL|GTK_EXPAND, GTK_FILL|GTK_EXPAND);
+       controls_table.attach (auto_button, 7, 9, 0, 1, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND);
+       controls_table.attach (clear_button, 7, 9, 1, 2, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND);
        
        controls_table.show_all ();
 
-       height_button.clicked.connect (slot (*this, &AutomationTimeAxisView::height_clicked));
-       clear_button.clicked.connect (slot (*this, &AutomationTimeAxisView::clear_clicked));
-       hide_button.clicked.connect (slot (*this, &AutomationTimeAxisView::hide_clicked));
-       auto_button.clicked.connect (slot (*this, &AutomationTimeAxisView::auto_clicked));
+       height_button.signal_clicked().connect (mem_fun(*this, &AutomationTimeAxisView::height_clicked));
+       clear_button.signal_clicked().connect (mem_fun(*this, &AutomationTimeAxisView::clear_clicked));
+       hide_button.signal_clicked().connect (mem_fun(*this, &AutomationTimeAxisView::hide_clicked));
+       auto_button.signal_clicked().connect (mem_fun(*this, &AutomationTimeAxisView::auto_clicked));
 
        controls_base_selected_name = X_("AutomationTrackControlsBaseSelected");
        controls_base_unselected_name = X_("AutomationTrackControlsBase");
        controls_ebox.set_name (controls_base_unselected_name);
 
-       controls_frame.set_shadow_type (GTK_SHADOW_ETCHED_OUT);
+       controls_frame.set_shadow_type (Gtk::SHADOW_ETCHED_OUT);
 
        XMLNode* xml_node = get_parent_with_state()->get_child_xml_node (_state_name);
        set_state (*xml_node);
@@ -187,13 +187,13 @@ AutomationTimeAxisView::auto_clicked ()
                MenuList& items (automation_menu->items());
 
                items.push_back (MenuElem (_("off"), 
-                                          bind (slot (*this, &AutomationTimeAxisView::set_automation_state), (AutoState) Off)));
+                                          bind (mem_fun(*this, &AutomationTimeAxisView::set_automation_state), (AutoState) Off)));
                items.push_back (MenuElem (_("play"),
-                                          bind (slot (*this, &AutomationTimeAxisView::set_automation_state), (AutoState) Play)));
+                                          bind (mem_fun(*this, &AutomationTimeAxisView::set_automation_state), (AutoState) Play)));
                items.push_back (MenuElem (_("write"),
-                                          bind (slot (*this, &AutomationTimeAxisView::set_automation_state), (AutoState) Write)));
+                                          bind (mem_fun(*this, &AutomationTimeAxisView::set_automation_state), (AutoState) Write)));
                items.push_back (MenuElem (_("touch"),
-                                          bind (slot (*this, &AutomationTimeAxisView::set_automation_state), (AutoState) Touch)));
+                                          bind (mem_fun(*this, &AutomationTimeAxisView::set_automation_state), (AutoState) Touch)));
        }
 
        automation_menu->popup (1, 0);
@@ -310,11 +310,11 @@ AutomationTimeAxisView::set_height (TrackHeight h)
                                controls_table.remove (*plugname);
                                plugname_packed = false;
                        }
-                       controls_table.attach (*plugname, 1, 6, 0, 1, GTK_FILL|GTK_EXPAND, GTK_FILL|GTK_EXPAND);
+                       controls_table.attach (*plugname, 1, 6, 0, 1, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND);
                        plugname_packed = true;
-                       controls_table.attach (name_hbox, 1, 6, 1, 2, GTK_FILL|GTK_EXPAND, GTK_FILL|GTK_EXPAND);
+                       controls_table.attach (name_hbox, 1, 6, 1, 2, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND);
                } else {
-                       controls_table.attach (name_hbox, 1, 6, 0, 1, GTK_FILL|GTK_EXPAND, GTK_FILL|GTK_EXPAND);
+                       controls_table.attach (name_hbox, 1, 6, 0, 1, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND);
                }
                controls_table.show_all ();
                name_label.show ();
@@ -328,10 +328,10 @@ AutomationTimeAxisView::set_height (TrackHeight h)
                                controls_table.remove (*plugname);
                                plugname_packed = false;
                        }
-                       controls_table.attach (*plugname, 1, 6, 0, 1, GTK_FILL|GTK_EXPAND, GTK_FILL|GTK_EXPAND);
+                       controls_table.attach (*plugname, 1, 6, 0, 1, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND);
                        plugname_packed = true;
                } else {
-                       controls_table.attach (name_hbox, 1, 6, 0, 1, GTK_FILL|GTK_EXPAND, GTK_FILL|GTK_EXPAND);
+                       controls_table.attach (name_hbox, 1, 6, 0, 1, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND);
                }
                controls_table.show_all ();
                name_label.show ();
@@ -345,10 +345,10 @@ AutomationTimeAxisView::set_height (TrackHeight h)
                                controls_table.remove (*plugname);
                                plugname_packed = false;
                        }
-                       controls_table.attach (*plugname, 1, 6, 0, 1, GTK_FILL|GTK_EXPAND, GTK_FILL|GTK_EXPAND);
+                       controls_table.attach (*plugname, 1, 6, 0, 1, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND);
                        plugname_packed = true;
                } else {
-                       controls_table.attach (name_hbox, 1, 6, 0, 1, GTK_FILL|GTK_EXPAND, GTK_FILL|GTK_EXPAND);
+                       controls_table.attach (name_hbox, 1, 6, 0, 1, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND);
                }
                controls_table.show_all ();
                name_label.show ();
@@ -362,11 +362,11 @@ AutomationTimeAxisView::set_height (TrackHeight h)
                                controls_table.remove (*plugname);
                                plugname_packed = false;
                        }
-                       controls_table.attach (*plugname, 1, 6, 0, 1, GTK_FILL|GTK_EXPAND, GTK_FILL|GTK_EXPAND);
+                       controls_table.attach (*plugname, 1, 6, 0, 1, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND);
                        plugname_packed = true;
-                       controls_table.attach (name_hbox, 1, 6, 1, 2, GTK_FILL|GTK_EXPAND, GTK_FILL|GTK_EXPAND);
+                       controls_table.attach (name_hbox, 1, 6, 1, 2, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND);
                } else {
-                       controls_table.attach (name_hbox, 1, 6, 0, 1, GTK_FILL|GTK_EXPAND, GTK_FILL|GTK_EXPAND);
+                       controls_table.attach (name_hbox, 1, 6, 0, 1, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND);
                }
                controls_table.show_all ();
                name_label.show ();
@@ -381,7 +381,7 @@ AutomationTimeAxisView::set_height (TrackHeight h)
                                plugname_packed = false;
                        }
                }
-               controls_table.attach (name_hbox, 1, 6, 0, 1, GTK_FILL|GTK_EXPAND, GTK_FILL|GTK_EXPAND);
+               controls_table.attach (name_hbox, 1, 6, 0, 1, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND);
                controls_table.hide_all ();
                name_hbox.show_all ();
                controls_table.show ();
@@ -396,7 +396,7 @@ AutomationTimeAxisView::set_height (TrackHeight h)
                                plugname_packed = false;
                        }
                } 
-               controls_table.attach (name_hbox, 1, 6, 0, 1, GTK_FILL|GTK_EXPAND, GTK_FILL|GTK_EXPAND);
+               controls_table.attach (name_hbox, 1, 6, 0, 1, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND);
                controls_table.hide_all ();
                name_hbox.show_all ();
                controls_table.show ();
@@ -446,9 +446,9 @@ AutomationTimeAxisView::build_display_menu ()
 
        items.push_back (MenuElem (_("Height"), *size_menu));
        items.push_back (SeparatorElem());
-       items.push_back (MenuElem (_("Hide"), slot (*this, &AutomationTimeAxisView::hide_clicked)));
+       items.push_back (MenuElem (_("Hide"), mem_fun(*this, &AutomationTimeAxisView::hide_clicked)));
        items.push_back (SeparatorElem());
-       items.push_back (MenuElem (_("Clear"), slot (*this, &AutomationTimeAxisView::clear_clicked)));
+       items.push_back (MenuElem (_("Clear"), mem_fun(*this, &AutomationTimeAxisView::clear_clicked)));
        items.push_back (SeparatorElem());
 
        Menu* auto_state_menu = manage (new Menu);
@@ -456,20 +456,20 @@ AutomationTimeAxisView::build_display_menu ()
        MenuList& as_items = auto_state_menu->items();
        
        as_items.push_back (CheckMenuElem (_("off"), 
-                                          bind (slot (*this, &AutomationTimeAxisView::set_automation_state), (AutoState) Off)));
-       auto_off_item = dynamic_cast<CheckMenuItem*>(as_items.back());
+                                          bind (mem_fun(*this, &AutomationTimeAxisView::set_automation_state), (AutoState) Off)));
+       auto_off_item = dynamic_cast<CheckMenuItem*>(&as_items.back());
 
        as_items.push_back (CheckMenuElem (_("play"),
-                                          bind (slot (*this, &AutomationTimeAxisView::set_automation_state), (AutoState) Play)));
-       auto_play_item = dynamic_cast<CheckMenuItem*>(as_items.back());
+                                          bind (mem_fun(*this, &AutomationTimeAxisView::set_automation_state), (AutoState) Play)));
+       auto_play_item = dynamic_cast<CheckMenuItem*>(&as_items.back());
 
        as_items.push_back (CheckMenuElem (_("write"),
-                                          bind (slot (*this, &AutomationTimeAxisView::set_automation_state), (AutoState) Write)));
-       auto_write_item = dynamic_cast<CheckMenuItem*>(as_items.back());
+                                          bind (mem_fun(*this, &AutomationTimeAxisView::set_automation_state), (AutoState) Write)));
+       auto_write_item = dynamic_cast<CheckMenuItem*>(&as_items.back());
 
        as_items.push_back (CheckMenuElem (_("touch"),
-                                          bind (slot (*this, &AutomationTimeAxisView::set_automation_state), (AutoState) Touch)));
-       auto_touch_item = dynamic_cast<CheckMenuItem*>(as_items.back());
+                                          bind (mem_fun(*this, &AutomationTimeAxisView::set_automation_state), (AutoState) Touch)));
+       auto_touch_item = dynamic_cast<CheckMenuItem*>(&as_items.back());
 
        items.push_back (MenuElem (_("State"), *auto_state_menu));
 
@@ -645,7 +645,7 @@ void
 AutomationTimeAxisView::add_ghost (GhostRegion* gr)
 {
        ghosts.push_back (gr);
-       gr->GoingAway.connect (slot (*this, &AutomationTimeAxisView::remove_ghost));
+       gr->GoingAway.connect (mem_fun(*this, &AutomationTimeAxisView::remove_ghost));
 }
 
 void
@@ -736,7 +736,7 @@ AutomationTimeAxisView::add_line (AutomationLine& line)
        if (lines.empty()) {
                /* first line is the Model for automation state */
                automation_connection = line.the_list().automation_state_changed.connect
-                       (slot (*this, &AutomationTimeAxisView::automation_state_changed));
+                       (mem_fun(*this, &AutomationTimeAxisView::automation_state_changed));
                get = true;
        }
 
Unnamed repository; edit this file 'description' to name the repository.