Skip to content
Projeler
Gruplar
Parçacıklar
Yardım
Yükleniyor...
Oturum aç / Kaydol
Gezinmeyi değiştir
C
core
Proje
Proje
Ayrıntılar
Etkinlik
Cycle Analytics
Depo (repository)
Depo (repository)
Dosyalar
Kayıtlar (commit)
Dallar (branch)
Etiketler
Katkıda bulunanlar
Grafik
Karşılaştır
Grafikler
Konular (issue)
0
Konular (issue)
0
Liste
Pano
Etiketler
Kilometre Taşları
Birleştirme (merge) Talepleri
0
Birleştirme (merge) Talepleri
0
CI / CD
CI / CD
İş akışları (pipeline)
İşler
Zamanlamalar
Grafikler
Paketler
Paketler
Wiki
Wiki
Parçacıklar
Parçacıklar
Üyeler
Üyeler
Collapse sidebar
Close sidebar
Etkinlik
Grafik
Grafikler
Yeni bir konu (issue) oluştur
İşler
Kayıtlar (commit)
Konu (issue) Panoları
Kenar çubuğunu aç
LibreOffice
core
Commits
cdcee232
Kaydet (Commit)
cdcee232
authored
Mar 27, 2015
tarafından
Caolán McNamara
Dosyalara gözat
Seçenekler
Dosyalara Gözat
İndir
Eposta Yamaları
Sade Fark
don't attempt X internals for gtk3 plug window used by avmedia
Change-Id: I3694decc417627fe8ea95642b7e1444e5140304f
üst
f3915ff5
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
16 additions
and
7 deletions
+16
-7
gtkobject.cxx
vcl/unx/gtk/window/gtkobject.cxx
+12
-5
gtksalframe.cxx
vcl/unx/gtk/window/gtksalframe.cxx
+4
-2
No files found.
vcl/unx/gtk/window/gtkobject.cxx
Dosyayı görüntüle @
cdcee232
...
...
@@ -50,18 +50,25 @@ GtkSalObject::GtkSalObject( GtkSalFrame* pParent, bool bShow )
gtk_widget_set_app_paintable
(
m_pSocket
,
TRUE
);
// system data
SalDisplay
*
pDisp
=
vcl_sal
::
getSalDisplay
(
GetGenericData
());
m_aSystemData
.
nSize
=
sizeof
(
SystemEnvData
);
#if !GTK_CHECK_VERSION(3,0,0)
SalDisplay
*
pDisp
=
vcl_sal
::
getSalDisplay
(
GetGenericData
());
m_aSystemData
.
pDisplay
=
pDisp
->
GetDisplay
();
m_aSystemData
.
pVisual
=
pDisp
->
GetVisual
(
pParent
->
getXScreenNumber
()).
GetVisual
();
m_aSystemData
.
nDepth
=
pDisp
->
GetVisual
(
pParent
->
getXScreenNumber
()).
GetDepth
();
m_aSystemData
.
aColormap
=
pDisp
->
GetColormap
(
pParent
->
getXScreenNumber
()).
GetXColormap
();
m_aSystemData
.
aWindow
=
GDK_WINDOW_XWINDOW
(
widget_get_window
(
m_pSocket
));
m_aSystemData
.
aShellWindow
=
GDK_WINDOW_XWINDOW
(
widget_get_window
(
GTK_WIDGET
(
pParent
->
getWindow
())));
#else
static
int
nWindow
=
0
;
m_aSystemData
.
aWindow
=
nWindow
;
m_aSystemData
.
aShellWindow
=
pParent
->
GetSystemData
()
->
aWindow
;
++
nWindow
;
#endif
m_aSystemData
.
pSalFrame
=
NULL
;
m_aSystemData
.
pWidget
=
m_pSocket
;
m_aSystemData
.
pVisual
=
pDisp
->
GetVisual
(
pParent
->
getXScreenNumber
()).
GetVisual
();
m_aSystemData
.
nScreen
=
pParent
->
getXScreenNumber
().
getXScreen
();
m_aSystemData
.
nDepth
=
pDisp
->
GetVisual
(
pParent
->
getXScreenNumber
()).
GetDepth
();
m_aSystemData
.
aColormap
=
pDisp
->
GetColormap
(
pParent
->
getXScreenNumber
()).
GetXColormap
();
m_aSystemData
.
pAppContext
=
NULL
;
m_aSystemData
.
aShellWindow
=
GDK_WINDOW_XWINDOW
(
widget_get_window
(
GTK_WIDGET
(
pParent
->
getWindow
())));
m_aSystemData
.
pShellWidget
=
GTK_WIDGET
(
pParent
->
getWindow
());
g_signal_connect
(
G_OBJECT
(
m_pSocket
),
"button-press-event"
,
G_CALLBACK
(
signalButton
),
this
);
...
...
vcl/unx/gtk/window/gtksalframe.cxx
Dosyayı görüntüle @
cdcee232
...
...
@@ -1075,15 +1075,17 @@ void GtkSalFrame::InitCommon()
m_aSystemData
.
nDepth
=
pDisp
->
GetVisual
(
m_nXScreen
).
GetDepth
();
m_aSystemData
.
aColormap
=
pDisp
->
GetColormap
(
m_nXScreen
).
GetXColormap
();
m_aSystemData
.
aWindow
=
widget_get_xid
(
m_pWindow
);
m_aSystemData
.
aShellWindow
=
m_aSystemData
.
aWindow
;
#else
static
int
nWindow
=
0
;
m_aSystemData
.
aWindow
=
nWindow
++
;
m_aSystemData
.
aWindow
=
nWindow
;
m_aSystemData
.
aShellWindow
=
nWindow
;
++
nWindow
;
#endif
m_aSystemData
.
pSalFrame
=
this
;
m_aSystemData
.
pWidget
=
m_pWindow
;
m_aSystemData
.
nScreen
=
m_nXScreen
.
getXScreen
();
m_aSystemData
.
pAppContext
=
NULL
;
m_aSystemData
.
aShellWindow
=
m_aSystemData
.
aWindow
;
m_aSystemData
.
pShellWidget
=
m_aSystemData
.
pWidget
;
// fake an initial geometry, gets updated via configure event or SetPosSize
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment