rename all GTK signals

[ardour.git] / gtk2_ardour / export_dialog.cc

diff --git a/gtk2_ardour/export_dialog.cc b/gtk2_ardour/export_dialog.cc
index 1dbe5822466e12841d9a2a32bc9ab696bd29c328..8a3c996b31465e9cbf72e1079ee8875f8680a754 100644 (file)
--- a/gtk2_ardour/export_dialog.cc
+++ b/gtk2_ardour/export_dialog.cc
@@ -141,8 +141,8 @@ ExportDialog::ExportDialog(PublicEditor& e, AudioRegion* r)
        file_selector = 0;
        spec.running = false;
 
-       file_entry.signal_focus_in_event().connect (ptr_fun (ARDOUR_UI::generic_focus_in_event));
-       file_entry.signal_focus_out_event().connect (ptr_fun (ARDOUR_UI::generic_focus_out_event));
+       file_entry.signal_signal_focus_in_event().connect (ptr_fun (ARDOUR_UI::generic_focus_in_event));
+       file_entry.signal_signal_focus_out_event().connect (ptr_fun (ARDOUR_UI::generic_focus_out_event));
 
        file_entry.set_name ("ExportFileNameEntry");
 
@@ -156,7 +156,7 @@ ExportDialog::ExportDialog(PublicEditor& e, AudioRegion* r)
        master_selector.set_column_title (0, _("Output"));
        master_selector.column_titles_show ();
        master_selector.set_selection_mode (GTK_SELECTION_MULTIPLE);
-       master_selector.button_press_event.connect (mem_fun(*this, &ExportDialog::master_selector_button_press_event));
+       master_selector.signal_button_press_event.connect (mem_fun(*this, &ExportDialog::master_selector_button_press_event));
        
        track_selector.set_name ("ExportTrackSelector");
        track_selector.set_size_request (-1, 130);
@@ -168,7 +168,7 @@ ExportDialog::ExportDialog(PublicEditor& e, AudioRegion* r)
        track_selector.set_column_title (0, _("Track"));
        track_selector.column_titles_show ();
        track_selector.set_selection_mode (GTK_SELECTION_MULTIPLE);
-       track_selector.button_press_event.connect (mem_fun(*this, &ExportDialog::track_selector_button_press_event));
+       track_selector.signal_button_press_event.connect (mem_fun(*this, &ExportDialog::track_selector_button_press_event));
 
        check_pixmap = gdk_pixmap_colormap_create_from_xpm_d (NULL,
                        gtk_widget_get_colormap(GTK_WIDGET(track_selector.gobj())),
@@ -385,11 +385,11 @@ ExportDialog::ExportDialog(PublicEditor& e, AudioRegion* r)
        file_browse_button.set_name ("EditorGTKButton");
        file_browse_button.signal_clicked().connect (mem_fun(*this, &ExportDialog::initiate_browse));
 
-       channel_count_combo.get_popwin()->unmap_event.connect (mem_fun(*this, &ExportDialog::channels_chosen));
-       bitdepth_format_combo.get_popwin()->unmap_event.connect (mem_fun(*this, &ExportDialog::bitdepth_chosen));
-       header_format_combo.get_popwin()->unmap_event.connect (mem_fun(*this, &ExportDialog::header_chosen));
-       sample_rate_combo.get_popwin()->unmap_event.connect (mem_fun(*this, &ExportDialog::sample_rate_chosen));
-       cue_file_combo.get_popwin()->unmap_event.connect (mem_fun(*this, &ExportDialog::cue_file_type_chosen));
+       channel_count_combo.get_popwin()->signal_unmap_event.connect (mem_fun(*this, &ExportDialog::channels_chosen));
+       bitdepth_format_combo.get_popwin()->signal_unmap_event.connect (mem_fun(*this, &ExportDialog::bitdepth_chosen));
+       header_format_combo.get_popwin()->signal_unmap_event.connect (mem_fun(*this, &ExportDialog::header_chosen));
+       sample_rate_combo.get_popwin()->signal_unmap_event.connect (mem_fun(*this, &ExportDialog::sample_rate_chosen));
+       cue_file_combo.get_popwin()->signal_unmap_event.connect (mem_fun(*this, &ExportDialog::cue_file_type_chosen));
 }
 
 ExportDialog::~ExportDialog()
@@ -1352,8 +1352,8 @@ ExportDialog::initiate_browse ()
 
                file_selector->get_cancel_button()-.signal_clicked().connect (bind (mem_fun(*this, &ExportDialog::finish_browse), -1));
                file_selector->get_ok_button()-.signal_clicked().connect (bind (mem_fun(*this, &ExportDialog::finish_browse), 1));
-               file_selector->map_event.connect (bind (mem_fun(*this, &ExportDialog::change_focus_policy), true));
-               file_selector->unmap_event.connect (bind (mem_fun(*this, &ExportDialog::change_focus_policy), false));
+               file_selector->signal_map_event.connect (bind (mem_fun(*this, &ExportDialog::change_focus_policy), true));
+               file_selector->signal_unmap_event.connect (bind (mem_fun(*this, &ExportDialog::change_focus_policy), false));
        }
        file_selector->show_all ();
 }