From 6879fd57297788849a9019e6a883cfe2f9a649e8 Mon Sep 17 00:00:00 2001
From: ajgenius <ajgenius@lazarus-ide.org>
Date: Thu, 18 Dec 2003 15:15:13 +0000
Subject: [PATCH] fix NIL style crash and GTK2 Compiling

git-svn-id: trunk@4904 -
---
 lcl/interfaces/gtk/gtkproc.inc | 13 ++++++++-----
 lcl/interfaces/gtk/gtkproc.pp  |  1 +
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/lcl/interfaces/gtk/gtkproc.inc b/lcl/interfaces/gtk/gtkproc.inc
index 6660386980..a1a8f4e817 100644
--- a/lcl/interfaces/gtk/gtkproc.inc
+++ b/lcl/interfaces/gtk/gtkproc.inc
@@ -4603,7 +4603,7 @@ begin
   If Not Assigned(Styles) then
     exit;
   l:=IndexOfStyle(WName);
-  //writeln('GetStyle A ',WName,' ',l);
+//  writeln('GetStyle A ',WName,' ',l);
   If l < 0 then begin
     // create a new style object
     StyleObject := NewStyleObject;
@@ -4651,7 +4651,7 @@ begin
         StyleObject^.Widget := nil;
         GTK_Tooltips_Force_Window(TP);
         gtk_widget_ensure_style(PGTKTooltips(TP)^.Tip_Window);
-        StyleObject^.Style:=GTK_RC_GET_STYLE(PGTKTooltips(TP)^.Tip_Window);
+        StyleObject^.Style:=gtk_widget_get_style(PGTKTooltips(TP)^.Tip_Window);
       end
     else
       If AnsiCompareText(WName,'gtk_default')=0 then begin
@@ -4665,7 +4665,7 @@ begin
     // ensure style of the widget
     If (StyleObject^.Widget <> nil) then begin
       gtk_widget_ensure_style(StyleObject^.Widget);
-      StyleObject^.Style:=GTK_RC_GET_STYLE(StyleObject^.Widget);
+      StyleObject^.Style:=gtk_widget_get_style(StyleObject^.Widget);
       // ToDo: find out, why sometimes the style is not initialized.
       // for example: why the following occurs:
        If AnsiCompareText(WName,'button')=0 then begin
@@ -5004,10 +5004,10 @@ begin
       begin
         ThemeWidget:=GetWidgetWithBackgroundWindow(ThemeWidget);
         if ThemeWidget<>nil then begin
-          if GtkWidgetIsA(ThemeWidget,GTK_LIST_ITEM_TYPE) then
+          if GtkWidgetIsA(ThemeWidget,GTK_TYPE_LIST_ITEM) then
             Style:=GetStyle('list');
           if Style=nil then
-            Style:=PGtkStyle(ThemeWidget^.thestyle);
+            Style:=PGtkStyle(gtk_widget_get_style(ThemeWidget));
         end;
         if Style=nil then
           Style := GetStyle('default');
@@ -5620,6 +5620,9 @@ end;
 { =============================================================================
 
   $Log$
+  Revision 1.233  2003/12/18 15:15:13  ajgenius
+  fix NIL style crash and GTK2 Compiling
+
   Revision 1.232  2003/11/30 18:35:20  mattias
   fixed fpc 1.9.1 warns
 
diff --git a/lcl/interfaces/gtk/gtkproc.pp b/lcl/interfaces/gtk/gtkproc.pp
index f3a4914742..2f7a7fd867 100644
--- a/lcl/interfaces/gtk/gtkproc.pp
+++ b/lcl/interfaces/gtk/gtkproc.pp
@@ -75,6 +75,7 @@ uses
   function  GTK_TYPE_SCROLLBAR : TGTKType; cdecl; external gtkdll name 'gtk_scrollbar_get_type';
   function  GTK_TYPE_HSCROLLBAR : TGTKType; cdecl; external gtkdll name 'gtk_hscrollbar_get_type';
   function  GTK_TYPE_VSCROLLBAR : TGTKType; cdecl; external gtkdll name 'gtk_vscrollbar_get_type';
+  function  GTK_TYPE_LIST_ITEM : TGTKType; cdecl; external gtkdll name 'gtk_list_item_get_type';
 {$ENDIF}
 
 procedure laz_gdk_gc_set_dashes(gc:PGdkGC; dash_offset:gint;