mirror of
https://gitlab.com/freepascal.org/lazarus/lazarus.git
synced 2025-09-28 18:49:43 +02:00
Fixed gtk2 combobox painting
git-svn-id: trunk@11263 -
This commit is contained in:
parent
af2a30e7d4
commit
c88e03d97c
@ -119,7 +119,8 @@ begin
|
|||||||
ItemIndex := StrToInt(gtk_tree_path_to_string(ItemPath));
|
ItemIndex := StrToInt(gtk_tree_path_to_string(ItemPath));
|
||||||
end
|
end
|
||||||
else if AWinControl is TCustomComboBox then begin
|
else if AWinControl is TCustomComboBox then begin
|
||||||
MenuItem := g_object_get_data(G_OBJECT(cell), 'MenuItem');
|
// ComboItem is set in gtk2wsstdctrls
|
||||||
|
MenuItem := g_object_get_data(G_OBJECT(cell), 'ComboItem');
|
||||||
if MenuItem <> nil then begin
|
if MenuItem <> nil then begin
|
||||||
Menu := PGtkMenuShell(gtk_widget_get_parent(PGtkWidget(MenuItem)));
|
Menu := PGtkMenuShell(gtk_widget_get_parent(PGtkWidget(MenuItem)));
|
||||||
if Menu <> nil then
|
if Menu <> nil then
|
||||||
|
@ -819,6 +819,7 @@ begin
|
|||||||
gtk_cell_layout_set_attributes(AItem, renderer, ['text', 0, nil]);
|
gtk_cell_layout_set_attributes(AItem, renderer, ['text', 0, nil]);
|
||||||
SetMainWidget(WidgetInfo^.CoreWidget, AItem);
|
SetMainWidget(WidgetInfo^.CoreWidget, AItem);
|
||||||
g_object_set_data(G_OBJECT(AItem), 'ComboItem', AComboItem);
|
g_object_set_data(G_OBJECT(AItem), 'ComboItem', AComboItem);
|
||||||
|
// used in gtk2cellrenderer. if you change this update cellrenderer as well - AH
|
||||||
g_object_set_data(G_OBJECT(renderer), 'ComboItem', AComboItem);
|
g_object_set_data(G_OBJECT(renderer), 'ComboItem', AComboItem);
|
||||||
end;
|
end;
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user