diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2016-02-16 16:01:02 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2016-02-16 16:03:28 +0000 |
| commit | 8543fbc72fafc0d71a8760752ca2ef5b7119cb5c (patch) | |
| tree | a50ab0c2173667ae6a07ca31f557955208929c53 /vcl | |
| parent | 3cdb86054c09617cea85dfc24ecbaf9cba376d7b (diff) | |
gtk3+wayland: play video via gtksink gstreamer element
Change-Id: Ib371fa06eda73962cbe94739e69a68b46c26e4bf
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/unx/gtk/gtkobject.cxx | 1 | ||||
| -rw-r--r-- | vcl/unx/gtk/gtksalframe.cxx | 1 | ||||
| -rw-r--r-- | vcl/unx/gtk3/gtk3gtkframe.cxx | 1 | ||||
| -rw-r--r-- | vcl/unx/gtk3/gtk3gtkobject.cxx | 7 |
4 files changed, 5 insertions, 5 deletions
diff --git a/vcl/unx/gtk/gtkobject.cxx b/vcl/unx/gtk/gtkobject.cxx index a015c013a5c3..32a41d05c7cc 100644 --- a/vcl/unx/gtk/gtkobject.cxx +++ b/vcl/unx/gtk/gtkobject.cxx @@ -63,6 +63,7 @@ GtkSalObject::GtkSalObject( GtkSalFrame* pParent, bool bShow ) m_aSystemData.nScreen = pParent->getXScreenNumber().getXScreen(); m_aSystemData.pAppContext = nullptr; m_aSystemData.pShellWidget = GTK_WIDGET(pParent->getWindow()); + m_aSystemData.pToolkit = "gtk2"; g_signal_connect( G_OBJECT(m_pSocket), "button-press-event", G_CALLBACK(signalButton), this ); g_signal_connect( G_OBJECT(m_pSocket), "button-release-event", G_CALLBACK(signalButton), this ); diff --git a/vcl/unx/gtk/gtksalframe.cxx b/vcl/unx/gtk/gtksalframe.cxx index c164bcd99e19..435b28b000ed 100644 --- a/vcl/unx/gtk/gtksalframe.cxx +++ b/vcl/unx/gtk/gtksalframe.cxx @@ -1027,6 +1027,7 @@ void GtkSalFrame::InitCommon() m_aSystemData.nScreen = m_nXScreen.getXScreen(); m_aSystemData.pAppContext = nullptr; m_aSystemData.pShellWidget = m_aSystemData.pWidget; + m_aSystemData.pToolkit = "gtk2"; m_bGraphics = false; m_pGraphics = nullptr; diff --git a/vcl/unx/gtk3/gtk3gtkframe.cxx b/vcl/unx/gtk3/gtk3gtkframe.cxx index a391edc11043..b8fe861b09a1 100644 --- a/vcl/unx/gtk3/gtk3gtkframe.cxx +++ b/vcl/unx/gtk3/gtk3gtkframe.cxx @@ -1096,6 +1096,7 @@ void GtkSalFrame::InitCommon() m_aSystemData.nScreen = m_nXScreen.getXScreen(); m_aSystemData.pAppContext = nullptr; m_aSystemData.pShellWidget = m_aSystemData.pWidget; + m_aSystemData.pToolkit = "gtk3"; m_bGraphics = false; m_pGraphics = nullptr; diff --git a/vcl/unx/gtk3/gtk3gtkobject.cxx b/vcl/unx/gtk3/gtk3gtkobject.cxx index 062b07f60247..72d157a0a5e1 100644 --- a/vcl/unx/gtk3/gtk3gtkobject.cxx +++ b/vcl/unx/gtk3/gtk3gtkobject.cxx @@ -36,7 +36,7 @@ GtkSalObject::GtkSalObject( GtkSalFrame* pParent, bool bShow ) if( pParent ) { // our plug window - m_pSocket = gtk_drawing_area_new(); + m_pSocket = gtk_grid_new(); Show( bShow ); // insert into container gtk_fixed_put( pParent->getFixedContainer(), @@ -45,10 +45,6 @@ GtkSalObject::GtkSalObject( GtkSalFrame* pParent, bool bShow ) // realize so we can get a window id gtk_widget_realize( m_pSocket ); - // make it transparent; some plugins may not insert - // their own window here but use the socket window itself - gtk_widget_set_app_paintable( m_pSocket, TRUE ); - // system data m_aSystemData.nSize = sizeof( SystemEnvData ); m_aSystemData.aWindow = pParent->GetNativeWindowHandle(m_pSocket); @@ -58,6 +54,7 @@ GtkSalObject::GtkSalObject( GtkSalFrame* pParent, bool bShow ) m_aSystemData.nScreen = pParent->getXScreenNumber().getXScreen(); m_aSystemData.pAppContext = nullptr; m_aSystemData.pShellWidget = GTK_WIDGET(pParent->getWindow()); + m_aSystemData.pToolkit = "gtk3"; g_signal_connect( G_OBJECT(m_pSocket), "button-press-event", G_CALLBACK(signalButton), this ); g_signal_connect( G_OBJECT(m_pSocket), "button-release-event", G_CALLBACK(signalButton), this ); |