diff --git a/lcl/interfaces/gtk/gtkcallback.inc b/lcl/interfaces/gtk/gtkcallback.inc index 16752cc468..8133fea84a 100644 --- a/lcl/interfaces/gtk/gtkcallback.inc +++ b/lcl/interfaces/gtk/gtkcallback.inc @@ -299,8 +299,8 @@ begin if GtkWidgetIsA(Widget, gtk_window_get_type) then Mess.ActiveWindow:=HWnd(PGTKWindow(Widget)^.focus_widget); Mess.Result := 0; + //DebugLn('gtkactivateCB ',DbgSName(TObject(Data))); DeliverMessage(Data, Mess); - //DebugLn('gtkactivateCB ',TWinControl(Data).Name,':',TWinControl(Data).ClassName); Result := CallBackDefaultReturn; end; diff --git a/lcl/interfaces/gtk/gtkproc.inc b/lcl/interfaces/gtk/gtkproc.inc index c60af5dec0..1f7e166a6a 100644 --- a/lcl/interfaces/gtk/gtkproc.inc +++ b/lcl/interfaces/gtk/gtkproc.inc @@ -4942,7 +4942,7 @@ begin else begin {$IfDef GTK2} Assert(GtkWidgetIsA(Widget,GTK_TYPE_WINDOW)); - gtk_window_add_accel_group(GTK_WINDOW(widget), AnAccelGroup) + gtk_window_add_accel_group(GTK_WINDOW(widget), AnAccelGroup); {$else} gtk_accel_group_attach(AnAccelGroup, PGtkObject(Widget)); {$endif} diff --git a/lcl/interfaces/gtk/gtkwsmenus.pp b/lcl/interfaces/gtk/gtkwsmenus.pp index 48d3748116..6e1a489199 100644 --- a/lcl/interfaces/gtk/gtkwsmenus.pp +++ b/lcl/interfaces/gtk/gtkwsmenus.pp @@ -174,7 +174,11 @@ procedure TGtkWSMenuItem.SetShortCut(const AMenuItem: TMenuItem; const OldShortCut, NewShortCut: TShortCut); begin Accelerate(AMenuItem, PGtkWidget(AMenuItem.Handle), NewShortcut, - {$Ifdef GTK2}'activate'{$Else}'activate_item'{$EndIF}); + // The LCL already delegates the menu shortcuts. + // just call a dummy callback + 'grab-focus' + //{$Ifdef GTK2}'activate'{$Else}'activate_item'{$EndIF} + ); end; procedure TGtkWSMenuItem.SetVisible(const AMenuItem: TMenuItem;