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

LCL: fix compilation with FPC 3.0.0

Browse Source 
git-svn-id: trunk@57177 -
This commit is contained in:
ondrej 2018-01-29 08:31:33 +00:00
parent 2b68fd9b02
commit d5a2162347
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lcl/interfaces/gtk2/gtk2proc.inc
View File

@ -4268,7 +4268,7 @@ var
begin begin
// page has valid image // page has valid image
IconSize := TheNoteBook.Images.SizeForPPI[TheNoteBook.ImagesWidth, TheNoteBook.Font.PixelsPerInch]; IconSize := TheNoteBook.Images.SizeForPPI[TheNoteBook.ImagesWidth, TheNoteBook.Font.PixelsPerInch];
HasIcon := (IconSize.Width>0) and (IconSize.Height>0); HasIcon := (IconSize.cx>0) and (IconSize.cy>0);
end; end;
if HasIcon then if HasIcon then
@ -4278,7 +4278,7 @@ var
begin begin
// there is already an icon widget for the image in the tab // there is already an icon widget for the image in the tab
// -> resize the icon widget // -> resize the icon widget
gtk_widget_set_usize(TabImageWidget,IconSize.Width,IconSize.Height); gtk_widget_set_usize(TabImageWidget,IconSize.cx,IconSize.cy);
end else end else
begin begin
// there is no pixmap for the image in the tab // there is no pixmap for the image in the tab
@ -4287,7 +4287,7 @@ var
g_signal_connect(PgtkObject(TabImageWidget), 'expose_event', g_signal_connect(PgtkObject(TabImageWidget), 'expose_event',
TGTKSignalFunc(@PageIconWidgetExposeAfter), ThePage); TGTKSignalFunc(@PageIconWidgetExposeAfter), ThePage);
g_object_set_data(PGObject(TabWidget), 'TabImage', TabImageWidget); g_object_set_data(PGObject(TabWidget), 'TabImage', TabImageWidget);
gtk_widget_set_usize(TabImageWidget, IconSize.Width, IconSize.Height); gtk_widget_set_usize(TabImageWidget, IconSize.cx, IconSize.cy);
gtk_widget_show(TabImageWidget); gtk_widget_show(TabImageWidget);
gtk_box_pack_start_defaults(PGtkBox(TabWidget), TabImageWidget); gtk_box_pack_start_defaults(PGtkBox(TabWidget), TabImageWidget);
gtk_box_reorder_child(PGtkBox(TabWidget), TabImageWidget, 0); gtk_box_reorder_child(PGtkBox(TabWidget), TabImageWidget, 0);
@ -4296,7 +4296,7 @@ var
begin begin
// there is already an icon widget for the image in the menu // there is already an icon widget for the image in the menu
// -> resize the icon widget // -> resize the icon widget
gtk_widget_set_usize(MenuImageWidget, IconSize.Width, IconSize.Height); gtk_widget_set_usize(MenuImageWidget, IconSize.cx, IconSize.cy);
end else end else
begin begin
// there is no icon widget for the image in the menu // there is no icon widget for the image in the menu
@ -4304,7 +4304,7 @@ var
MenuImageWidget:=gtk_label_new(#0); MenuImageWidget:=gtk_label_new(#0);
g_signal_connect_after(PgtkObject(MenuImageWidget), 'expose_event', g_signal_connect_after(PgtkObject(MenuImageWidget), 'expose_event',
TGTKSignalFunc(@PageIconWidgetExposeAfter), ThePage); TGTKSignalFunc(@PageIconWidgetExposeAfter), ThePage);
gtk_widget_set_usize(MenuImageWidget,IconSize.Width,IconSize.Height); gtk_widget_set_usize(MenuImageWidget,IconSize.cx,IconSize.cy);
g_object_set_data(PGObject(MenuWidget),'TabImage',MenuImageWidget); g_object_set_data(PGObject(MenuWidget),'TabImage',MenuImageWidget);
gtk_widget_show(MenuImageWidget); gtk_widget_show(MenuImageWidget);
gtk_box_pack_start_defaults(PGtkBox(MenuWidget),MenuImageWidget); gtk_box_pack_start_defaults(PGtkBox(MenuWidget),MenuImageWidget);