paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-09-13 17:19:09 +02:00
Code Issues Packages Projects Releases Wiki Activity

Gtk2: fixed bug with gtk menu radio buttons which doesn't take autocheck param into account.

Browse Source 
git-svn-id: trunk@24183 -
This commit is contained in:
zeljko 2010-03-23 16:07:51 +00:00
parent 8b3fc5709e
commit 7b2852cad0
1 changed files with 35 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
lcl/interfaces/gtk2/gtk2wsmenus.pp
View File

@ -134,12 +134,45 @@ end;
function Gtk2MenuItemToggled(AMenuItem: PGTKCheckMenuItem;
AData: gPointer): GBoolean; cdecl;
// AData --> LCLMenuItem: TMenuItem
var
LCLMenuItem: TMenuItem;
Mess: TLMessage;
b: Boolean;
w: PGtkWidget;
WidgetInfo: PWidgetInfo;
begin
Result := CallBackDefaultReturn;
{$IFDEF EventTrace}
EventTrace('toggled', AData);
{$ENDIF}
if LockOnChange(PgtkObject(AMenuItem),0) > 0 then Exit;
LCLMenuItem := TMenuItem(AData);
if (csDesigning in LCLMenuItem.ComponentState) or
not LCLMenuItem.RadioItem or LCLMenuItem.AutoCheck then
exit;
w := gtk_get_event_widget(gtk_get_current_event);
b := gtk_check_menu_item_get_active(AMenuItem);
if not LCLMenuItem.Checked then
g_signal_stop_emission_by_name(AMenuItem, 'toggled')
else
g_signal_stop_emission_by_name(AMenuItem, 'activate');
gtk_check_menu_item_set_active(AMenuItem, LCLMenuItem.Checked);
{we must trigger OnClick() somehow, since we stopped signals}
if b and (w <> nil) and (w <> PGtkWidget(AMenuItem)) then
begin
WidgetInfo := GetWidgetInfo(w);
if GTK_IS_RADIO_MENU_ITEM(w) then
begin
FillChar(Mess,SizeOf(Mess),#0);
Mess.Msg := LM_ACTIVATE;
WidgetInfo^.LCLObject.Dispatch(Mess);
end;
end;
end;
function Gtk2MenuItemSelect(item: Pointer; AMenuItem: TMenuItem): GBoolean; cdecl;
@ -291,7 +324,7 @@ begin
gtk_check_menu_item_set_active(PGtkCheckMenuItem(Widget),
AMenuItem.Checked);
g_signal_connect_after(PGTKObject(Widget), 'toggled',
g_signal_connect(PGTKObject(Widget), 'toggled',
TGTKSignalFunc(@Gtk2MenuItemToggled), Pointer(AMenuItem));
end;