Use non-deprecated Gtk::Widget::get_mapped API in gtk2_ardour

This commit is contained in:
Tim Mayberry 2015-02-27 22:27:46 +10:00
parent fa6777f7ce
commit 79e7d9d7a8
11 changed files with 16 additions and 16 deletions

View File

@ -4806,7 +4806,7 @@ ARDOUR_UI::cancel_plugin_timeout ()
void
ARDOUR_UI::plugin_scan_timeout (int timeout)
{
if (!scan_dlg || !scan_dlg->is_mapped() || !scan_pbar) {
if (!scan_dlg || !scan_dlg->get_mapped() || !scan_pbar) {
return;
}
if (timeout > 0) {
@ -4824,13 +4824,13 @@ ARDOUR_UI::plugin_scan_timeout (int timeout)
void
ARDOUR_UI::plugin_scan_dialog (std::string type, std::string plugin, bool can_cancel)
{
if (type == X_("closeme") && !(scan_dlg && scan_dlg->is_mapped())) {
if (type == X_("closeme") && !(scan_dlg && scan_dlg->get_mapped())) {
return;
}
const bool cancelled = PluginManager::instance().cancelled();
if (type != X_("closeme") && (!UIConfiguration::instance().get_show_plugin_scan_window()) && !_initial_verbose_plugin_scan) {
if (cancelled && scan_dlg->is_mapped()) {
if (cancelled && scan_dlg->get_mapped()) {
scan_dlg->hide();
gui_idle_handler();
return;

View File

@ -357,7 +357,7 @@ ARDOUR_UI::toggle_editor_and_mixer ()
if (!mwin) {
/* mixer's own window doesn't exist */
mixer->make_visible ();
} else if (!mwin->is_mapped ()) {
} else if (!mwin->get_mapped ()) {
/* mixer's own window exists but isn't mapped */
mixer->make_visible ();
} else {
@ -381,7 +381,7 @@ ARDOUR_UI::toggle_editor_and_mixer ()
if (!ewin) {
/* mixer's own window doesn't exist */
editor->make_visible ();
} else if (!ewin->is_mapped ()) {
} else if (!ewin->get_mapped ()) {
/* editor's own window exists but isn't mapped */
editor->make_visible ();
} else {

View File

@ -1165,7 +1165,7 @@ Editor::generic_event_handler (GdkEvent* ev)
case GDK_MOTION_NOTIFY:
case GDK_KEY_PRESS:
case GDK_KEY_RELEASE:
if (contents().is_mapped()) {
if (contents().get_mapped()) {
gettimeofday (&last_event_time, 0);
}
break;
@ -5652,7 +5652,7 @@ Editor::super_rapid_screen_update ()
/* METERING / MIXER STRIPS */
/* update track meters, if required */
if (contents().is_mapped() && meters_running) {
if (contents().get_mapped() && meters_running) {
RouteTimeAxisView* rtv;
for (TrackViewList::iterator i = track_views.begin(); i != track_views.end(); ++i) {
if ((rtv = dynamic_cast<RouteTimeAxisView*>(*i)) != 0) {

View File

@ -39,7 +39,7 @@ Editor::start_updating_meters ()
{
RouteTimeAxisView* rtv;
if (contents().is_mapped() && _session) {
if (contents().get_mapped() && _session) {
for (TrackViewList::iterator i = track_views.begin(); i != track_views.end(); ++i) {
if ((rtv = dynamic_cast<RouteTimeAxisView*>(*i)) != 0) {
rtv->reset_meter ();
@ -57,7 +57,7 @@ Editor::stop_updating_meters ()
meters_running = false;
if (contents().is_mapped() && _session) {
if (contents().get_mapped() && _session) {
for (TrackViewList::iterator i = track_views.begin(); i != track_views.end(); ++i) {
if ((rtv = dynamic_cast<RouteTimeAxisView*>(*i)) != 0) {
rtv->hide_meter ();

View File

@ -5410,7 +5410,7 @@ Editor::quantize_regions (const RegionSelection& rs)
quantize_dialog = new QuantizeDialog (*this);
}
if (quantize_dialog->is_mapped()) {
if (quantize_dialog->get_mapped()) {
/* in progress already */
return;
}

View File

@ -1081,7 +1081,7 @@ LocationUI::refresh_location_list ()
using namespace Box_Helpers;
// this is just too expensive to do when window is not shown
if (!is_mapped()) {
if (!get_mapped()) {
return;
}

View File

@ -580,7 +580,7 @@ Meterbridge::stop_updating ()
void
Meterbridge::fast_update_strips ()
{
if (!is_mapped () || !_session) {
if (!get_mapped () || !_session) {
return;
}
for (list<MeterBridgeStrip>::iterator i = strips.begin(); i != strips.end(); ++i) {

View File

@ -1115,7 +1115,7 @@ Mixer_UI::stop_updating ()
void
Mixer_UI::fast_update_strips ()
{
if (_content.is_mapped () && _session) {
if (_content.get_mapped () && _session) {
for (list<MixerStrip *>::iterator i = strips.begin(); i != strips.end(); ++i) {
(*i)->fast_update ();
}

View File

@ -121,7 +121,7 @@ SendUI::update ()
void
SendUI::fast_update ()
{
if (!is_mapped()) {
if (!get_mapped()) {
return;
}

View File

@ -878,7 +878,7 @@ SoundFileBrowser::stop_metering ()
void
SoundFileBrowser::meter ()
{
if (is_mapped () && _session && gm) {
if (get_mapped () && _session && gm) {
gm->update_meters ();
}
}

View File

@ -206,7 +206,7 @@ Splash::idle_after_expose ()
void
Splash::display ()
{
bool was_mapped = is_mapped ();
bool was_mapped = get_mapped ();
if (!was_mapped) {
expose_done = false;