avmedia/source/gtk/gtkplayer.cxx | 8
libreofficekit/qa/gtktiledviewer/gtv-application-window.cxx | 2
libreofficekit/qa/gtktiledviewer/gtv-calc-header-bar.cxx | 2
libreofficekit/qa/gtktiledviewer/gtv-main-toolbar.cxx | 2
libreofficekit/qa/gtktiledviewer/gtv-signal-handlers.cxx | 2
vcl/unx/gtk3/fpicker/SalGtkFilePicker.cxx | 28 +-
vcl/unx/gtk3/fpicker/SalGtkFolderPicker.cxx | 2
vcl/unx/gtk3/fpicker/SalGtkPicker.cxx | 2
vcl/unx/gtk3/gtkframe.cxx | 24 +-
vcl/unx/gtk3/gtkinst.cxx | 139 +++++-------
vcl/unx/gtk3/gtkobject.cxx | 15 -
vcl/unx/gtk3/gtksalmenu.cxx | 8
vcl/unx/gtk3/salnativewidgets-gtk.cxx | 6
vcl/unx/gtk3_kde5/gtk3_kde5_filepicker_ipc.cxx | 4
14 files changed, 116 insertions(+), 128 deletions(-)
New commits:
commit 0b7e2e77b745a5f510b5192f487aab4bf8a8ab20
Author: Michael Weghorn <m.wegh...@posteo.de>
AuthorDate: Tue Feb 18 14:05:04 2025 +0100
Commit: Michael Weghorn <m.wegh...@posteo.de>
CommitDate: Tue Feb 18 15:53:15 2025 +0100
gtk: Port from deprecated gtk_widget_hide
This is basically the same as
Change-Id: Ib99a8c2420c50d918392070b10adb1aa5544492d
Author: Michael Weghorn <m.wegh...@posteo.de>
Date: Tue Feb 18 13:50:46 2025 +0100
gtk: Port from deprecated gtk_widget_show
, but now for `gtk_widget_hide` [1], which was also deprecated
in GTK 4.10.
[1] https://docs.gtk.org/gtk4/method.Widget.hide.html
Change-Id: I5029a9553feeebfaaaa2499cbc7544c324a12fbe
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/181834
Reviewed-by: Michael Weghorn <m.wegh...@posteo.de>
Tested-by: Jenkins
diff --git a/libreofficekit/qa/gtktiledviewer/gtv-application-window.cxx
b/libreofficekit/qa/gtktiledviewer/gtv-application-window.cxx
index ef2f26917b30..e2fcf16de69c 100644
--- a/libreofficekit/qa/gtktiledviewer/gtv-application-window.cxx
+++ b/libreofficekit/qa/gtktiledviewer/gtv-application-window.cxx
@@ -243,7 +243,7 @@ void
gtv_application_window_toggle_findbar(GtvApplicationWindow* window)
{
if (gtk_widget_get_visible(window->findtoolbar))
{
- gtk_widget_hide(window->findtoolbar);
+ gtk_widget_set_visible(window->findtoolbar, false);
}
else
{
diff --git a/libreofficekit/qa/gtktiledviewer/gtv-main-toolbar.cxx
b/libreofficekit/qa/gtktiledviewer/gtv-main-toolbar.cxx
index 7127581856fc..636da3f27ae4 100644
--- a/libreofficekit/qa/gtktiledviewer/gtv-main-toolbar.cxx
+++ b/libreofficekit/qa/gtktiledviewer/gtv-main-toolbar.cxx
@@ -240,7 +240,7 @@ gtv_main_toolbar_doc_loaded(GtvMainToolbar* toolbar,
LibreOfficeKitDocumentType
gtk_tool_button_set_label(GTK_TOOL_BUTTON(priv->m_pLeftpara),
".uno:AlignLeft");
gtk_tool_button_set_label(GTK_TOOL_BUTTON(priv->m_pCenterpara),
".uno:AlignHorizontalCenter");
gtk_tool_button_set_label(GTK_TOOL_BUTTON(priv->m_pRightpara),
".uno:AlignRight");
- gtk_widget_hide(priv->m_pJustifypara);
+ gtk_widget_set_visible(priv->m_pJustifypara, false);
gtk_tool_button_set_label(GTK_TOOL_BUTTON(priv->m_pDeleteComment),
".uno:DeleteNote");
gtk_widget_set_visible(toolbar->m_pAddressbar, true);
diff --git a/libreofficekit/qa/gtktiledviewer/gtv-signal-handlers.cxx
b/libreofficekit/qa/gtktiledviewer/gtv-signal-handlers.cxx
index 05de7afc6335..9f79e829ac1e 100644
--- a/libreofficekit/qa/gtktiledviewer/gtv-signal-handlers.cxx
+++ b/libreofficekit/qa/gtktiledviewer/gtv-signal-handlers.cxx
@@ -705,7 +705,7 @@ gboolean signalFindbar(GtkWidget* pWidget, GdkEventKey*
pEvent, gpointer /*pData
case GDK_KEY_Escape:
{
// Hide the findbar.
- gtk_widget_hide(GTK_WIDGET(window->findtoolbar));
+ gtk_widget_set_visible(GTK_WIDGET(window->findtoolbar), false);
return true;
}
}
diff --git a/vcl/unx/gtk3/fpicker/SalGtkFilePicker.cxx
b/vcl/unx/gtk3/fpicker/SalGtkFilePicker.cxx
index ab80520562eb..00557acf192f 100644
--- a/vcl/unx/gtk3/fpicker/SalGtkFilePicker.cxx
+++ b/vcl/unx/gtk3/fpicker/SalGtkFilePicker.cxx
@@ -110,7 +110,7 @@ void SalGtkFilePicker::InitialMapping()
{
if (!mbPreviewState )
{
- gtk_widget_hide( m_pPreview );
+ gtk_widget_set_visible(m_pPreview, false);
#if !GTK_CHECK_VERSION(4, 0, 0)
gtk_file_chooser_set_preview_widget_active( GTK_FILE_CHOOSER(
m_pDialog ), false);
#endif
@@ -1078,7 +1078,7 @@ sal_Int16 SAL_CALL SalGtkFilePicker::execute()
break;
}
}
- gtk_widget_hide(m_pDialog);
+ gtk_widget_set_visible(m_pDialog, false);
if (mnHID_FolderChange)
g_signal_handler_disconnect(GTK_FILE_CHOOSER( m_pDialog ),
mnHID_FolderChange);
@@ -1596,7 +1596,7 @@ sal_Bool SAL_CALL SalGtkFilePicker::setShowState(
sal_Bool bShowState )
else
{
// Hide
- gtk_widget_hide( m_pPreview );
+ gtk_widget_set_visible(m_pPreview, false);
}
// also emit the signal
@@ -2056,7 +2056,7 @@ void SalGtkFilePicker::SetFilters()
// We always hide the expander now and depend on the user using the glob
// list, or type a filename suffix, to select a filter by inference.
- gtk_widget_hide(m_pFilterExpander);
+ gtk_widget_set_visible(m_pFilterExpander, false);
// set the default filter
if (!sPseudoFilter.isEmpty())
diff --git a/vcl/unx/gtk3/fpicker/SalGtkFolderPicker.cxx
b/vcl/unx/gtk3/fpicker/SalGtkFolderPicker.cxx
index ee618e4515f7..9540e95ccb21 100644
--- a/vcl/unx/gtk3/fpicker/SalGtkFolderPicker.cxx
+++ b/vcl/unx/gtk3/fpicker/SalGtkFolderPicker.cxx
@@ -170,7 +170,7 @@ sal_Int16 SAL_CALL SalGtkFolderPicker::execute()
retVal = 0;
break;
}
- gtk_widget_hide(m_pDialog);
+ gtk_widget_set_visible(m_pDialog, false);
return retVal;
}
diff --git a/vcl/unx/gtk3/fpicker/SalGtkPicker.cxx
b/vcl/unx/gtk3/fpicker/SalGtkPicker.cxx
index 1ca92d8751bf..0e81b9149eab 100644
--- a/vcl/unx/gtk3/fpicker/SalGtkPicker.cxx
+++ b/vcl/unx/gtk3/fpicker/SalGtkPicker.cxx
@@ -153,7 +153,7 @@ void SAL_CALL RunDialog::notifyTermination( const
css::lang::EventObject& )
void RunDialog::cancel()
{
gtk_dialog_response( GTK_DIALOG( mpDialog ), GTK_RESPONSE_CANCEL );
- gtk_widget_hide( mpDialog );
+ gtk_widget_set_visible(mpDialog, false);
}
namespace
diff --git a/vcl/unx/gtk3/gtkframe.cxx b/vcl/unx/gtk3/gtkframe.cxx
index 4734129f8b4c..b4636ed28fe5 100644
--- a/vcl/unx/gtk3/gtkframe.cxx
+++ b/vcl/unx/gtk3/gtkframe.cxx
@@ -2056,7 +2056,7 @@ void GtkSalFrame::Show( bool bVisible, bool
/*bNoActivate*/ )
m_pParent->grabPointer(bParentIsFloatGrabWindow, true,
bParentIsFloatGrabWindow);
}
}
- gtk_widget_hide( m_pWindow );
+ gtk_widget_set_visible(m_pWindow, false);
if( m_pIMHandler )
m_pIMHandler->focusChanged( false );
}
@@ -2522,7 +2522,7 @@ void GtkSalFrame::SetScreen( unsigned int nNewScreen,
SetType eType, tools::Rect
if( eType == SetType::Fullscreen )
{
if (pMenuBarContainerWidget)
- gtk_widget_hide(pMenuBarContainerWidget);
+ gtk_widget_set_visible(pMenuBarContainerWidget, false);
if (bSpanMonitorsWhenFullscreen)
gtk_window_fullscreen(GTK_WINDOW(m_pWindow));
else
@@ -2574,7 +2574,7 @@ void GtkSalFrame::SetScreen( unsigned int nNewScreen,
SetType eType, tools::Rect
}
if (pMenuBarContainerWidget)
- gtk_widget_hide(pMenuBarContainerWidget);
+ gtk_widget_set_visible(pMenuBarContainerWidget, false);
if (bSpanMonitorsWhenFullscreen)
gtk_window_fullscreen(GTK_WINDOW(m_pWindow));
else
diff --git a/vcl/unx/gtk3/gtkinst.cxx b/vcl/unx/gtk3/gtkinst.cxx
index ca70440d26ae..bd6de88d7c77 100644
--- a/vcl/unx/gtk3/gtkinst.cxx
+++ b/vcl/unx/gtk3/gtkinst.cxx
@@ -3628,7 +3628,7 @@ public:
virtual void hide() override
{
- gtk_widget_hide(m_pWidget);
+ gtk_widget_set_visible(m_pWidget, false);
}
virtual void set_size_request(int nWidth, int nHeight) override
@@ -4541,7 +4541,7 @@ public:
if (!bAlreadyMapped)
gtk_widget_unmap(m_pWidget);
if (!bAlreadyVisible)
- gtk_widget_hide(m_pWidget);
+ gtk_widget_set_visible(m_pWidget, false);
if (!bAlreadyRealized)
gtk_widget_unrealize(m_pWidget);
}
@@ -5693,10 +5693,7 @@ public:
{
#if !GTK_CHECK_VERSION(4, 0, 0)
GtkWidget* pWidget = GTK_WIDGET(m_aMap[rIdent]);
- if (bShow)
- gtk_widget_set_visible(pWidget, true);
- else
- gtk_widget_hide(pWidget);
+ gtk_widget_set_visible(pWidget, bShow);
#else
bool bOldVisible = m_aHiddenIds.find(rIdent) == m_aHiddenIds.end();
if (bShow == bOldVisible)
@@ -6646,7 +6643,7 @@ public:
cairo_destroy(cr);
if (!bAlreadyVisible)
- gtk_widget_hide(GTK_WIDGET(m_pWindow));
+ gtk_widget_set_visible(GTK_WIDGET(m_pWindow), false);
if (!bAlreadyRealized)
gtk_widget_unrealize(GTK_WIDGET(m_pWindow));
@@ -6862,7 +6859,7 @@ namespace
{
g_object_ref(pChild);
rWasVisibleWidgets.emplace_back(pChild);
- gtk_widget_hide(pChild);
+ gtk_widget_set_visible(pChild, false);
}
else
{
@@ -6880,7 +6877,7 @@ namespace
{
g_object_ref(pChild);
rWasVisibleWidgets.emplace_back(pChild);
- gtk_widget_hide(pChild);
+ gtk_widget_set_visible(pChild, false);
}
else if (GTK_IS_CONTAINER(pChild))
{
@@ -7292,13 +7289,13 @@ public:
m_nOldBorderWidth =
gtk_container_get_border_width(GTK_CONTAINER(m_pDialog));
gtk_container_set_border_width(GTK_CONTAINER(m_pDialog), 0);
if (GtkWidget* pActionArea =
gtk_dialog_get_action_area(GTK_DIALOG(m_pDialog)))
- gtk_widget_hide(pActionArea);
+ gtk_widget_set_visible(pActionArea, false);
gtk_widget_show_all(pRefEdit);
if (pRefBtn)
gtk_widget_show_all(pRefBtn);
#else
if (GtkWidget* pActionArea =
gtk_dialog_get_header_bar(GTK_DIALOG(m_pDialog)))
- gtk_widget_hide(pActionArea);
+ gtk_widget_set_visible(pActionArea, false);
#endif
// calc's insert->function is springing back to its original size if
the ref-button
@@ -7682,14 +7679,14 @@ public:
for (GtkWidget* pChild = gtk_widget_get_first_child(pParent);
pChild; pChild = gtk_widget_get_next_sibling(pChild))
{
- gtk_widget_hide(pChild);
+ gtk_widget_set_visible(pChild, false);
}
#else
GList* pChildren = gtk_container_get_children(GTK_CONTAINER(pParent));
for (GList* pChild = g_list_first(pChildren); pChild; pChild =
g_list_next(pChild))
{
GtkWidget* pWidget = static_cast<GtkWidget*>(pChild->data);
- gtk_widget_hide(pWidget);
+ gtk_widget_set_visible(pWidget, false);
}
g_list_free(pChildren);
#endif
@@ -9563,7 +9560,7 @@ public:
void reset_split_data()
{
// reset overflow and allow it to be recalculated if necessary
- gtk_widget_hide(GTK_WIDGET(m_pOverFlowNotebook));
+ gtk_widget_set_visible(GTK_WIDGET(m_pOverFlowNotebook), false);
m_bOverFlowBoxActive = false;
m_nStartTabCount = 0;
m_nEndTabCount = 0;
@@ -9591,7 +9588,7 @@ public:
}
// reset overflow and allow it to be recalculated if necessary
- gtk_widget_hide(GTK_WIDGET(m_pOverFlowNotebook));
+ gtk_widget_set_visible(GTK_WIDGET(m_pOverFlowNotebook), false);
m_bOverFlowBoxActive = false;
insert_page(m_pNotebook, rIdent, rLabel, gtk_grid_new(), nPos);
@@ -10576,7 +10573,7 @@ void MoveWindowContentsToPopover(GtkWindow* pMenuHack,
GtkWidget* pPopover, GtkW
gtk_grab_remove(GTK_WIDGET(pMenuHack));
- gtk_widget_hide(GTK_WIDGET(pMenuHack));
+ gtk_widget_set_visible(GTK_WIDGET(pMenuHack), false);
//put contents back from where the came from
GtkWidget* pChild = gtk_bin_get_child(GTK_BIN(pMenuHack));
g_object_ref(pChild);
@@ -11297,7 +11294,7 @@ public:
#endif
insertAsParent(GTK_WIDGET(m_pMenuButton), GTK_WIDGET(m_pContainer));
- gtk_widget_hide(GTK_WIDGET(m_pMenuButton));
+ gtk_widget_set_visible(GTK_WIDGET(m_pMenuButton), false);
// move the first GtkMenuButton child, as created by
GtkInstanceMenuButton ctor, into the GtkToggleButton
// instead, leaving just the indicator behind in the GtkMenuButton
@@ -13685,7 +13682,7 @@ private:
gtk_widget_set_visible(GTK_WIDGET(m_pPlaceHolderLabel), true);
}
else
- gtk_widget_hide(GTK_WIDGET(m_pPlaceHolderLabel));
+ gtk_widget_set_visible(GTK_WIDGET(m_pPlaceHolderLabel), false);
}
void launch_update_placeholder_replacement()
@@ -13800,7 +13797,7 @@ public:
virtual void hide() override
{
if (m_pPlaceHolderReplacement)
- gtk_widget_hide(GTK_WIDGET(m_pPlaceHolderReplacement));
+ gtk_widget_set_visible(GTK_WIDGET(m_pPlaceHolderReplacement),
false);
GtkInstanceEditable::hide();
}
@@ -16514,8 +16511,8 @@ public:
{
GtkWidget* pParent = gtk_widget_get_parent(m_pWidget);
if (GTK_IS_SCROLLED_WINDOW(pParent))
- gtk_widget_hide(pParent);
- gtk_widget_hide(m_pWidget);
+ gtk_widget_set_visible(pParent, false);
+ gtk_widget_set_visible(m_pWidget, false);
}
virtual void enable_drag_source(rtl::Reference<TransferDataContainer>&
rHelper, sal_uInt8 eDNDConstants) override
@@ -17433,8 +17430,8 @@ public:
{
GtkWidget* pParent = gtk_widget_get_parent(m_pWidget);
if (GTK_IS_SCROLLED_WINDOW(pParent))
- gtk_widget_hide(pParent);
- gtk_widget_hide(m_pWidget);
+ gtk_widget_set_visible(pParent, false);
+ gtk_widget_set_visible(m_pWidget, false);
}
virtual OUString get_selected_text() const override
@@ -18521,8 +18518,8 @@ public:
{
GtkWidget* pParent = gtk_widget_get_parent(m_pWidget);
if (GTK_IS_SCROLLED_WINDOW(pParent))
- gtk_widget_hide(pParent);
- gtk_widget_hide(m_pWidget);
+ gtk_widget_set_visible(pParent, false);
+ gtk_widget_set_visible(m_pWidget, false);
}
virtual ~GtkInstanceTextView() override
@@ -21501,7 +21498,7 @@ private:
do_ungrab(GTK_WIDGET(m_pMenuWindow));
- gtk_widget_hide(GTK_WIDGET(m_pMenuWindow));
+ gtk_widget_set_visible(GTK_WIDGET(m_pMenuWindow), false);
GdkSurface* pSurface =
widget_get_surface(GTK_WIDGET(m_pMenuWindow));
g_object_set_data(G_OBJECT(pSurface), "g-lo-InstancePopup",
GINT_TO_POINTER(false));
@@ -24200,7 +24197,7 @@ private:
}
if (bHideHelp && sBuildableName == "help")
- gtk_widget_hide(pWidget);
+ gtk_widget_set_visible(pWidget, false);
}
if (m_pStringReplace)
diff --git a/vcl/unx/gtk3/gtkobject.cxx b/vcl/unx/gtk3/gtkobject.cxx
index 02505b245463..0a824f0849fb 100644
--- a/vcl/unx/gtk3/gtkobject.cxx
+++ b/vcl/unx/gtk3/gtkobject.cxx
@@ -205,12 +205,7 @@ void GtkSalObject::Reparent(SalFrame* pFrame)
void GtkSalObject::Show( bool bVisible )
{
if( m_pSocket )
- {
- if( bVisible )
- gtk_widget_set_visible(m_pSocket, true);
- else
- gtk_widget_hide(m_pSocket);
- }
+ gtk_widget_set_visible(m_pSocket, bVisible);
}
Size GtkSalObjectBase::GetOptimalSize() const
@@ -531,7 +526,7 @@ void GtkSalObjectWidgetClip::Show( bool bVisible )
g_object_set_data(G_OBJECT(pTopLevel), "g-lo-BlockFocusChange",
GINT_TO_POINTER(true) );
- gtk_widget_hide(m_pScrolledWindow);
+ gtk_widget_set_visible(m_pScrolledWindow, false);
GtkWidget* pNewFocus = GTK_IS_WINDOW(pTopLevel) ?
gtk_window_get_focus(GTK_WINDOW(pTopLevel)) : nullptr;
if (pOldFocus && pOldFocus != pNewFocus)
diff --git a/vcl/unx/gtk3_kde5/gtk3_kde5_filepicker_ipc.cxx
b/vcl/unx/gtk3_kde5/gtk3_kde5_filepicker_ipc.cxx
index eb7e88af5183..8e0cdd25cfe6 100644
--- a/vcl/unx/gtk3_kde5/gtk3_kde5_filepicker_ipc.cxx
+++ b/vcl/unx/gtk3_kde5/gtk3_kde5_filepicker_ipc.cxx
@@ -113,7 +113,7 @@ static void handleIpcForExecute(Gtk3KDE5FilePickerIpc*
pFilePickerIpc, GtkWidget
pFilePickerIpc->readResponse(id, *bResult);
// end the dummy dialog
- gtk_widget_hide(pDummyDialog);
+ gtk_widget_set_visible(pDummyDialog, false);
}
// Gtk3KDE5FilePicker
commit ac0e7ccc03ff4c21cc2311246aa248a3ad3bcea2
Author: Michael Weghorn <m.wegh...@posteo.de>
AuthorDate: Tue Feb 18 13:50:46 2025 +0100
Commit: Michael Weghorn <m.wegh...@posteo.de>
CommitDate: Tue Feb 18 15:53:09 2025 +0100
gtk: Port from deprecated gtk_widget_show
`gtk_widget_show` was deprecated in GTK 4.10 [1].
Replace with calls to `gtk_widget_set_visible` instead
(which itself just calls the deprecacted `gtk_widget_show`
internally for now in GTK 4 [2]) as recommended.
While it's not deprecated for GTK 3, also replace it in gtk3-only
code where the semantics are the same. Quoting from the
GTK 3 `gtk_widget_set_visible` doc [3]:
> This function simply calls gtk_widget_show() or gtk_widget_hide() but is
> nicer to use when the visibility of the widget depends on some
> condition.
A similar change will be done for `gtk_widget_hide`
in an upcoming commit.
[1] https://docs.gtk.org/gtk4/method.Widget.show.html
[2]
https://gitlab.gnome.org/GNOME/gtk/-/blob/849b5e55d531a8a5645487853cb3876681674c31/gtk/gtkwidget.c#L5837-5859
[3] https://docs.gtk.org/gtk3/method.Widget.set_visible.html
Change-Id: Ib99a8c2420c50d918392070b10adb1aa5544492d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/181833
Tested-by: Jenkins
Reviewed-by: Michael Weghorn <m.wegh...@posteo.de>
diff --git a/avmedia/source/gtk/gtkplayer.cxx b/avmedia/source/gtk/gtkplayer.cxx
index 617991fecce2..8ade48191174 100644
--- a/avmedia/source/gtk/gtkplayer.cxx
+++ b/avmedia/source/gtk/gtkplayer.cxx
@@ -351,12 +351,8 @@ uno::Reference<::media::XPlayerWindow>
GtkWidget* pParent = static_cast<GtkWidget*>(pEnvData->pWidget);
gtk_widget_set_can_target(pParent, false);
gtk_grid_attach(GTK_GRID(pParent), m_pVideo, 0, 0, 1, 1);
- // "‘void gtk_widget_show(GtkWidget*)’ is deprecated: Use
'gtk_widget_set_visible or
- // gtk_window_present' instead":
- SAL_WNODEPRECATED_DECLARATIONS_PUSH
- gtk_widget_show(m_pVideo);
- gtk_widget_show(pParent);
- SAL_WNODEPRECATED_DECLARATIONS_POP
+ gtk_widget_set_visible(m_pVideo, true);
+ gtk_widget_set_visible(pParent, true);
xRet = new ::avmedia::gstreamer::Window;
diff --git a/libreofficekit/qa/gtktiledviewer/gtv-calc-header-bar.cxx
b/libreofficekit/qa/gtktiledviewer/gtv-calc-header-bar.cxx
index 6019050236e8..6a883137e4c7 100644
--- a/libreofficekit/qa/gtktiledviewer/gtv-calc-header-bar.cxx
+++ b/libreofficekit/qa/gtktiledviewer/gtv-calc-header-bar.cxx
@@ -209,7 +209,7 @@ void gtv_calc_header_bar_configure(GtvCalcHeaderBar* bar,
const boost::property_
std::cerr << "gtv_calc_header_bar_configure: " <<
rException.what() << std::endl;
}
}
- gtk_widget_show(GTK_WIDGET(bar));
+ gtk_widget_set_visible(GTK_WIDGET(bar), true);
gtk_widget_queue_draw(GTK_WIDGET(bar));
}
diff --git a/vcl/unx/gtk3/fpicker/SalGtkFilePicker.cxx
b/vcl/unx/gtk3/fpicker/SalGtkFilePicker.cxx
index 446a2a217a6f..ab80520562eb 100644
--- a/vcl/unx/gtk3/fpicker/SalGtkFilePicker.cxx
+++ b/vcl/unx/gtk3/fpicker/SalGtkFilePicker.cxx
@@ -183,8 +183,8 @@ SalGtkFilePicker::SalGtkFilePicker( const uno::Reference<
uno::XComponentContext
gtk_box_append(GTK_BOX(m_pVBox), pHBox);
gtk_box_prepend(GTK_BOX(m_pVBox), pThinVBox);
#endif
- gtk_widget_show( pHBox );
- gtk_widget_show( pThinVBox );
+ gtk_widget_set_visible(pHBox, true);
+ gtk_widget_set_visible(pThinVBox, true);
OUString aLabel;
@@ -295,7 +295,7 @@ SalGtkFilePicker::SalGtkFilePicker( const uno::Reference<
uno::XComponentContext
#else
gtk_expander_set_child(GTK_EXPANDER(m_pFilterExpander), scrolled_window);
#endif
- gtk_widget_show (scrolled_window);
+ gtk_widget_set_visible(scrolled_window, true);
m_pFilterStore = gtk_list_store_new (4, G_TYPE_STRING, G_TYPE_STRING,
G_TYPE_STRING, G_TYPE_STRING);
@@ -319,7 +319,7 @@ SalGtkFilePicker::SalGtkFilePicker( const uno::Reference<
uno::XComponentContext
#else
gtk_scrolled_window_set_child(GTK_SCROLLED_WINDOW(scrolled_window),
m_pFilterView);
#endif
- gtk_widget_show (m_pFilterView);
+ gtk_widget_set_visible(m_pFilterView, true);
#if !GTK_CHECK_VERSION(4, 0, 0)
gtk_file_chooser_set_extra_widget( GTK_FILE_CHOOSER( m_pDialog ), m_pVBox
);
@@ -341,7 +341,7 @@ SalGtkFilePicker::SalGtkFilePicker( const uno::Reference<
uno::XComponentContext
g_signal_connect (G_OBJECT( m_pDialog ), "map",
G_CALLBACK (dialog_mapped_cb), this);
- gtk_widget_show( m_pVBox );
+ gtk_widget_set_visible(m_pVBox, true);
PangoLayout *layout = gtk_widget_create_pango_layout (m_pFilterView,
nullptr);
guint ypad;
@@ -1591,7 +1591,7 @@ sal_Bool SAL_CALL SalGtkFilePicker::setShowState(
sal_Bool bShowState )
GTK_FILE_CHOOSER( m_pDialog ), "update-preview",
G_CALLBACK( update_preview_cb ),
static_cast<gpointer>(this) );
}
- gtk_widget_show( m_pPreview );
+ gtk_widget_set_visible(m_pPreview, true);
}
else
{
@@ -1815,7 +1815,7 @@ void SalGtkFilePicker::impl_initialize(GtkWidget*
pParentWidget, sal_Int16 templ
for( int nTVIndex = 0; nTVIndex < TOGGLE_LAST; nTVIndex++ )
{
if( mbToggleVisibility[nTVIndex] )
- gtk_widget_show( m_pToggles[ nTVIndex ] );
+ gtk_widget_set_visible(m_pToggles[nTVIndex], true);
}
for( int nTVIndex = 0; nTVIndex < LIST_LAST; nTVIndex++ )
@@ -1823,9 +1823,9 @@ void SalGtkFilePicker::impl_initialize(GtkWidget*
pParentWidget, sal_Int16 templ
if( mbListVisibility[nTVIndex] )
{
gtk_widget_set_sensitive( m_pLists[ nTVIndex ], false );
- gtk_widget_show( m_pLists[ nTVIndex ] );
- gtk_widget_show( m_pListLabels[ nTVIndex ] );
- gtk_widget_show( m_pHBoxs[ nTVIndex ] );
+ gtk_widget_set_visible(m_pLists[nTVIndex], true);
+ gtk_widget_set_visible(m_pListLabels[nTVIndex], true);
+ gtk_widget_set_visible(m_pHBoxs[nTVIndex], true);
}
}
diff --git a/vcl/unx/gtk3/gtkframe.cxx b/vcl/unx/gtk3/gtkframe.cxx
index 5d99e23d039f..4734129f8b4c 100644
--- a/vcl/unx/gtk3/gtkframe.cxx
+++ b/vcl/unx/gtk3/gtkframe.cxx
@@ -1215,7 +1215,7 @@ void GtkSalFrame::InitCommon()
#if !GTK_CHECK_VERSION(4,0,0)
gtk_widget_show_all(GTK_WIDGET(m_pTopLevelGrid));
#else
- gtk_widget_show(GTK_WIDGET(m_pTopLevelGrid));
+ gtk_widget_set_visible(GTK_WIDGET(m_pTopLevelGrid), true);
#endif
// realize the window, we need an XWindow id
@@ -1767,7 +1767,7 @@ void GtkSalFrame::Init( SalFrame* pParent,
SalFrameStyleFlags nStyle )
gtk_widget_set_direction(GTK_WIDGET(m_pHeaderBar),
bDesktopIsRTL ? GTK_TEXT_DIR_RTL : GTK_TEXT_DIR_LTR);
gtk_header_bar_set_show_close_button(m_pHeaderBar, true);
gtk_window_set_titlebar(GTK_WINDOW(m_pWindow),
GTK_WIDGET(m_pHeaderBar));
- gtk_widget_show(GTK_WIDGET(m_pHeaderBar));
+ gtk_widget_set_visible(GTK_WIDGET(m_pHeaderBar), true);
}
}
#endif
@@ -2018,15 +2018,15 @@ void GtkSalFrame::Show( bool bVisible, bool
/*bNoActivate*/ )
{
OString sOrigName(g_get_prgname());
g_set_prgname("libreoffice-startcenter");
- gtk_widget_show(m_pWindow);
+ gtk_widget_set_visible(m_pWindow, true);
g_set_prgname(sOrigName.getStr());
}
else
{
- gtk_widget_show(m_pWindow);
+ gtk_widget_set_visible(m_pWindow, true);
}
#else
- gtk_widget_show(m_pWindow);
+ gtk_widget_set_visible(m_pWindow, true);
#endif
if( isFloatGrabWindow() )
@@ -2532,7 +2532,7 @@ void GtkSalFrame::SetScreen( unsigned int nNewScreen,
SetType eType, tools::Rect
else if( eType == SetType::UnFullscreen )
{
if (pMenuBarContainerWidget)
- gtk_widget_show(pMenuBarContainerWidget);
+ gtk_widget_set_visible(pMenuBarContainerWidget, true);
gtk_window_unfullscreen( GTK_WINDOW( m_pWindow ) );
}
@@ -2590,7 +2590,7 @@ void GtkSalFrame::SetScreen( unsigned int nNewScreen,
SetType eType, tools::Rect
else if (eType == SetType::UnFullscreen)
{
if (pMenuBarContainerWidget)
- gtk_widget_show(pMenuBarContainerWidget);
+ gtk_widget_set_visible(pMenuBarContainerWidget, true);
gtk_window_unfullscreen(GTK_WINDOW(m_pWindow));
if (!(m_nStyle & SalFrameStyleFlags::SIZEABLE))
@@ -3237,8 +3237,8 @@ void* GtkSalFrame::ShowPopover(const OUString& rHelpText,
vcl::Window* pParent,
gtk_popover_set_autohide(GTK_POPOVER(pWidget), false);
#endif
- gtk_widget_show(pLabel);
- gtk_widget_show(pWidget);
+ gtk_widget_set_visible(pLabel, true);
+ gtk_widget_set_visible(pWidget, true);
return pWidget;
}
diff --git a/vcl/unx/gtk3/gtkinst.cxx b/vcl/unx/gtk3/gtkinst.cxx
index a95f3888abe7..ca70440d26ae 100644
--- a/vcl/unx/gtk3/gtkinst.cxx
+++ b/vcl/unx/gtk3/gtkinst.cxx
@@ -2025,8 +2025,8 @@ private:
gtk_widget_show_all(pParent);
#else
gtk_grid_attach(GTK_GRID(pParent), m_pGLArea, 0, 0, 1, 1);
- gtk_widget_show(pParent);
- gtk_widget_show(m_pGLArea);
+ gtk_widget_set_visible(pParent, true);
+ gtk_widget_set_visible(m_pGLArea, true);
#endif
gtk_gl_area_make_current(GTK_GL_AREA(m_pGLArea));
@@ -3623,7 +3623,7 @@ public:
virtual void show() override
{
- gtk_widget_show(m_pWidget);
+ gtk_widget_set_visible(m_pWidget, true);
}
virtual void hide() override
@@ -4451,7 +4451,7 @@ public:
gtk_widget_realize(m_pWidget);
}
if (!bAlreadyVisible)
- gtk_widget_show(m_pWidget);
+ gtk_widget_set_visible(m_pWidget, true);
if (!bAlreadyMapped)
gtk_widget_map(m_pWidget);
@@ -5504,7 +5504,7 @@ public:
::set_buildable_id(GTK_BUILDABLE(pItem), rId);
gtk_menu_shell_append(GTK_MENU_SHELL(m_pMenu), pItem);
- gtk_widget_show(pItem);
+ gtk_widget_set_visible(pItem, true);
add_to_map(GTK_MENU_ITEM(pItem));
if (pos != -1)
gtk_menu_reorder_child(m_pMenu, pItem, pos);
@@ -5538,7 +5538,7 @@ public:
GtkWidget* pItem = gtk_separator_menu_item_new();
::set_buildable_id(GTK_BUILDABLE(pItem), rId);
gtk_menu_shell_append(GTK_MENU_SHELL(m_pMenu), pItem);
- gtk_widget_show(pItem);
+ gtk_widget_set_visible(pItem, true);
add_to_map(GTK_MENU_ITEM(pItem));
if (pos != -1)
gtk_menu_reorder_child(m_pMenu, pItem, pos);
@@ -5694,7 +5694,7 @@ public:
#if !GTK_CHECK_VERSION(4, 0, 0)
GtkWidget* pWidget = GTK_WIDGET(m_aMap[rIdent]);
if (bShow)
- gtk_widget_show(pWidget);
+ gtk_widget_set_visible(pWidget, true);
else
gtk_widget_hide(pWidget);
#else
@@ -6607,7 +6607,7 @@ public:
{
if (GTK_IS_DIALOG(m_pWindow))
sort_native_button_order(GTK_BOX(gtk_dialog_get_action_area(GTK_DIALOG(m_pWindow))));
- gtk_widget_show(GTK_WIDGET(m_pWindow));
+ gtk_widget_set_visible(GTK_WIDGET(m_pWindow), true);
}
#endif
@@ -6779,7 +6779,7 @@ struct DialogRunner
gtk_window_set_modal(m_pDialog, true);
if (!gtk_widget_get_visible(GTK_WIDGET(m_pDialog)))
- gtk_widget_show(GTK_WIDGET(m_pDialog));
+ gtk_widget_set_visible(GTK_WIDGET(m_pDialog), true);
gulong nSignalResponseId = GTK_IS_DIALOG(m_pDialog) ?
g_signal_connect(m_pDialog, "response", G_CALLBACK(signal_response), this) : 0;
gulong nSignalCancelId = GTK_IS_ASSISTANT(m_pDialog) ?
g_signal_connect(m_pDialog, "cancel", G_CALLBACK(signal_cancel), this) : 0;
@@ -7008,7 +7008,7 @@ private:
gtk_menu_shell_append(GTK_MENU_SHELL(pMenu), pMenuItem);
bool bActivate(false);
g_signal_connect(pMenuItem, "activate", G_CALLBACK(signalActivate),
&bActivate);
- gtk_widget_show(pMenuItem);
+ gtk_widget_set_visible(pMenuItem, true);
int button, event_time;
if (pEvent)
@@ -7321,7 +7321,7 @@ public:
// All others: Show();
for (GtkWidget* pWindow : m_aHiddenWidgets)
{
- gtk_widget_show(pWindow);
+ gtk_widget_set_visible(pWindow, true);
g_object_unref(pWindow);
}
m_aHiddenWidgets.clear();
@@ -7331,10 +7331,10 @@ public:
#if !GTK_CHECK_VERSION(4, 0, 0)
gtk_container_set_border_width(GTK_CONTAINER(m_pDialog),
m_nOldBorderWidth);
if (GtkWidget* pActionArea =
gtk_dialog_get_action_area(GTK_DIALOG(m_pDialog)))
- gtk_widget_show(pActionArea);
+ gtk_widget_set_visible(pActionArea, true);
#else
if (GtkWidget* pActionArea =
gtk_dialog_get_header_bar(GTK_DIALOG(m_pDialog)))
- gtk_widget_show(pActionArea);
+ gtk_widget_set_visible(pActionArea, true);
#endif
resize_to_request();
present();
@@ -7697,7 +7697,7 @@ public:
#if !GTK_CHECK_VERSION(4, 0, 0)
gtk_widget_show_all(GTK_WIDGET(m_pButtonBox));
#else
- gtk_widget_show(GTK_WIDGET(m_pButtonBox));
+ gtk_widget_set_visible(GTK_WIDGET(m_pButtonBox), true);
#endif
find_sidebar(GTK_WIDGET(m_pAssistant), &m_pSidebar);
@@ -7821,7 +7821,7 @@ public:
::set_buildable_id(GTK_BUILDABLE(pChild), rIdent);
gtk_assistant_append_page(m_pAssistant, pChild);
gtk_assistant_set_page_type(m_pAssistant, pChild,
GTK_ASSISTANT_PAGE_CUSTOM);
- gtk_widget_show(pChild);
+ gtk_widget_set_visible(pChild, true);
enable_notify_events();
@@ -8305,7 +8305,7 @@ public:
gtk_container_remove(GTK_CONTAINER(m_pScrolledWindow), pViewport);
#endif
GtkWidget* pNewViewport =
GTK_WIDGET(g_object_new(immobilized_viewport_get_type(), nullptr));
- gtk_widget_show(pNewViewport);
+ gtk_widget_set_visible(pNewViewport, true);
#if GTK_CHECK_VERSION(4, 0, 0)
gtk_scrolled_window_set_child(m_pScrolledWindow, pNewViewport);
gtk_viewport_set_child(GTK_VIEWPORT(pNewViewport), pChild);
@@ -9026,8 +9026,8 @@ private:
GtkWidget *pChild = gtk_grid_new();
gtk_notebook_append_page(pNotebook, pChild, pTabWidget);
- gtk_widget_show(pChild);
- gtk_widget_show(pTabWidget);
+ gtk_widget_set_visible(pChild, true);
+ gtk_widget_set_visible(pTabWidget, true);
enable_notify_events();
}
@@ -9039,8 +9039,8 @@ private:
GtkWidget *pTabWidget =
gtk_label_new_with_mnemonic(MapToGtkAccelerator(rLabel).getStr());
::set_buildable_id(GTK_BUILDABLE(pTabWidget), rIdent);
gtk_notebook_insert_page(pNotebook, pChild, pTabWidget, nPos);
- gtk_widget_show(pChild);
- gtk_widget_show(pTabWidget);
+ gtk_widget_set_visible(pChild, true);
+ gtk_widget_set_visible(pTabWidget, true);
if (nPos != -1)
{
@@ -9071,7 +9071,7 @@ private:
#endif
// coverity[freed_arg : FALSE] - this does not free m_pNotebook , it
is reffed by pParent
g_object_unref(m_pNotebook);
- gtk_widget_show(GTK_WIDGET(m_pOverFlowBox));
+ gtk_widget_set_visible(GTK_WIDGET(m_pOverFlowBox), true);
}
void split_notebooks()
@@ -9099,7 +9099,7 @@ private:
g_object_freeze_notify(G_OBJECT(m_pOverFlowNotebook));
#endif
- gtk_widget_show(GTK_WIDGET(m_pOverFlowNotebook));
+ gtk_widget_set_visible(GTK_WIDGET(m_pOverFlowNotebook), true);
gint nPages;
@@ -10782,7 +10782,7 @@ private:
gtk_box_prepend(m_pBox, GTK_WIDGET(m_pImage));
gtk_widget_set_halign(m_pLabel, GTK_ALIGN_START);
#endif
- gtk_widget_show(GTK_WIDGET(m_pImage));
+ gtk_widget_set_visible(GTK_WIDGET(m_pImage), true);
}
static void signalFlagsChanged(GtkToggleButton* pToggleButton,
GtkStateFlags flags, gpointer widget)
@@ -11112,7 +11112,7 @@ public:
#if !GTK_CHECK_VERSION(4, 0, 0)
gtk_widget_show_all(GTK_WIDGET(pBox));
#else
- gtk_widget_show(GTK_WIDGET(pBox));
+ gtk_widget_set_visible(GTK_WIDGET(pBox), true);
#endif
return pBox;
@@ -11748,7 +11748,7 @@ public:
::set_buildable_id(GTK_BUILDABLE(pItem), rId);
gtk_menu_shell_append(GTK_MENU_SHELL(m_pMenu), pItem);
- gtk_widget_show(pItem);
+ gtk_widget_set_visible(pItem, true);
GtkMenuItem* pMenuItem = GTK_MENU_ITEM(pItem);
m_aExtraItems.push_back(pMenuItem);
add_to_map(pMenuItem);
@@ -12107,7 +12107,7 @@ private:
{
GtkWidget* pImage = image_new_from_xgraphic(rIcon, bMirror);
if (pImage)
- gtk_widget_show(pImage);
+ gtk_widget_set_visible(pImage, true);
#if !GTK_CHECK_VERSION(4, 0, 0)
gtk_tool_button_set_icon_widget(pItem, pImage);
#else
@@ -12130,7 +12130,7 @@ private:
#else
pImage = image_new_from_virtual_device(*pDevice);
#endif
- gtk_widget_show(pImage);
+ gtk_widget_set_visible(pImage, true);
}
#if !GTK_CHECK_VERSION(4, 0, 0)
@@ -12334,7 +12334,7 @@ public:
#else
gtk_box_insert_child_after(m_pToolbar, pItem, toolbar_get_nth_item(pos
- 1));
#endif
- gtk_widget_show(GTK_WIDGET(pItem));
+ gtk_widget_set_visible(GTK_WIDGET(pItem), true);
add_to_map(GTK_WIDGET(pItem), nullptr);
}
@@ -12351,7 +12351,7 @@ public:
#else
gtk_box_insert_child_after(m_pToolbar, pItem, toolbar_get_nth_item(pos
- 1));
#endif
- gtk_widget_show(GTK_WIDGET(pItem));
+ gtk_widget_set_visible(GTK_WIDGET(pItem), true);
}
virtual void set_item_popover(const OUString& rIdent, weld::Widget*
pPopover) override
@@ -12457,7 +12457,7 @@ public:
GtkWidget* pImage = image_new_from_icon_name(rIconName);
if (pImage)
- gtk_widget_show(pImage);
+ gtk_widget_set_visible(pImage, true);
#if !GTK_CHECK_VERSION(4, 0, 0)
gtk_tool_button_set_icon_widget(GTK_TOOL_BUTTON(pItem), pImage);
@@ -13682,7 +13682,7 @@ private:
gtk_widget_set_margin_start(GTK_WIDGET(m_pPlaceHolderLabel), x);
gtk_widget_set_margin_end(GTK_WIDGET(m_pPlaceHolderLabel), x);
gtk_label_set_text(m_pPlaceHolderLabel, placeholder_text);
- gtk_widget_show(GTK_WIDGET(m_pPlaceHolderLabel));
+ gtk_widget_set_visible(GTK_WIDGET(m_pPlaceHolderLabel), true);
}
else
gtk_widget_hide(GTK_WIDGET(m_pPlaceHolderLabel));
@@ -13794,7 +13794,7 @@ public:
{
GtkInstanceEditable::show();
if (m_pPlaceHolderReplacement)
- gtk_widget_show(GTK_WIDGET(m_pPlaceHolderReplacement));
+ gtk_widget_set_visible(GTK_WIDGET(m_pPlaceHolderReplacement),
true);
}
virtual void hide() override
@@ -16506,8 +16506,8 @@ public:
{
GtkWidget* pParent = gtk_widget_get_parent(m_pWidget);
if (GTK_IS_SCROLLED_WINDOW(pParent))
- gtk_widget_show(pParent);
- gtk_widget_show(m_pWidget);
+ gtk_widget_set_visible(pParent, true);
+ gtk_widget_set_visible(m_pWidget, true);
}
virtual void hide() override
@@ -17425,8 +17425,8 @@ public:
{
GtkWidget* pParent = gtk_widget_get_parent(m_pWidget);
if (GTK_IS_SCROLLED_WINDOW(pParent))
- gtk_widget_show(pParent);
- gtk_widget_show(m_pWidget);
+ gtk_widget_set_visible(pParent, true);
+ gtk_widget_set_visible(m_pWidget, true);
}
virtual void hide() override
@@ -18513,8 +18513,8 @@ public:
{
GtkWidget* pParent = gtk_widget_get_parent(m_pWidget);
if (GTK_IS_SCROLLED_WINDOW(pParent))
- gtk_widget_show(pParent);
- gtk_widget_show(m_pWidget);
+ gtk_widget_set_visible(pParent, true);
+ gtk_widget_set_visible(m_pWidget, true);
}
virtual void hide() override
@@ -19411,7 +19411,7 @@ static void signalEntryPopulatePopup(GtkEntry* pEntry,
GtkWidget* pMenu, gpointe
return;
GtkWidget *item =
gtk_menu_item_new_with_mnemonic(MapToGtkAccelerator(VclResId(STR_SPECIAL_CHARACTER_MENU_ENTRY)).getStr());
- gtk_widget_show(item);
+ gtk_widget_set_visible(item, true);
g_signal_connect_swapped(item, "activate",
G_CALLBACK(signalActivateEntryInsertSpecialChar), pEntry);
gtk_menu_shell_append(GTK_MENU_SHELL(pMenu), item);
}
@@ -24127,7 +24127,7 @@ private:
if (GtkWidget* pImage =
image_new_from_icon_name_theme_lang(aIconName, m_aIconTheme, m_aUILang))
{
gtk_tool_button_set_icon_widget(pToolButton, pImage);
- gtk_widget_show(pImage);
+ gtk_widget_set_visible(pImage, true);
}
}
}
@@ -24157,7 +24157,7 @@ private:
gtk_widget_set_halign(pImage, GTK_ALIGN_CENTER);
gtk_widget_set_valign(pImage, GTK_ALIGN_CENTER);
gtk_button_set_child(pButton, pImage);
- gtk_widget_show(pImage);
+ gtk_widget_set_visible(pImage, true);
}
}
}
@@ -24178,7 +24178,7 @@ private:
static auto menu_button_set_child =
reinterpret_cast<void (*) (GtkMenuButton*, GtkWidget*)>(dlsym(nullptr,
"gtk_menu_button_set_child"));
if (menu_button_set_child)
menu_button_set_child(pButton, pImage);
- gtk_widget_show(pImage);
+ gtk_widget_set_visible(pImage, true);
}
}
}
@@ -24581,7 +24581,7 @@ public:
gtk_widget_show_all(pTopLevel);
#else
gtk_box_append(GTK_BOX(pContentArea), pTopLevel);
- gtk_widget_show(pTopLevel);
+ gtk_widget_set_visible(pTopLevel, true);
#endif
}
@@ -25150,7 +25150,7 @@ std::unique_ptr<weld::Builder>
GtkInstance::CreateInterimBuilder(vcl::Window* pP
#if !GTK_CHECK_VERSION(4, 0, 0)
gtk_widget_show_all(pWindow);
#else
- gtk_widget_show(pWindow);
+ gtk_widget_set_visible(pWindow, true);
#endif
// build the widget tree as a child of the GtkEventBox GtkGrid parent
@@ -25209,7 +25209,7 @@ void* GtkInstance::CreateGStreamerSink(const
SystemChildWindow *pWindow)
#if !GTK_CHECK_VERSION(4, 0, 0)
gtk_widget_show_all(pParent);
#else
- gtk_widget_show(pParent);
+ gtk_widget_set_visible(pParent, true);
#endif
return pVideosink;
diff --git a/vcl/unx/gtk3/gtkobject.cxx b/vcl/unx/gtk3/gtkobject.cxx
index 2352c4eec425..02505b245463 100644
--- a/vcl/unx/gtk3/gtkobject.cxx
+++ b/vcl/unx/gtk3/gtkobject.cxx
@@ -207,7 +207,7 @@ void GtkSalObject::Show( bool bVisible )
if( m_pSocket )
{
if( bVisible )
- gtk_widget_show(m_pSocket);
+ gtk_widget_set_visible(m_pSocket, true);
else
gtk_widget_hide(m_pSocket);
}
@@ -327,7 +327,7 @@ GtkSalObjectWidgetClip::GtkSalObjectWidgetClip(GtkSalFrame*
pParent, bool bShow)
#else
gtk_scrolled_window_set_child(GTK_SCROLLED_WINDOW(m_pScrolledWindow),
m_pViewPort);
#endif
- gtk_widget_show(m_pViewPort);
+ gtk_widget_set_visible(m_pViewPort, true);
// our plug window
m_pSocket = gtk_grid_new();
@@ -336,7 +336,7 @@ GtkSalObjectWidgetClip::GtkSalObjectWidgetClip(GtkSalFrame*
pParent, bool bShow)
#else
gtk_viewport_set_child(GTK_VIEWPORT(m_pViewPort), m_pSocket);
#endif
- gtk_widget_show(m_pSocket);
+ gtk_widget_set_visible(m_pSocket, true);
Show(bShow);
@@ -514,7 +514,7 @@ void GtkSalObjectWidgetClip::Show( bool bVisible )
return;
if( bVisible )
{
- gtk_widget_show(m_pScrolledWindow);
+ gtk_widget_set_visible(m_pScrolledWindow, true);
// tdf#146641 allocations attempted while hidden are discarded by gtk,
// so on transition to visible ApplyClipRegion needs to be called
ApplyClipRegion();
diff --git a/vcl/unx/gtk3/gtksalmenu.cxx b/vcl/unx/gtk3/gtksalmenu.cxx
index a1b20c5c26d3..cb35c5fd39fc 100644
--- a/vcl/unx/gtk3/gtksalmenu.cxx
+++ b/vcl/unx/gtk3/gtksalmenu.cxx
@@ -731,7 +731,7 @@ GtkWidget* GtkSalMenu::AddButton(GtkWidget *pImage)
gtk_style_context_add_class(pButtonContext, "flat");
gtk_style_context_add_class(pButtonContext, "small-button");
- gtk_widget_show(pImage);
+ gtk_widget_set_visible(pImage, true);
gtk_widget_set_valign(pButton, GTK_ALIGN_CENTER);
@@ -1040,9 +1040,9 @@ void GtkSalMenu::CreateMenuBarWidget()
g_signal_connect(G_OBJECT(mpMenuBarWidget), "key-press-event",
G_CALLBACK(MenuBarSignalKey), this);
#endif
- gtk_widget_show(mpMenuBarWidget);
- gtk_widget_show(mpMenuAllowShrinkWidget);
- gtk_widget_show(mpMenuBarContainerWidget);
+ gtk_widget_set_visible(mpMenuBarWidget, true);
+ gtk_widget_set_visible(mpMenuAllowShrinkWidget, true);
+ gtk_widget_set_visible(mpMenuBarContainerWidget, true);
ShowCloseButton( static_cast<MenuBar*>(mpVCLMenu.get())->HasCloseButton()
);
}
diff --git a/vcl/unx/gtk3/salnativewidgets-gtk.cxx
b/vcl/unx/gtk3/salnativewidgets-gtk.cxx
index e88d823781aa..74376d2692ce 100644
--- a/vcl/unx/gtk3/salnativewidgets-gtk.cxx
+++ b/vcl/unx/gtk3/salnativewidgets-gtk.cxx
@@ -2966,19 +2966,19 @@ GtkSalGraphics::GtkSalGraphics( GtkSalFrame *pFrame,
GtkWidget *pWindow )
gHScrollbar = gtk_scrollbar_new(GTK_ORIENTATION_HORIZONTAL, nullptr);
gtk_fixed_put(GTK_FIXED(gDumbContainer), gHScrollbar, 0, 0);
- gtk_widget_show(gHScrollbar);
+ gtk_widget_set_visible(gHScrollbar, true);
#if GTK_CHECK_VERSION(4, 0, 0)
gVScrollbar = gtk_scrollbar_new(GTK_ORIENTATION_VERTICAL, nullptr);
gtk_fixed_put(GTK_FIXED(gDumbContainer), gVScrollbar, 0, 0);
- gtk_widget_show(gVScrollbar);
+ gtk_widget_set_visible(gVScrollbar, true);
mpVScrollbarStyle = gtk_widget_get_style_context(gVScrollbar);
mpHScrollbarStyle = gtk_widget_get_style_context(gHScrollbar);
gTextView = gtk_text_view_new();
gtk_fixed_put(GTK_FIXED(gDumbContainer), gTextView, 0, 0);
- gtk_widget_show(gTextView);
+ gtk_widget_set_visible(gTextView, true);
#else
mpVScrollbarStyle = createStyleContext(GtkControlPart::ScrollbarVertical);
mpVScrollbarContentsStyle =
createStyleContext(GtkControlPart::ScrollbarVerticalContents);
diff --git a/vcl/unx/gtk3_kde5/gtk3_kde5_filepicker_ipc.cxx
b/vcl/unx/gtk3_kde5/gtk3_kde5_filepicker_ipc.cxx
index ebfa0fbd7e16..eb7e88af5183 100644
--- a/vcl/unx/gtk3_kde5/gtk3_kde5_filepicker_ipc.cxx
+++ b/vcl/unx/gtk3_kde5/gtk3_kde5_filepicker_ipc.cxx
@@ -165,7 +165,7 @@ sal_Int16 Gtk3KDE5FilePickerIpc::execute()
gtk_window_set_default_size(GTK_WINDOW(pDummyDialog), 0, 0);
gtk_window_set_accept_focus(GTK_WINDOW(pDummyDialog), false);
// gtk_widget_set_opacity() only has the desired effect when widget is
already shown
- gtk_widget_show(pDummyDialog);
+ gtk_widget_set_visible(pDummyDialog, true);
gtk_widget_set_opacity(pDummyDialog, 0);
// run dialog, leaving event processing to GTK
// dialog will be closed by the separate 'aIpcHandler' thread once the IPC
response is there
