diff --git a/gtk2_ardour/add_route_dialog.cc b/gtk2_ardour/add_route_dialog.cc
index b1f84c0fac..7f5da9844a 100644
--- a/gtk2_ardour/add_route_dialog.cc
+++ b/gtk2_ardour/add_route_dialog.cc
@@ -74,22 +74,22 @@ AddRouteDialog::AddRouteDialog ()
 
 	refill_track_modes ();
 
-	track_bus_combo.append_text (_("Audio Tracks"));
-	track_bus_combo.append_text (_("MIDI Tracks"));
-	track_bus_combo.append_text (_("Audio+MIDI Tracks"));
-	track_bus_combo.append_text (_("Audio Busses"));
-	track_bus_combo.append_text (_("MIDI Busses"));
-	track_bus_combo.append_text (_("VCA Masters"));
+	track_bus_combo.append (_("Audio Tracks"));
+	track_bus_combo.append (_("MIDI Tracks"));
+	track_bus_combo.append (_("Audio+MIDI Tracks"));
+	track_bus_combo.append (_("Audio Busses"));
+	track_bus_combo.append (_("MIDI Busses"));
+	track_bus_combo.append (_("VCA Masters"));
 	track_bus_combo.set_active (0);
 
-	insert_at_combo.append_text (_("First"));
-	insert_at_combo.append_text (_("Before Selection"));
-	insert_at_combo.append_text (_("After Selection"));
-	insert_at_combo.append_text (_("Last"));
+	insert_at_combo.append (_("First"));
+	insert_at_combo.append (_("Before Selection"));
+	insert_at_combo.append (_("After Selection"));
+	insert_at_combo.append (_("Last"));
 	insert_at_combo.set_active (3);
 
-	strict_io_combo.append_text (_("Flexible-I/O"));
-	strict_io_combo.append_text (_("Strict-I/O"));
+	strict_io_combo.append (_("Flexible-I/O"));
+	strict_io_combo.append (_("Strict-I/O"));
 	strict_io_combo.set_active (Config->get_strict_io () ? 1 : 0);
 
 	VBox* vbox = manage (new VBox);
@@ -543,7 +543,7 @@ AddRouteDialog::refill_channel_setups ()
 void
 AddRouteDialog::add_route_group (RouteGroup* g)
 {
-	route_group_combo.insert_text (3, g->name ());
+	route_group_combo.insert (3, g->name ());
 }
 
 RouteGroup*
@@ -565,11 +565,11 @@ void
 AddRouteDialog::refill_route_groups ()
 {
 	route_group_combo.clear ();
-	route_group_combo.append_text (_("New Group..."));
+	route_group_combo.append (_("New Group..."));
 
-	route_group_combo.append_text ("separator");
+	route_group_combo.append ("separator");
 
-	route_group_combo.append_text (_("No Group"));
+	route_group_combo.append (_("No Group"));
 
 	if (_session) {
 		_session->foreach_route_group (sigc::mem_fun (*this, &AddRouteDialog::add_route_group));
diff --git a/gtk2_ardour/bundle_manager.cc b/gtk2_ardour/bundle_manager.cc
index 3ae74d3a2c..4bb761a922 100644
--- a/gtk2_ardour/bundle_manager.cc
+++ b/gtk2_ardour/bundle_manager.cc
@@ -203,8 +203,8 @@ BundleEditor::BundleEditor (Session* session, boost::shared_ptr<UserBundle> bund
 	a = new Gtk::Alignment (0, 0.5, 0, 1);
 	a->add (_input_or_output);
 	t->attach (*Gtk::manage (a), 1, 2, 1, 2);
-	_input_or_output.append_text (_("Destination"));
-	_input_or_output.append_text (_("Source"));
+	_input_or_output.append (_("Destination"));
+	_input_or_output.append (_("Source"));
 
 	if (bundle->ports_are_inputs()) {
 		_input_or_output.set_active_text (_("Source"));
diff --git a/gtk2_ardour/duplicate_routes_dialog.cc b/gtk2_ardour/duplicate_routes_dialog.cc
index 1b97599c5b..5b50254997 100644
--- a/gtk2_ardour/duplicate_routes_dialog.cc
+++ b/gtk2_ardour/duplicate_routes_dialog.cc
@@ -50,10 +50,10 @@ DuplicateRouteDialog::DuplicateRouteDialog ()
 	playlist_button_box.pack_start (share_playlists_button, false, false);
 	playlist_button_box.show_all ();
 
-	insert_at_combo.append_text (_("First"));
-	insert_at_combo.append_text (_("Before Selection"));
-	insert_at_combo.append_text (_("After Selection"));
-	insert_at_combo.append_text (_("Last"));
+	insert_at_combo.append (_("First"));
+	insert_at_combo.append (_("Before Selection"));
+	insert_at_combo.append (_("After Selection"));
+	insert_at_combo.append (_("Last"));
 	insert_at_combo.set_active (3);
 
 	Gtk::Label* l = manage (new Label (_("Insert duplicates at: ")));
diff --git a/gtk2_ardour/export_video_dialog.cc b/gtk2_ardour/export_video_dialog.cc
index fba09e9270..e32ec30cee 100644
--- a/gtk2_ardour/export_video_dialog.cc
+++ b/gtk2_ardour/export_video_dialog.cc
@@ -150,7 +150,7 @@ ExportVideoDialog::ExportVideoDialog ()
 	path_hbox->pack_start (*l, false, false, 2);
 	vbox->pack_start (*path_hbox, false, false, 2);
 
-	insnd_combo.append_text (string_compose (_("from the %1 session's start to the session's end"), PROGRAM_NAME));
+	insnd_combo.append (string_compose (_("from the %1 session's start to the session's end"), PROGRAM_NAME));
 	outfn_path_entry.set_width_chars(38);
 
 	l = manage (new Label (_("<b>Settings:</b>"), Gtk::ALIGN_LEFT, Gtk::ALIGN_CENTER, false));
@@ -201,65 +201,65 @@ ExportVideoDialog::ExportVideoDialog ()
 	t->attach (debug_checkbox, 0, 4, ty, ty+1); ty++;
 #endif
 
-	preset_combo.append_text("none");
-	preset_combo.append_text("dvd-mp2");
-	preset_combo.append_text("dvd-NTSC");
-	preset_combo.append_text("dvd-PAL");
-	preset_combo.append_text("flv");
-	preset_combo.append_text("mpeg4");
-	preset_combo.append_text("mp4/h264/aac");
-	preset_combo.append_text("ogg");
-	preset_combo.append_text("webm");
-	preset_combo.append_text("you-tube");
+	preset_combo.append("none");
+	preset_combo.append("dvd-mp2");
+	preset_combo.append("dvd-NTSC");
+	preset_combo.append("dvd-PAL");
+	preset_combo.append("flv");
+	preset_combo.append("mpeg4");
+	preset_combo.append("mp4/h264/aac");
+	preset_combo.append("ogg");
+	preset_combo.append("webm");
+	preset_combo.append("you-tube");
 
-	audio_codec_combo.append_text(_("(default for format)"));
-	audio_codec_combo.append_text("ac3");
-	audio_codec_combo.append_text("aac");
-	audio_codec_combo.append_text("libmp3lame");
-	audio_codec_combo.append_text("libvorbis");
-	audio_codec_combo.append_text("mp2");
-	audio_codec_combo.append_text("pcm_s16le");
+	audio_codec_combo.append(_("(default for format)"));
+	audio_codec_combo.append("ac3");
+	audio_codec_combo.append("aac");
+	audio_codec_combo.append("libmp3lame");
+	audio_codec_combo.append("libvorbis");
+	audio_codec_combo.append("mp2");
+	audio_codec_combo.append("pcm_s16le");
 
-	video_codec_combo.append_text(_("(default for format)"));
-	video_codec_combo.append_text("flv");
-	video_codec_combo.append_text("libtheora");
-	video_codec_combo.append_text("mjpeg");
-	video_codec_combo.append_text("mpeg2video");
-	video_codec_combo.append_text("mpeg4");
-	video_codec_combo.append_text("h264");
-	video_codec_combo.append_text("vpx (webm)");
-	video_codec_combo.append_text("copy");
+	video_codec_combo.append(_("(default for format)"));
+	video_codec_combo.append("flv");
+	video_codec_combo.append("libtheora");
+	video_codec_combo.append("mjpeg");
+	video_codec_combo.append("mpeg2video");
+	video_codec_combo.append("mpeg4");
+	video_codec_combo.append("h264");
+	video_codec_combo.append("vpx (webm)");
+	video_codec_combo.append("copy");
 
-	audio_bitrate_combo.append_text(_("(default)"));
-	audio_bitrate_combo.append_text("64k");
-	audio_bitrate_combo.append_text("128k");
-	audio_bitrate_combo.append_text("192k");
-	audio_bitrate_combo.append_text("256k");
-	audio_bitrate_combo.append_text("320k");
+	audio_bitrate_combo.append(_("(default)"));
+	audio_bitrate_combo.append("64k");
+	audio_bitrate_combo.append("128k");
+	audio_bitrate_combo.append("192k");
+	audio_bitrate_combo.append("256k");
+	audio_bitrate_combo.append("320k");
 
-	audio_samplerate_combo.append_text("22050");
-	audio_samplerate_combo.append_text("44100");
-	audio_samplerate_combo.append_text("48000");
+	audio_samplerate_combo.append("22050");
+	audio_samplerate_combo.append("44100");
+	audio_samplerate_combo.append("48000");
 
-	video_bitrate_combo.append_text(_("(default)"));
-	video_bitrate_combo.append_text(_("(retain)"));
-	video_bitrate_combo.append_text("200k");
-	video_bitrate_combo.append_text("800k");
-	video_bitrate_combo.append_text("2000k");
-	video_bitrate_combo.append_text("5000k");
-	video_bitrate_combo.append_text("8000k");
+	video_bitrate_combo.append(_("(default)"));
+	video_bitrate_combo.append(_("(retain)"));
+	video_bitrate_combo.append("200k");
+	video_bitrate_combo.append("800k");
+	video_bitrate_combo.append("2000k");
+	video_bitrate_combo.append("5000k");
+	video_bitrate_combo.append("8000k");
 
-	fps_combo.append_text("23.976");
-	fps_combo.append_text("24");
-	fps_combo.append_text("24.976");
-	fps_combo.append_text("25");
-	fps_combo.append_text("29.97");
-	fps_combo.append_text("30");
-	fps_combo.append_text("59.94");
-	fps_combo.append_text("60");
+	fps_combo.append("23.976");
+	fps_combo.append("24");
+	fps_combo.append("24.976");
+	fps_combo.append("25");
+	fps_combo.append("29.97");
+	fps_combo.append("30");
+	fps_combo.append("59.94");
+	fps_combo.append("60");
 
-	aspect_combo.append_text("4:3");
-	aspect_combo.append_text("16:9");
+	aspect_combo.append("4:3");
+	aspect_combo.append("16:9");
 
 	vbox->pack_start (*options_box, false, true, 4);
 	get_vbox()->set_spacing (4);
@@ -332,12 +332,12 @@ ExportVideoDialog::apply_state (TimeSelection &tme, bool range)
 	// TODO remember setting for export-range.. somehow, (let explicit range override)
 	frameoffset_t av_offset = ARDOUR_UI::instance()->video_timeline->get_offset();
 	if (av_offset < 0 ) {
-		insnd_combo.append_text (_("from 00:00:00:00 to the video's end"));
+		insnd_combo.append (_("from 00:00:00:00 to the video's end"));
 	} else {
-		insnd_combo.append_text (_("from the video's start to the video's end"));
+		insnd_combo.append (_("from the video's start to the video's end"));
 	}
 	if (!export_range.empty()) {
-		insnd_combo.append_text (_("Selected range"));  // TODO show export_range.start() -> export_range.end_frame()
+		insnd_combo.append (_("Selected range"));  // TODO show export_range.start() -> export_range.end_frame()
 	}
 	if (range) {
 		insnd_combo.set_active(2);
diff --git a/gtk2_ardour/insert_remove_time_dialog.cc b/gtk2_ardour/insert_remove_time_dialog.cc
index f58bfdbaea..3db60f2031 100644
--- a/gtk2_ardour/insert_remove_time_dialog.cc
+++ b/gtk2_ardour/insert_remove_time_dialog.cc
@@ -87,9 +87,9 @@ InsertRemoveTimeDialog::InsertRemoveTimeDialog (PublicEditor& e, bool remove)
 		Label* intersected_label = manage (new Label (_("Intersected regions should:")));
 		intersected_label->set_alignment (1, 0.5);
 		table->attach (*intersected_label, 0, 1, 2, 3, FILL | EXPAND);
-		_intersected_combo.append_text (_("stay in position"));
-		_intersected_combo.append_text (_("move"));
-		_intersected_combo.append_text (_("be split"));
+		_intersected_combo.append (_("stay in position"));
+		_intersected_combo.append (_("move"));
+		_intersected_combo.append (_("be split"));
 		_intersected_combo.set_active (0);
 		table->attach (_intersected_combo, 1, 2, 2, 3);
 	}
diff --git a/gtk2_ardour/midi_tracer.cc b/gtk2_ardour/midi_tracer.cc
index 2f97e5b6d5..ccf9600987 100644
--- a/gtk2_ardour/midi_tracer.cc
+++ b/gtk2_ardour/midi_tracer.cc
@@ -141,7 +141,7 @@ MidiTracer::ports_changed ()
 	}
 
 	for (ARDOUR::PortManager::PortList::const_iterator i = pl.begin(); i != pl.end(); ++i) {
-		_port_combo.append_text ((*i)->name());
+		_port_combo.append ((*i)->name());
 	}
 
 	if (c.empty()) {
diff --git a/gtk2_ardour/option_editor.cc b/gtk2_ardour/option_editor.cc
index 64c867970e..6907b38911 100644
--- a/gtk2_ardour/option_editor.cc
+++ b/gtk2_ardour/option_editor.cc
@@ -299,9 +299,9 @@ BoolComboOption::BoolComboOption (
 	_combo = manage (new ComboBoxText);
 
 	/* option 0 is the false option */
-	_combo->append_text (f);
+	_combo->append (f);
 	/* and option 1 is the true */
-	_combo->append_text (t);
+	_combo->append (t);
 
 	_combo->signal_changed().connect (sigc::mem_fun (*this, &BoolComboOption::changed));
 }
diff --git a/gtk2_ardour/option_editor.h b/gtk2_ardour/option_editor.h
index b5d44d577c..379eb78a4b 100644
--- a/gtk2_ardour/option_editor.h
+++ b/gtk2_ardour/option_editor.h
@@ -320,11 +320,11 @@ public:
 	 */
 	void add (T e, std::string const & o) {
 		_options.push_back (e);
-		_combo->append_text (o);
+		_combo->append (o);
 	}
 
 	void clear () {
-		_combo->clear_items();
+		_combo->remove_all ();
 		_options.clear ();
 	}
 
@@ -464,14 +464,14 @@ public:
 	 *  @param strings a vector of allowed strings
 	 */
         void set_popdown_strings (const std::vector<std::string>& strings) {
-		_combo->clear_items ();
+		_combo->remove_all ();
 		for (std::vector<std::string>::const_iterator i = strings.begin(); i != strings.end(); ++i) {
-			_combo->append_text (*i);
+			_combo->append (*i);
 		}
 	}
 
 	void clear () {
-		_combo->clear_items();
+		_combo->remove_all ();
 	}
 
 	void changed () {
diff --git a/gtk2_ardour/patch_change_dialog.cc b/gtk2_ardour/patch_change_dialog.cc
index 9bb339fdd4..58d3fcf9af 100644
--- a/gtk2_ardour/patch_change_dialog.cc
+++ b/gtk2_ardour/patch_change_dialog.cc
@@ -171,7 +171,7 @@ PatchChangeDialog::fill_bank_combo ()
 	for (MIDI::Name::ChannelNameSet::PatchBanks::const_iterator i = cns->patch_banks().begin(); i != cns->patch_banks().end(); ++i) {
 		string n = (*i)->name ();
 		boost::replace_all (n, "_", " ");
-		_bank_combo.append_text (n);
+		_bank_combo.append (n);
 	}
 }
 
@@ -260,7 +260,7 @@ PatchChangeDialog::fill_patch_combo ()
 	for (MIDI::Name::PatchNameList::const_iterator j = patches.begin(); j != patches.end(); ++j) {
 		string n = (*j)->name ();
 		boost::replace_all (n, "_", " ");
-		_patch_combo.append_text (n);
+		_patch_combo.append (n);
 	}
 }
 
diff --git a/gtk2_ardour/region_editor.cc b/gtk2_ardour/region_editor.cc
index 596f6009aa..b4cca10c0a 100644
--- a/gtk2_ardour/region_editor.cc
+++ b/gtk2_ardour/region_editor.cc
@@ -168,7 +168,7 @@ RegionEditor::RegionEditor (Session* s, boost::shared_ptr<Region> r)
 	set_title (string_compose (_("Region '%1'"), _region->name()));
 
 	for (uint32_t i = 0; i < _region->n_channels(); ++i) {
-		_sources.append_text (_region->source(i)->name());
+		_sources.append (_region->source(i)->name());
 	}
 
 	_sources.set_headers_visible (false);
diff --git a/gtk2_ardour/session_archive_dialog.cc b/gtk2_ardour/session_archive_dialog.cc
index 15bdbc8165..6ca78d5e08 100644
--- a/gtk2_ardour/session_archive_dialog.cc
+++ b/gtk2_ardour/session_archive_dialog.cc
@@ -42,12 +42,12 @@ SessionArchiveDialog::SessionArchiveDialog ()
 	HBox* hbox;
 	Label* label;
 
-	format_selector.append_text (".tar.xz");
+	format_selector.append (".tar.xz");
 	format_selector.set_active_text (".tar.xz");
 
-	encode_selector.append_text (_("None"));
-	encode_selector.append_text (_("FLAC 16bit"));
-	encode_selector.append_text (_("FLAC 24bit"));
+	encode_selector.append (_("None"));
+	encode_selector.append (_("FLAC 16bit"));
+	encode_selector.append (_("FLAC 24bit"));
 	encode_selector.set_active_text ("FLAC 16bit"); // TODO remember
 
 	hbox = manage (new HBox);
diff --git a/gtk2_ardour/sfdb_ui.cc b/gtk2_ardour/sfdb_ui.cc
index b2f96ed8a6..4fd30b861c 100644
--- a/gtk2_ardour/sfdb_ui.cc
+++ b/gtk2_ardour/sfdb_ui.cc
@@ -672,19 +672,19 @@ SoundFileBrowser::SoundFileBrowser (string title, ARDOUR::Session* s, bool persi
 	label->set_text (_("Sort:"));
 	passbox->pack_start (*label, false, false);
 	passbox->pack_start (freesound_sort, false, false);
-	freesound_sort.clear_items();
+	freesound_sort.remove_all ();
 
 	// Order of the following must correspond with enum sortMethod
 	// in sfdb_freesound_mootcher.h
-	freesound_sort.append_text(_("None"));
-	freesound_sort.append_text(_("Longest"));
-	freesound_sort.append_text(_("Shortest"));
-	freesound_sort.append_text(_("Newest"));
-	freesound_sort.append_text(_("Oldest"));
-	freesound_sort.append_text(_("Most downloaded"));
-	freesound_sort.append_text(_("Least downloaded"));
-	freesound_sort.append_text(_("Highest rated"));
-	freesound_sort.append_text(_("Lowest rated"));
+	freesound_sort.append(_("None"));
+	freesound_sort.append(_("Longest"));
+	freesound_sort.append(_("Shortest"));
+	freesound_sort.append(_("Newest"));
+	freesound_sort.append(_("Oldest"));
+	freesound_sort.append(_("Most downloaded"));
+	freesound_sort.append(_("Least downloaded"));
+	freesound_sort.append(_("Highest rated"));
+	freesound_sort.append(_("Lowest rated"));
 	freesound_sort.set_active(0);
 
 	passbox->pack_start (freesound_search_btn, false, false);
diff --git a/gtk2_ardour/transcode_video_dialog.cc b/gtk2_ardour/transcode_video_dialog.cc
index 50e4740cc0..f5ae7f20c3 100644
--- a/gtk2_ardour/transcode_video_dialog.cc
+++ b/gtk2_ardour/transcode_video_dialog.cc
@@ -181,11 +181,11 @@ TranscodeVideoDialog::TranscodeVideoDialog (Session* s, std::string infile)
 	options_box->pack_start (*l, false, true, 4);
 
 	if (ffok) {
-		video_combo.append_text(_("Reference from Current Location (Previously Transcoded Files Only)"));
-		video_combo.append_text(_("Import/Transcode Video to Session"));
+		video_combo.append(_("Reference from Current Location (Previously Transcoded Files Only)"));
+		video_combo.append(_("Import/Transcode Video to Session"));
 		video_combo.set_active(1);
 		if (as.size() > 0) {
-			video_combo.append_text(_("Do Not Import Video (Audio Import Only)"));
+			video_combo.append(_("Do Not Import Video (Audio Import Only)"));
 			audio_combo.set_sensitive(true);
 		} else {
 			audio_combo.set_sensitive(false);
@@ -195,7 +195,7 @@ TranscodeVideoDialog::TranscodeVideoDialog (Session* s, std::string infile)
 		path_entry.set_sensitive (true);
 		browse_button.set_sensitive (true);
 	} else if (as.size() > 0) {
-		video_combo.append_text(_("Do Not Import Video (Audio Import Only)"));
+		video_combo.append(_("Do Not Import Video (Audio Import Only)"));
 		video_combo.set_active(0);
 		path_entry.set_text ("");
 
@@ -205,7 +205,7 @@ TranscodeVideoDialog::TranscodeVideoDialog (Session* s, std::string infile)
 		path_entry.set_sensitive (false);
 		browse_button.set_sensitive (false);
 	} else {
-		video_combo.append_text(_("Do Not Import Video"));
+		video_combo.append(_("Do Not Import Video"));
 		video_combo.set_active(0);
 		path_entry.set_text ("");
 		video_combo.set_sensitive(false);
@@ -227,18 +227,18 @@ TranscodeVideoDialog::TranscodeVideoDialog (Session* s, std::string infile)
 	t->attach (aspect_checkbox, 2, 3, 0, 1);
 	t->attach (height_spinner, 3, 4, 0, 1);
 
-	scale_combo.append_text(_("Original Width"));
-	if (w > 1920) { scale_combo.append_text("1920 (hd1080)"); }
-	if (w > 1408) { scale_combo.append_text("1408 (16cif)"); }
-	if (w > 1280) { scale_combo.append_text("1280 (sxga, hd720)"); }
-	if (w > 1024) { scale_combo.append_text("1024 (xga)"); }
-	if (w > 852)  { scale_combo.append_text(" 852 (hd480)"); }
-	if (w > 768)  { scale_combo.append_text(" 768 (PAL)"); }
-	if (w > 720)  { scale_combo.append_text(" 720 (PAL)"); }
-	if (w > 640)  { scale_combo.append_text(" 640 (vga, ega)"); }
-	if (w > 352)  { scale_combo.append_text(" 352 (cif)"); }
-	if (w > 320)  { scale_combo.append_text(" 320 (cga, qvga)"); }
-	if (w > 176)  { scale_combo.append_text(" 176 (qcif)"); }
+	scale_combo.append(_("Original Width"));
+	if (w > 1920) { scale_combo.append("1920 (hd1080)"); }
+	if (w > 1408) { scale_combo.append("1408 (16cif)"); }
+	if (w > 1280) { scale_combo.append("1280 (sxga, hd720)"); }
+	if (w > 1024) { scale_combo.append("1024 (xga)"); }
+	if (w > 852)  { scale_combo.append(" 852 (hd480)"); }
+	if (w > 768)  { scale_combo.append(" 768 (PAL)"); }
+	if (w > 720)  { scale_combo.append(" 720 (PAL)"); }
+	if (w > 640)  { scale_combo.append(" 640 (vga, ega)"); }
+	if (w > 352)  { scale_combo.append(" 352 (cif)"); }
+	if (w > 320)  { scale_combo.append(" 320 (cga, qvga)"); }
+	if (w > 176)  { scale_combo.append(" 176 (qcif)"); }
 	scale_combo.set_active(0);
 	height_spinner.set_value(h);
 
@@ -252,12 +252,12 @@ TranscodeVideoDialog::TranscodeVideoDialog (Session* s, std::string infile)
 	t->attach (audio_combo, 1, 4, 2, 3);
 	t->attach (ltc_detect, 1, 4, 3, 4);
 	if (as.size() == 0) {
-		audio_combo.append_text(_("No Audio Track Present"));
+		audio_combo.append(_("No Audio Track Present"));
 		audio_combo.set_sensitive(false);
 	} else {
-		audio_combo.append_text(_("Do Not Extract Audio"));
+		audio_combo.append(_("Do Not Extract Audio"));
 		for (TranscodeFfmpeg::FFAudioStreams::iterator it = as.begin(); it < as.end(); ++it) {
-			audio_combo.append_text((*it).name);
+			audio_combo.append((*it).name);
 		}
 	}
 	audio_combo.set_active(0);
diff --git a/gtk2_ardour/video_server_dialog.cc b/gtk2_ardour/video_server_dialog.cc
index 29872fc975..449c43fc1a 100644
--- a/gtk2_ardour/video_server_dialog.cc
+++ b/gtk2_ardour/video_server_dialog.cc
@@ -80,9 +80,9 @@ VideoServerDialog::VideoServerDialog (Session* s)
 
 #ifndef __APPLE__
 	/* Note: on OSX icsd is not able to bind to IPv4 localhost */
-	listenaddr_combo.append_text("127.0.0.1");
+	listenaddr_combo.append("127.0.0.1");
 #endif
-	listenaddr_combo.append_text("0.0.0.0");
+	listenaddr_combo.append("0.0.0.0");
 	listenaddr_combo.set_active(0);
 
 	std::string harvid_exe;