diff --git a/docs/Contributors.txt b/docs/Contributors.txt
index 92b17dfd51..b96df4df38 100644
--- a/docs/Contributors.txt
+++ b/docs/Contributors.txt
@@ -17,6 +17,7 @@ Jeroen van Idekinge
 Jesus Reyes
 Karl Brandt
 Keith Bowes
+Ladislav Michl
 Luis R. Hilario B.
 Marc Weustink
 Martin Patik
diff --git a/ide/lazarus.pp b/ide/lazarus.pp
index 7e971dd601..76e1543f39 100644
--- a/ide/lazarus.pp
+++ b/ide/lazarus.pp
@@ -80,6 +80,7 @@ begin
   if (SplashForm<>nil) then
     SplashForm.StartTimer;
   try
+  writeln(Application.MainForm.ClassName);
     Application.Run;
   except
     writeln('lazarus.pp - unhandled exception');
@@ -99,6 +100,9 @@ end.
 
 {
   $Log$
+  Revision 1.57  2004/04/24 20:57:18  mattias
+  fixed gtk2 for drawing list item  from Ladislav
+
   Revision 1.56  2004/04/09 10:32:02  mattias
   FindInFilesDialog size is now stored
 
diff --git a/lcl/interfaces/gtk/gtklistsl.inc b/lcl/interfaces/gtk/gtklistsl.inc
index 8788e30177..52b23ca896 100644
--- a/lcl/interfaces/gtk/gtklistsl.inc
+++ b/lcl/interfaces/gtk/gtklistsl.inc
@@ -115,6 +115,17 @@ begin
   end;
 end;
 
+{------------------------------------------------------------------------------
+function gtkListItemExposeEvent(Widget: PGtkWidget;
+  Event : PGdkEventExpose; data: gPointer): GBoolean; cdecl;
+
+  GTK2 helper for drawing every item in a TGtkListStringList.
+------------------------------------------------------------------------------}
+function gtkListItemExposeEvent(Widget: PGtkWidget;
+  Event : PGdkEventExpose; data: gPointer): GBoolean; cdecl;
+begin
+  Result := gtkListItemDrawAfterCB(Widget, @Event^.Area, data);
+end;
 
 {*************************************************************}
 {                      TGtkListStringList methods             }
@@ -196,8 +207,13 @@ begin
   //' Owner=',HexStr(Cardinal(Owner),8),'=',Owner.ClassName,
   //' LI=',HexStr(Cardinal(LI),8),
   //' ');
+  {$ifdef GTK2}
+  g_signal_connect_after(G_OBJECT(li), 'expose_event',
+                         G_CALLBACK(@gtkListItemExposeEvent), li);
+  {$else}
   gtk_signal_connect_after(PGtkObject(li), 'draw',
                            TGTKSignalFunc(@gtkListItemDrawAfterCB),li);
+  {$endif}		    
 end;
 
 {------------------------------------------------------------------------------
@@ -226,8 +242,13 @@ begin
   ListItem:=FCachedItems[Index];
   gtk_object_set_data(PGtkObject(ListItem),GtkListItemLCLListTag,nil);
   gtk_object_set_data(PGtkObject(ListItem),GtkListItemGtkListTag,nil);
+  {$ifdef GTK2}
+  g_signal_handlers_disconnect_by_func(
+    G_OBJECT(ListItem),G_CALLBACK(@gtkListItemExposeEvent),ListItem);
+  {$else}
   gtk_signal_disconnect_by_func(
-    PGtkObject(ListItem), TGTKSignalFunc(@gtkListItemDrawAfterCB),ListItem);
+    PGtkObject(ListItem),TGTKSignalFunc(@gtkListItemDrawAfterCB),ListItem);
+  {$endif}
 end;
 
 {------------------------------------------------------------------------------
@@ -760,6 +781,9 @@ end;
 { =============================================================================
 
   $Log$
+  Revision 1.22  2004/04/24 20:57:18  mattias
+  fixed gtk2 for drawing list item  from Ladislav
+
   Revision 1.21  2003/09/18 12:15:01  mattias
   fixed is checks for TCustomXXX controls