vcl/unx/gtk3/gtkinst.cxx | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
New commits:
commit 94d552f94b427f884c004dba5d4619ecf729d605
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Fri Jun 18 10:46:22 2021 +0100
Commit: Caolán McNamara <caol...@redhat.com>
CommitDate: Fri Jun 18 14:45:03 2021 +0200
rename signalToggled to signalMenuButtonToggled
Change-Id: I10a4d08d2c4cc7482e0a46a4a1039918ef4dc51f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/117436
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caol...@redhat.com>
diff --git a/vcl/unx/gtk3/gtkinst.cxx b/vcl/unx/gtk3/gtkinst.cxx
index 2ca05ce469db..4f2add97a9e4 100644
--- a/vcl/unx/gtk3/gtkinst.cxx
+++ b/vcl/unx/gtk3/gtkinst.cxx
@@ -9229,14 +9229,14 @@ private:
#endif
#if GTK_CHECK_VERSION(4, 0, 0)
- static void signalToggled(GtkToggleButton*, gpointer widget)
+ static void signalMenuButtonToggled(GtkToggleButton*, gpointer widget)
{
GtkInstanceMenuButton* pThis =
static_cast<GtkInstanceMenuButton*>(widget);
SolarMutexGuard aGuard;
pThis->signal_toggled();
}
#else
- static void signalToggled(GtkWidget*, gpointer widget)
+ static void signalMenuButtonToggled(GtkWidget*, gpointer widget)
{
GtkInstanceMenuButton* pThis =
static_cast<GtkInstanceMenuButton*>(widget);
SolarMutexGuard aGuard;
@@ -9528,7 +9528,7 @@ public:
GtkWidget* pToggleButton =
gtk_widget_get_first_child(GTK_WIDGET(m_pMenuButton));
assert(GTK_IS_TOGGLE_BUTTON(pToggleButton));
m_pMenuButtonToggleButton = GTK_TOGGLE_BUTTON(pToggleButton);
- m_nToggleSignalId = g_signal_connect(m_pMenuButtonToggleButton,
"toggled", G_CALLBACK(signalToggled), this);
+ m_nToggleSignalId = g_signal_connect(m_pMenuButtonToggleButton,
"toggled", G_CALLBACK(signalMenuButtonToggled), this);
GtkWidget* pChild = gtk_button_get_child(GTK_BUTTON(pToggleButton));
m_pBox = GTK_IS_BOX(pChild) ? GTK_BOX(pChild) : nullptr;
m_pLabel = m_pBox ? gtk_widget_get_first_child(GTK_WIDGET(m_pBox)) :
nullptr;
@@ -9900,7 +9900,7 @@ public:
gtk_window_set_type_hint(m_pMenuHack,
GDK_WINDOW_TYPE_HINT_COMBO);
gtk_window_set_modal(m_pMenuHack, true);
gtk_window_set_resizable(m_pMenuHack, false);
- m_nSignalId =
g_signal_connect(GTK_TOGGLE_BUTTON(m_pMenuButton), "toggled",
G_CALLBACK(signalToggled), this);
+ m_nSignalId =
g_signal_connect(GTK_TOGGLE_BUTTON(m_pMenuButton), "toggled",
G_CALLBACK(signalMenuButtonToggled), this);
g_signal_connect(m_pMenuHack, "grab-broken-event",
G_CALLBACK(signalGrabBroken), this);
g_signal_connect(m_pMenuHack, "button-release-event",
G_CALLBACK(signalButtonRelease), this);
g_signal_connect(m_pMenuHack, "key-press-event",
G_CALLBACK(keyPress), this);
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
