From cdad49e2bd3bee853e60eee61ee4dfdc3988131b Mon Sep 17 00:00:00 2001
From: paul <paul@lazarus-ide.org>
Date: Thu, 25 Oct 2007 01:53:16 +0000
Subject: [PATCH] gtk: simplify UpdateStatusBarPanel and reduce gtk warings in
 console

git-svn-id: trunk@12582 -
---
 lcl/interfaces/gtk/gtkglobals.pp | 24 +++++++++++++++++-----
 lcl/interfaces/gtk/gtkproc.inc   | 35 +++++++++++++-------------------
 2 files changed, 33 insertions(+), 26 deletions(-)

diff --git a/lcl/interfaces/gtk/gtkglobals.pp b/lcl/interfaces/gtk/gtkglobals.pp
index d08204130e..b2554d20f9 100644
--- a/lcl/interfaces/gtk/gtkglobals.pp
+++ b/lcl/interfaces/gtk/gtkglobals.pp
@@ -25,8 +25,8 @@ uses
   {$ELSE}
   glib, gdk, gtk,
   {$ENDIF}
-  LMessages, LCLProc, Controls, Forms, LCLIntf, LCLType, GTKDef, DynHashArray,
-  Maps;
+  LMessages, LCLProc, Controls, ComCtrls, Forms, LCLIntf, LCLType, GTKDef,
+  DynHashArray, Maps;
 
 {$I dragicons.inc}
 
@@ -391,10 +391,24 @@ var
   
 const
   aGtkJustification: array[TAlignment] of TGTKJustification =
-    (GTK_JUSTIFY_LEFT,GTK_JUSTIFY_RIGHT,GTK_JUSTIFY_CENTER);
+  (
+{taLeftJustify } GTK_JUSTIFY_LEFT,
+{taRightJustify} GTK_JUSTIFY_RIGHT,
+{taCenter      } GTK_JUSTIFY_CENTER
+  );
 
-  aGtkSelectionMode: Array[Boolean] of TGtkSelectionMode =
-    (GTK_SELECTION_SINGLE,GTk_SELECTION_EXTENDED);
+  aGtkSelectionMode: array[Boolean] of TGtkSelectionMode =
+  (
+    GTK_SELECTION_SINGLE,
+    GTK_SELECTION_EXTENDED
+  );
+
+  aGtkShadowFromBevel: array[TStatusPanelBevel] of TGtkShadowType =
+  (
+{ pbNone    } GTK_SHADOW_NONE,
+{ pbLowered } GTK_SHADOW_IN,
+{ pbRaised  } GTK_SHADOW_OUT
+  );
 
   { file dialog }
 
diff --git a/lcl/interfaces/gtk/gtkproc.inc b/lcl/interfaces/gtk/gtkproc.inc
index 0a6b81771d..ac87adac62 100644
--- a/lcl/interfaces/gtk/gtkproc.inc
+++ b/lcl/interfaces/gtk/gtkproc.inc
@@ -6363,8 +6363,8 @@ begin
   //  ' frame=',GetWidgetClassName(PGTKStatusBar(StatusPanelWidget)^.frame),
   //  ' thelabel=',GetWidgetClassName(PGTKStatusBar(StatusPanelWidget)^.thelabel),
   // '');
-  FrameWidget:=PGTKStatusBar(StatusPanelWidget)^.frame;
-  LabelWidget:=PGtkLabel({$ifdef gtk2}PGTKStatusBar(StatusPanelWidget)^._label{$else}PGTKStatusBar(StatusPanelWidget)^.thelabel{$endif});
+  FrameWidget := PGTKStatusBar(StatusPanelWidget)^.frame;
+  LabelWidget := PGtkLabel({$ifdef gtk2}PGTKStatusBar(StatusPanelWidget)^._label{$else}PGTKStatusBar(StatusPanelWidget)^.thelabel{$endif});
 
   // Text
   if AStatusBar.SimplePanel then
@@ -6384,32 +6384,25 @@ begin
 
 
   // Alignment
-  if CurPanel<>nil then begin
+  if CurPanel<>nil then
+  begin
     //DebugLn('  Alignment="',ord(CurPanel.Alignment),'"');
-    case CurPanel.Alignment of
-    taLeftJustify: NewJustification:=GTK_JUSTIFY_LEFT;
-    taRightJustify: NewJustification:=GTK_JUSTIFY_RIGHT;
-    taCenter: NewJustification:=GTK_JUSTIFY_CENTER;
-    else
-      NewJustification:=GTK_JUSTIFY_LEFT;
-    end;
-    gtk_label_set_justify(LabelWidget,NewJustification);
+    NewJustification := aGtkJustification[CurPanel.Alignment];
+    if GTK_IS_LABEL(LabelWidget) then
+      gtk_label_set_justify(LabelWidget, NewJustification);
   end;
 
   // Bevel
-  if CurPanel<>nil then begin
-    case CurPanel.Bevel of
-    pbNone: NewShadowType:=GTK_SHADOW_NONE;
-    pbLowered: NewShadowType:=GTK_SHADOW_IN;
-    pbRaised: NewShadowType:=GTK_SHADOW_OUT;
-    else
-      NewShadowType:=GTK_SHADOW_IN;
-    end;
-    gtk_frame_set_shadow_type(PGtkFrame(FrameWidget),NewShadowType);
+  if CurPanel<>nil then
+  begin
+    NewShadowType := aGtkShadowFromBevel[CurPanel.Bevel];
+    if GTK_IS_FRAME(FrameWidget) then
+      gtk_frame_set_shadow_type(PGtkFrame(FrameWidget), NewShadowType);
   end;
 
   // Width
-  if (CurPanel<>nil) then begin
+  if (CurPanel<>nil) then
+  begin
     //DebugLn('  CurPanel.Width="',CurPanel.Width,'"');
     gtk_widget_set_usize(StatusPanelWidget,CurPanel.Width,
       StatusPanelWidget^.allocation.height);