Added comment explaining new Gtk::Dialog idiom.

[ardour.git] / gtk2_ardour / editor_markers.cc

diff --git a/gtk2_ardour/editor_markers.cc b/gtk2_ardour/editor_markers.cc
index 8c4e3aec8f4ca81fc1a6c129e12df81c1d32ed40..47982ff72897963d4cd0b01928ade70dd3fa3392 100644 (file)
--- a/gtk2_ardour/editor_markers.cc
+++ b/gtk2_ardour/editor_markers.cc
@@ -373,7 +373,7 @@ void
 Editor::marker_context_menu (GdkEventButton* ev, ArdourCanvas::Item* item)
 {
        Marker * marker;
-       if ((marker = reinterpret_cast<Marker *> (gtk_object_get_data (GTK_OBJECT(item), "marker"))) == 0) {
+       if ((marker = reinterpret_cast<Marker *> (item->get_data("marker"))) == 0) {
                fatal << _("programming error: marker canvas item has no marker object pointer!") << endmsg;
                /*NOTREACHED*/
        }
@@ -392,8 +392,8 @@ Editor::marker_context_menu (GdkEventButton* ev, ArdourCanvas::Item* item)
                        build_marker_menu ();
                }
 
-               Menu_Helpers::MenuList & children = marker_menu->items();
-               // XXX: should really find this some other way
+               // GTK2FIX use action group sensitivity
+#ifdef GTK2FIX
                if (children.size() >= 3) {
                        MenuItem * loopitem = &children[2];
                        if (loopitem) {
@@ -405,7 +405,7 @@ Editor::marker_context_menu (GdkEventButton* ev, ArdourCanvas::Item* item)
                                }
                        }
                }
-               
+#endif         
                marker_menu_item = item;
                marker_menu->popup (1, ev->time);
        }
@@ -505,7 +505,7 @@ Editor::marker_menu_hide ()
 {
        Marker* marker;
 
-       if ((marker = reinterpret_cast<Marker *> (gtk_object_get_data (GTK_OBJECT(marker_menu_item), "marker"))) == 0) {
+       if ((marker = reinterpret_cast<Marker *> (marker_menu_item->get_data ("marker"))) == 0) {
                fatal << _("programming error: marker canvas item has no marker object pointer!") << endmsg;
                /*NOTREACHED*/
        }
@@ -523,7 +523,7 @@ Editor::marker_menu_play_from ()
 {
        Marker* marker;
 
-       if ((marker = reinterpret_cast<Marker *> (gtk_object_get_data (GTK_OBJECT(marker_menu_item), "marker"))) == 0) {
+       if ((marker = reinterpret_cast<Marker *> (marker_menu_item->get_data ("marker"))) == 0) {
                fatal << _("programming error: marker canvas item has no marker object pointer!") << endmsg;
                /*NOTREACHED*/
        }
@@ -553,7 +553,7 @@ Editor::marker_menu_set_playhead ()
 {
        Marker* marker;
 
-       if ((marker = reinterpret_cast<Marker *> (gtk_object_get_data (GTK_OBJECT(marker_menu_item), "marker"))) == 0) {
+       if ((marker = reinterpret_cast<Marker *> (marker_menu_item->get_data ("marker"))) == 0) {
                fatal << _("programming error: marker canvas item has no marker object pointer!") << endmsg;
                /*NOTREACHED*/
        }
@@ -581,7 +581,7 @@ Editor::marker_menu_set_from_playhead ()
 {
        Marker* marker;
 
-       if ((marker = reinterpret_cast<Marker *> (gtk_object_get_data (GTK_OBJECT(marker_menu_item), "marker"))) == 0) {
+       if ((marker = reinterpret_cast<Marker *> (marker_menu_item->get_data ("marker"))) == 0) {
                fatal << _("programming error: marker canvas item has no marker object pointer!") << endmsg;
                /*NOTREACHED*/
        }
@@ -609,7 +609,7 @@ Editor::marker_menu_set_from_selection ()
 {
        Marker* marker;
 
-       if ((marker = reinterpret_cast<Marker *> (gtk_object_get_data (GTK_OBJECT(marker_menu_item), "marker"))) == 0) {
+       if ((marker = reinterpret_cast<Marker *> (marker_menu_item->get_data ("marker"))) == 0) {
                fatal << _("programming error: marker canvas item has no marker object pointer!") << endmsg;
                /*NOTREACHED*/
        }
@@ -647,7 +647,7 @@ Editor::marker_menu_loop_range ()
 {
        Marker* marker;
 
-       if ((marker = reinterpret_cast<Marker *> (gtk_object_get_data (GTK_OBJECT(marker_menu_item), "marker"))) == 0) {
+       if ((marker = reinterpret_cast<Marker *> (marker_menu_item->get_data ("marker"))) == 0) {
                fatal << _("programming error: marker canvas item has no marker object pointer!") << endmsg;
                /*NOTREACHED*/
        }
@@ -674,7 +674,7 @@ Editor::marker_menu_edit ()
        TempoMarker* tm;
        Marker* marker;
 
-       if ((marker = reinterpret_cast<Marker *> (gtk_object_get_data (GTK_OBJECT(marker_menu_item), "marker"))) == 0) {
+       if ((marker = reinterpret_cast<Marker *> (marker_menu_item->get_data ("marker"))) == 0) {
                fatal << _("programming error: marker canvas item has no marker object pointer!") << endmsg;
                /*NOTREACHED*/
        }
@@ -697,7 +697,7 @@ Editor::marker_menu_remove ()
        TempoMarker* tm;
        Marker* marker;
 
-       if ((marker = reinterpret_cast<Marker *> (gtk_object_get_data (GTK_OBJECT(marker_menu_item), "marker"))) == 0) {
+       if ((marker = reinterpret_cast<Marker *> (marker_menu_item->get_data ("marker"))) == 0) {
                fatal << _("programming error: marker canvas item has no marker object pointer!") << endmsg;
                /*NOTREACHED*/
        }
@@ -716,7 +716,7 @@ Editor::marker_menu_rename ()
 {
        Marker* marker;
 
-       if ((marker = reinterpret_cast<Marker *> (gtk_object_get_data (GTK_OBJECT(marker_menu_item), "marker"))) == 0) {
+       if ((marker = reinterpret_cast<Marker *> (marker_menu_item->get_data ("marker"))) == 0) {
                fatal << _("programming error: marker canvas item has no marker object pointer!") << endmsg;
                /*NOTREACHED*/
        }
@@ -850,8 +850,8 @@ Editor::update_loop_range_view (bool visibility)
                double x1 = frame_to_pixel (tll->start());
                double x2 = frame_to_pixel (tll->end());
                
-               transport_loop_range_rect->set_property ("x1", x1);
-               transport_loop_range_rect->set_property ("x2", x2);
+               transport_loop_range_rect->property_x1() = x1;
+               transport_loop_range_rect->property_x2() = x2;
                
                if (visibility) {
                        transport_loop_range_rect->show();
@@ -876,8 +876,8 @@ Editor::update_punch_range_view (bool visibility)
                double x1 = frame_to_pixel (tpl->start());
                double x2 = frame_to_pixel (tpl->end());
                
-               transport_punch_range_rect->set_property ("x1", x1);
-               transport_punch_range_rect->set_property ("x2", x2);
+               transport_punch_range_rect->property_x1() = x1;
+               transport_punch_range_rect->property_x2() = x2;
                
                if (visibility) {
                        transport_punch_range_rect->show();