Skip to content

C
core
Kaydet (Commit) 3bb099ec authored tarafından Caolán McNamara's avatar Caolán McNamara
Dosyalara gözat
Seçenekler

older gtks don't have gtk_widget_get_window 

Change-Id: I700f45c680fb0154aecd37b54d8de9fe4ee9d238
üst f2bdfdb2
Show whitespace changes
Inline Side-by-side
Showing with 3 additions and 3 deletions
vcl/unx/gtk/window/gtksalframe.cxx
Dosyayı görüntüle @ 3bb099ec
...@@ -628,7 +628,7 @@ static const GActionEntry app_entries[] = { ...@@ -628,7 +628,7 @@ static const GActionEntry app_entries[] = {
gboolean ensure_dbus_setup( gpointer data ) gboolean ensure_dbus_setup( gpointer data )
{ {
GtkSalFrame* pSalFrame = reinterpret_cast< GtkSalFrame* >( data ); GtkSalFrame* pSalFrame = reinterpret_cast< GtkSalFrame* >( data );
GdkWindow* gdkWindow = gtk_widget_get_window( pSalFrame->getWindow() ); GdkWindow* gdkWindow = widget_get_window( pSalFrame->getWindow() );
if ( gdkWindow != NULL && g_object_get_data( G_OBJECT( gdkWindow ), "g-lo-menubar" ) == NULL ) if ( gdkWindow != NULL && g_object_get_data( G_OBJECT( gdkWindow ), "g-lo-menubar" ) == NULL )
{ {
...@@ -2312,7 +2312,7 @@ void GtkSalFrame::SetScreen( unsigned int nNewScreen, int eType, Rectangle *pSiz ...@@ -2312,7 +2312,7 @@ void GtkSalFrame::SetScreen( unsigned int nNewScreen, int eType, Rectangle *pSiz
#endif #endif
{ {
#if GTK_CHECK_VERSION(3,8,0) #if GTK_CHECK_VERSION(3,8,0)
gdk_window_set_fullscreen_mode( gtk_widget_get_window(m_pWindow), m_bSpanMonitorsWhenFullscreen gdk_window_set_fullscreen_mode( widget_get_window(m_pWindow), m_bSpanMonitorsWhenFullscreen
? GDK_FULLSCREEN_ON_ALL_MONITORS : GDK_FULLSCREEN_ON_CURRENT_MONITOR ); ? GDK_FULLSCREEN_ON_ALL_MONITORS : GDK_FULLSCREEN_ON_CURRENT_MONITOR );
#endif #endif
if( eType == SET_FULLSCREEN ) if( eType == SET_FULLSCREEN )
...@@ -3560,7 +3560,7 @@ gboolean GtkSalFrame::signalMap( GtkWidget *pWidget, GdkEvent*, gpointer frame ) ...@@ -3560,7 +3560,7 @@ gboolean GtkSalFrame::signalMap( GtkWidget *pWidget, GdkEvent*, gpointer frame )
//window to span all displays. //window to span all displays.
if (pThis->m_bFullscreen && pThis->m_bSpanMonitorsWhenFullscreen) if (pThis->m_bFullscreen && pThis->m_bSpanMonitorsWhenFullscreen)
{ {
GdkWindow* gdkwin = gtk_widget_get_window(pThis->m_pWindow); GdkWindow* gdkwin = widget_get_window(pThis->m_pWindow);
if (gdkwin) if (gdkwin)
{ {
OUString sProgramURL( "$BRAND_BASE_DIR/" LIBO_LIBEXEC_FOLDER "/xid-fullscreen-on-all-monitors"); OUString sProgramURL( "$BRAND_BASE_DIR/" LIBO_LIBEXEC_FOLDER "/xid-fullscreen-on-all-monitors");
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment