avmedia/source/gstreamer/gstplayer.cxx | 4 ++--
avmedia/source/viewer/mediawindow_impl.cxx | 2 +-
include/vcl/sysdata.hxx | 2 +-
slideshow/source/engine/shapes/viewmediashape.cxx | 2 +-
vcl/unx/gtk3/gtk3gtkframe.cxx | 2 +-
vcl/unx/gtk3/gtk3gtkobject.cxx | 2 +-
6 files changed, 7 insertions(+), 7 deletions(-)
New commits:
commit 3aa8656dcee396384dc540fb7785a4f5455ac3e6
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Tue Jan 26 11:24:13 2021 +0000
Commit: Caolán McNamara <caol...@redhat.com>
CommitDate: Wed Jan 27 10:22:18 2021 +0100
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 <caol...@redhat.com>
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());
diff --git a/include/vcl/sysdata.hxx b/include/vcl/sysdata.hxx
index 63b7c810de3d..85babeaa2f1c 100644
--- a/include/vcl/sysdata.hxx
+++ b/include/vcl/sysdata.hxx
@@ -50,7 +50,7 @@ typedef struct CGContext *CGContextRef;
struct VCL_DLLPUBLIC SystemEnvData
{
- enum class Toolkit { Gen, Gtk3, Qt5 };
+ enum class Toolkit { Gen, Gtk, Qt5 };
Toolkit toolkit; // the toolkit in use
#if defined(_WIN32)
HWND hWnd; // the window hwnd
diff --git a/slideshow/source/engine/shapes/viewmediashape.cxx
b/slideshow/source/engine/shapes/viewmediashape.cxx
index fdcfde36aa8f..29c6405b8725 100644
--- a/slideshow/source/engine/shapes/viewmediashape.cxx
+++ b/slideshow/source/engine/shapes/viewmediashape.cxx
@@ -436,7 +436,7 @@ namespace slideshow::internal
sal_IntPtr nParentWindowHandle(0);
const SystemEnvData* pEnvData =
mpMediaWindow->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 =
mpMediaWindow->GetParentWindowHandle();
aArgs[ 0 ] <<= nParentWindowHandle;
diff --git a/vcl/unx/gtk3/gtk3gtkframe.cxx b/vcl/unx/gtk3/gtk3gtkframe.cxx
index 7d40fd5a241b..4243763a3158 100644
--- a/vcl/unx/gtk3/gtk3gtkframe.cxx
+++ b/vcl/unx/gtk3/gtk3gtkframe.cxx
@@ -955,7 +955,7 @@ void GtkSalFrame::InitCommon()
m_aSystemData.pSalFrame = this;
m_aSystemData.pWidget = m_pWindow;
m_aSystemData.nScreen = m_nXScreen.getXScreen();
- m_aSystemData.toolkit = SystemEnvData::Toolkit::Gtk3;
+ m_aSystemData.toolkit = SystemEnvData::Toolkit::Gtk;
#if defined(GDK_WINDOWING_X11)
GdkDisplay *pDisplay = getGdkDisplay();
diff --git a/vcl/unx/gtk3/gtk3gtkobject.cxx b/vcl/unx/gtk3/gtk3gtkobject.cxx
index 5dc67655568b..d9de95926611 100644
--- a/vcl/unx/gtk3/gtk3gtkobject.cxx
+++ b/vcl/unx/gtk3/gtk3gtkobject.cxx
@@ -71,7 +71,7 @@ void GtkSalObjectBase::Init()
m_aSystemData.pSalFrame = nullptr;
m_aSystemData.pWidget = m_pSocket;
m_aSystemData.nScreen = m_pParent->getXScreenNumber().getXScreen();
- m_aSystemData.toolkit = SystemEnvData::Toolkit::Gtk3;
+ m_aSystemData.toolkit = SystemEnvData::Toolkit::Gtk;
GdkScreen* pScreen = gtk_widget_get_screen(m_pParent->getWindow());
GdkVisual* pVisual = gdk_screen_get_system_visual(pScreen);
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
