From 8ae7b2bb457f6e820d9830eae2dbe6b0fcc82be8 Mon Sep 17 00:00:00 2001 From: martin Date: Thu, 18 Feb 2021 01:37:06 +0000 Subject: [PATCH] Merged revision(s) 63732 #c5dd93a0e4, 64473 #bef5ada271 from trunk: LCL-GTK2: Apply DisplaySettings properties of TCalendar also during runtime. Issue #37450, patch from Cyrax. ........ LCL-GTK2: Prevent a warning caused by a popup menu code. Issue #38402, patch from Petr-K. ........ git-svn-id: branches/fixes_2_0@64615 - --- lcl/interfaces/gtk2/gtk2wsstdctrls.pp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/lcl/interfaces/gtk2/gtk2wsstdctrls.pp b/lcl/interfaces/gtk2/gtk2wsstdctrls.pp index 6e9b93aa7d..d9efcaf8aa 100644 --- a/lcl/interfaces/gtk2/gtk2wsstdctrls.pp +++ b/lcl/interfaces/gtk2/gtk2wsstdctrls.pp @@ -1818,8 +1818,9 @@ begin g_signal_connect_after(AMenu, 'selection-done', G_CALLBACK(@GtkPopupHideCB), AWidgetInfo); end; - g_signal_connect_after(PGtkObject(GTK_BIN(ComboWidget)^.child), 'populate-popup', - gtk_signal_func(@gtkDefaultPopupMenuCloseFix), AWidgetInfo); + if TCustomComboBox(AWinControl).Style.HasEditBox then + g_signal_connect_after(PGtkObject(GTK_BIN(ComboWidget)^.child), 'populate-popup', + gtk_signal_func(@gtkDefaultPopupMenuCloseFix), AWidgetInfo); if (gtk_major_version >= 2) and (gtk_minor_version >= 10) then g_signal_connect(ComboWidget, 'notify', TGCallback(@GtkNotifyCB), AWidgetInfo);