LCL: fix shortcut handling for TButton and TCheckBox

git-svn-id: trunk@12133 -

lcl/controls.pp

@@ -1710,6 +1710,7 @@ type
     procedure UpdateControlState;
     procedure UpdateShowing; virtual;
     procedure WndProc(var Message: TLMessage); override;
+    procedure WSSetText(const AText: String); virtual;
   protected
     // properties which are not supported by all descendents
     property BorderStyle: TBorderStyle read GetBorderStyle write SetBorderStyle default bsNone;
@@ -3272,3 +3273,4 @@ finalization
 end.
 
 
+

lcl/include/buttons.inc

@@ -260,24 +260,6 @@ begin
   end;
 end;
 
-procedure TCustomButton.RealSetText(const Value: TCaption);
-var
-  ParseStr : String;
-  AccelIndex : Longint;
-  OldShortCut: TShortCut;
-begin
-  inherited RealSetText(Value);
-  If (not HandleAllocated) or (csDesigning in ComponentState) then exit;
-  ParseStr := Value;
-  AccelIndex := DeleteAmpersands(ParseStr);
-  If AccelIndex > -1 then begin
-    OldShortCut := FShortCut;
-    FShortCut := ShortCut(Char2VK(ParseStr[AccelIndex]), [ssCtrl]);
-    TWSButtonClass(WidgetSetClass).SetShortCut(Self, OldShortCut, FShortCut);
-  end;
-  AdjustSize;
-end;
-
 function TCustomButton.ChildClassAllowed(ChildClass: TClass): boolean;
 begin
   // no childs
@@ -295,6 +277,29 @@ begin
   Result := False;
 end;
 
+procedure TCustomButton.WSSetText(const AText: String);
+var
+  ParseStr : String;
+  AccelIndex : Longint;
+  OldShortCut: TShortCut;
+begin
+  if (not HandleAllocated) then
+    exit;
+  if not (csDesigning in ComponentState) then
+  begin
+    ParseStr := AText;
+    AccelIndex := DeleteAmpersands(ParseStr);
+    if AccelIndex > -1 then
+    begin
+      OldShortCut := FShortCut;
+      FShortCut := ShortCut(Char2VK(ParseStr[AccelIndex]), [ssCtrl]);
+      TWSButtonClass(WidgetSetClass).SetShortCut(Self, OldShortCut, FShortCut);
+    end;
+  end;
+  inherited WSSetText(AText);
+  AdjustSize;
+end;
+
 {------------------------------------------------------------------------------
   procedure TCustomButton.DoSendBtnDefault;
  ------------------------------------------------------------------------------}
@@ -314,3 +319,4 @@ end;
 
 
 
+

lcl/include/customcheckbox.inc

@@ -147,6 +147,13 @@ begin
   end;
 end;
 
+procedure TCustomCheckBox.RealSetText(const Value: TCaption);
+begin
+  if Value = Text then
+    Exit;
+  inherited RealSetText(Value);
+end;
+
 {------------------------------------------------------------------------------
   Method: TCustomCheckBox.Toggle
   Params: none
@@ -183,27 +190,26 @@ begin
   inherited Loaded;
 end;
 
-{------------------------------------------------------------------------------
+procedure TCustomCheckBox.WSSetText(const AText: String);
-  procedure TCustomCheckBox.RealSetText(const Value: TCaption);
- ------------------------------------------------------------------------------}
-procedure TCustomCheckBox.RealSetText(const Value: TCaption);
 var
   ParseStr : String;
   AccelIndex : Longint;
-  OldKey: word;
+  OldShortCut: TShortCut;
 begin
-  if Value=Text then exit;
+  if (not HandleAllocated) then
-  Inherited RealSetText(Value);
+    exit;
-  If HandleAllocated and (not (csDesigning in ComponentState)) then begin
+  if not (csDesigning in ComponentState) then
-    ParseStr := Value;
+  begin
+    ParseStr := AText;
     AccelIndex := DeleteAmpersands(ParseStr);
-    If AccelIndex > -1 then begin
+    if AccelIndex > -1 then
-      OldKey := FShortCut;
+    begin
-      FShortCut := Char2VK(ParseStr[AccelIndex]);
+      OldShortCut := FShortCut;
-      TWSCustomCheckBoxClass(WidgetSetClass).SetShortCut(Self, OldKey, FShortCut);
+      FShortCut := ShortCut(Char2VK(ParseStr[AccelIndex]), [ssCtrl]);
+      TWSCustomCheckBoxClass(WidgetSetClass).SetShortCut(Self, OldShortCut, FShortCut);
     end;
   end;
-  InvalidatePreferredSize;
+  inherited WSSetText(AText);
   AdjustSize;
 end;
 

lcl/include/wincontrol.inc

@@ -3492,6 +3492,12 @@ Begin
   inherited WndProc(Message);
 end;
 
+procedure TWinControl.WSSetText(const AText: String);
+begin
+  TWSWinControlClass(WidgetSetClass).SetText(Self, AText);
+  InvalidatePreferredSize;
+end;
+
 {------------------------------------------------------------------------------
   procedure TWinControl.DoAddDockClient(Client: TControl; const ARect: TRect);
   
@@ -5327,12 +5333,13 @@ begin
     EnableWindow(Handle, Enabled);
 
   // Delay the setting of text until it is completely loaded
-  if not (csLoading in ComponentState) then begin
+  if not (csLoading in ComponentState) then
+  begin
     if GetCachedText(CachedText) then
-      TWSWinControlClass(WidgetSetClass).SetText(Self, CachedText);
+      WSSetText(CachedText);
     InvalidatePreferredSize;
   end;
-  
+
   if csDesigning in ComponentState
   then TWSWinControlClass(WidgetSetClass).SetCursor(Self, Screen.Cursors[crDefault])
   else TWSWinControlClass(WidgetSetClass).SetCursor(Self, Screen.Cursors[Cursor]);
@@ -5445,7 +5452,7 @@ begin
     if HandleAllocated then begin
       // Set cached caption
       if GetCachedText(CachedText) then
-        TWSWinControlClass(WidgetSetClass).SetText(Self, CachedText);
+        WSSetText(CachedText);
       InvalidatePreferredSize;
 
       if wcfColorChanged in FWinControlFlags then begin
@@ -6045,10 +6052,9 @@ end;
  ------------------------------------------------------------------------------}
 procedure TWinControl.RealSetText(const AValue: TCaption);
 begin
-  if HandleAllocated 
+  if HandleAllocated and (not (csLoading in ComponentState)) then
-  and (not (csLoading in ComponentState))
+  begin
-  then begin
+    WSSetText(AValue);
-    TWSWinControlClass(WidgetSetClass).SetText(Self, AValue);
     InvalidatePreferredSize;
   end;
   inherited RealSetText(AValue);

lcl/stdctrls.pp

@@ -1003,13 +1003,13 @@ type
     procedure ControlKeyDown(var Key: Word; Shift: TShiftState); override;
     procedure ControlKeyUp(var Key: Word; Shift: TShiftState); override;
     procedure SetParent(AParent: TWinControl); override;
-    procedure RealSetText(const Value: TCaption); override;
-    procedure WSSetDefault;
     function DialogChar(var Message: TLMKey): boolean; override;
     function ChildClassAllowed(ChildClass: TClass): boolean; override;
     function IsBorderSpacingInnerBorderStored: Boolean; override;
     property ParentColor default false;
     function UseRightToLeftAlignment: Boolean; override;
+    procedure WSSetDefault;
+    procedure WSSetText(const AText: String); override;
   public
     constructor Create(TheOwner: TComponent); override;
     procedure ExecuteDefaultAction; override;
@@ -1099,6 +1099,7 @@ type
     procedure RealSetText(const Value: TCaption); override;
     procedure ApplyChanges; virtual;
     procedure Loaded; override;
+    procedure WSSetText(const AText: String); override;
   public
     constructor Create(TheOwner: TComponent); override;
   public
@@ -1508,3 +1509,4 @@ end.
 
 
 
+