diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2021-01-26 11:24:13 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2021-01-27 10:22:18 +0100 |
| commit | 3aa8656dcee396384dc540fb7785a4f5455ac3e6 (patch) | |
| tree | c268aa464a25348a66be8dd10a46e1153d0a410a /avmedia/source | |
| parent | df788fcc308bbf8950ad8a22a1f8290681b64f0d (diff) | |
rename Toolkit::Gtk3 to Toolkit::Gtk because Gtk2 support is gone
so the need to distinguish no longer exists
Change-Id: I4c11ddffbfa77f04497c454358c1c707ecf1d162
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109942
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'avmedia/source')
| -rw-r--r-- | avmedia/source/gstreamer/gstplayer.cxx | 4 | ||||
| -rw-r--r-- | avmedia/source/viewer/mediawindow_impl.cxx | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/avmedia/source/gstreamer/gstplayer.cxx b/avmedia/source/gstreamer/gstplayer.cxx index c15bd1adf6ea..cab9f4649b6a 100644 --- a/avmedia/source/gstreamer/gstplayer.cxx +++ b/avmedia/source/gstreamer/gstplayer.cxx @@ -850,7 +850,7 @@ uno::Reference< ::media::XPlayerWindow > SAL_CALL Player::createPlayerWindow( co // tdf#124027: the position of embedded window is identical w/ the position // of media object in all other vclplugs (kf5, gen), in gtk3 w/o gtksink it // needs to be translated - if (pEnvData->toolkit == SystemEnvData::Toolkit::Gtk3) + if (pEnvData->toolkit == SystemEnvData::Toolkit::Gtk) { Point aPoint = pParentWindow->GetPosPixel(); maArea.X = aPoint.getX(); @@ -862,7 +862,7 @@ uno::Reference< ::media::XPlayerWindow > SAL_CALL Player::createPlayerWindow( co GstElement *pVideosink = static_cast<GstElement*>(pParentWindow->CreateGStreamerSink()); if (pVideosink) { - if (pEnvData->toolkit == SystemEnvData::Toolkit::Gtk3) + if (pEnvData->toolkit == SystemEnvData::Toolkit::Gtk) mbUseGtkSink = true; } else diff --git a/avmedia/source/viewer/mediawindow_impl.cxx b/avmedia/source/viewer/mediawindow_impl.cxx index 316263c9a7b2..ea15b6413e2a 100644 --- a/avmedia/source/viewer/mediawindow_impl.cxx +++ b/avmedia/source/viewer/mediawindow_impl.cxx @@ -424,7 +424,7 @@ void MediaWindowImpl::onURLChanged() sal_IntPtr nParentWindowHandle(0); const SystemEnvData* pEnvData = mpChildWindow->GetSystemData(); // tdf#139609 gtk doesn't need the handle, and fetching it is undesirable - if (!pEnvData || pEnvData->toolkit != SystemEnvData::Toolkit::Gtk3) + if (!pEnvData || pEnvData->toolkit != SystemEnvData::Toolkit::Gtk) nParentWindowHandle = mpChildWindow->GetParentWindowHandle(); aArgs[0] <<= nParentWindowHandle; aArgs[1] <<= awt::Rectangle(aPoint.X(), aPoint.Y(), aSize.Width(), aSize.Height()); |