strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

gtk4: complete do_collect_screenshot_data

Browse source 
Change-Id: I6bb13ca5d174d8a5cccff24953bc2b3057769c78
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/125243
Tested-by: Caolán McNamara <caolanm@redhat.com>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
This commit is contained in:
Caolán McNamara 2021-11-15 12:06:58 +00:00
parent acb3638afd
commit 82dab2e8c7
1 changed files with 14 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
vcl/unx/gtk3/gtkinst.cxx
View file

@ -5979,7 +5979,6 @@ namespace
return Point(x, y);
}
#if !GTK_CHECK_VERSION(4, 0, 0)
void do_collect_screenshot_data(GtkWidget* pItem, gpointer data)
{
GtkWidget* pTopLevel = widget_get_toplevel(pItem);
@ -6001,12 +6000,17 @@ namespace
pCollection->emplace_back(::get_help_id(pItem), aCurrentRange);
}
#if !GTK_CHECK_VERSION(4, 0, 0)
#if GTK_CHECK_VERSION(4, 0, 0)
for (GtkWidget* pChild = gtk_widget_get_first_child(pItem);
pChild; pChild = gtk_widget_get_next_sibling(pChild))
{
do_collect_screenshot_data(pChild, data);
}
#else
if (GTK_IS_CONTAINER(pItem))
gtk_container_forall(GTK_CONTAINER(pItem), do_collect_screenshot_data, data);
#endif
}
#endif
tools::Rectangle get_monitor_workarea(GtkWidget* pWindow)
{
@ -6340,7 +6344,13 @@ public:
{
weld::ScreenShotCollection aRet;
#if !GTK_CHECK_VERSION(4, 0, 0)
#if GTK_CHECK_VERSION(4, 0, 0)
for (GtkWidget* pChild = gtk_widget_get_first_child(GTK_WIDGET(m_pWindow));
pChild; pChild = gtk_widget_get_next_sibling(pChild))
{
do_collect_screenshot_data(pChild, &aRet);
}
#else
gtk_container_foreach(GTK_CONTAINER(m_pWindow), do_collect_screenshot_data, &aRet);
#endif