From 0a9930944d3fdbb7323858ecefcc27e28bd70a34 Mon Sep 17 00:00:00 2001
From: lazarus <lazarus@lazarus-ide.org>
Date: Sat, 9 Feb 2002 01:47:12 +0000
Subject: [PATCH] AJ: TCustomLabel Autosize, TCustomCheckbox '&' shortcuts
 started

git-svn-id: trunk@875 -
---
 lcl/interfaces/gtk/gtkobject.inc | 31 +++++++++++++++++++++++++------
 1 file changed, 25 insertions(+), 6 deletions(-)

diff --git a/lcl/interfaces/gtk/gtkobject.inc b/lcl/interfaces/gtk/gtkobject.inc
index 4b29611519..0c09671b3b 100644
--- a/lcl/interfaces/gtk/gtkobject.inc
+++ b/lcl/interfaces/gtk/gtkobject.inc
@@ -1922,7 +1922,9 @@ begin
         case TControl(Sender).fCompStyle of
           csBitBtn,
           csButton,
-          csToolButton:
+          csToolButton,
+          csRadioButton,
+          csCheckBox:
             Accelerate(Widget, TLMShortcut(data^), 'clicked');
           else
             Accelerate(Widget, TLMShortcut(data^), 'activate_item');
@@ -2218,9 +2220,19 @@ begin
       end;
     end;
 
-  csCheckBox    : gtk_label_set_text(
+  csCheckBox    :
+    begin
+      aLabel := Ampersands2Underscore(PLabel);
+      Try
+        gtk_label_set_text(
                     pGtkLabel(pgtkCheckButton(p)^.Toggle_Button.Button.Child),
-                    pLabel);
+                    aLabel);
+        gtk_label_parse_uline(pGtkLabel(pgtkCheckButton(p)^.Toggle_Button.Button.Child),
+          aLabel);
+      Finally
+        StrDispose(aLabel);
+      end;
+    end;
 
   csGroupBox    : gtk_frame_set_label(pgtkFrame(P),pLabel);
 
@@ -4081,11 +4093,15 @@ begin
           end;  
         end;
       end;
+      Accel := Ampersands2Underscore(StrTemp);
       if TempWidget <> nil then
-        P:= gtk_radio_button_new_with_label(PGtkRadioButton(TempWidget)^.group, StrTemp)
+        P:= gtk_radio_button_new_with_label(PGtkRadioButton(TempWidget)^.group, Accel)
       else  
-        P:= gtk_radio_button_new_with_label(nil, StrTemp);
-    end;  
+        P:= gtk_radio_button_new_with_label(nil, Accel);
+      With PGTKToggleButton(P)^ do
+        gtk_label_parse_uline(pGtkLabel(Button.Child), Accel);
+      StrDispose(Accel);
+    end;
 
   csScrollBar :
     begin
@@ -5879,6 +5895,9 @@ end;
  { =============================================================================
 
   $Log$
+  Revision 1.227  2002/10/03 00:08:50  lazarus
+  AJ: TCustomLabel Autosize, TCustomCheckbox '&' shortcuts started
+
   Revision 1.226  2002/10/01 10:12:34  lazarus
   MG: added SendCachedLCLMessages to interfacebase for wysiwyg