From 12b4bd48c0fe2e3543574f555b1fb3069f571188 Mon Sep 17 00:00:00 2001 From: mattias Date: Tue, 26 Oct 2010 09:27:49 +0000 Subject: [PATCH] gtk2: clean up git-svn-id: trunk@27877 - --- lcl/interfaces/gtk2/gtk2themes.pas | 4 ++-- lcl/interfaces/gtk2/gtk2wscomctrls.pp | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lcl/interfaces/gtk2/gtk2themes.pas b/lcl/interfaces/gtk2/gtk2themes.pas index fbaffa9c45..cd17fb88ef 100644 --- a/lcl/interfaces/gtk2/gtk2themes.pas +++ b/lcl/interfaces/gtk2/gtk2themes.pas @@ -724,7 +724,7 @@ begin if g_object_get_data(PGObject(Widget), 'lcl-images-change-callback') = nil then begin Signal := g_signal_connect(ASettings, 'notify::gtk-button-images', TGCallback(@ButtonImagesChange), Self); - g_object_set_data(PGObject(Widget), 'lcl-images-change-callback', Pointer(Signal)) + g_object_set_data(PGObject(Widget), 'lcl-images-change-callback', Pointer(PtrUInt(Signal))) end; end; toShowMenuImages: @@ -737,7 +737,7 @@ begin if g_object_get_data(PGObject(Widget), 'lcl-images-change-callback') = nil then begin Signal := g_signal_connect(ASettings, 'notify::gtk-menu-images', TGCallback(@MenuImagesChange), Self); - g_object_set_data(PGObject(Widget), 'lcl-images-change-callback', Pointer(Signal)) + g_object_set_data(PGObject(Widget), 'lcl-images-change-callback', Pointer(PtrUInt(Signal))) end; end; else diff --git a/lcl/interfaces/gtk2/gtk2wscomctrls.pp b/lcl/interfaces/gtk2/gtk2wscomctrls.pp index 34a62c12de..685a047a2e 100644 --- a/lcl/interfaces/gtk2/gtk2wscomctrls.pp +++ b/lcl/interfaces/gtk2/gtk2wscomctrls.pp @@ -421,11 +421,11 @@ end; class procedure TGtk2WSProgressBar.InternalSetStyle( AProgressBar: PGtkProgressBar; AStyle: TProgressBarStyle); begin - g_object_set_data(PGObject(AProgressBar), 'ProgressStyle', Pointer(Ord(AStyle))); + g_object_set_data(PGObject(AProgressBar), 'ProgressStyle', Pointer(PtrUInt(Ord(AStyle)))); if AStyle = pbstMarquee then begin g_object_set_data_full(PGObject(AProgressBar), 'timeout', - Pointer(g_timeout_add(100, @ProgressPulseTimeout, AProgressBar)), @ProgressDestroy); + Pointer(PtrUInt(g_timeout_add(100, @ProgressPulseTimeout, AProgressBar))), @ProgressDestroy); gtk_progress_bar_pulse(AProgressBar); end; end;