lcl, win32, wince: move button controls flags into CreateParams methods

git-svn-id: trunk@25473 -

lcl/include/customcheckbox.inc

@@ -242,6 +242,12 @@ begin
   inherited TextChanged;
 end;
 
+procedure TCustomCheckBox.CreateParams(var Params: TCreateParams);
+begin
+  inherited CreateParams(Params);
+  Params.Style := Params.Style or BS_3STATE;
+end;
+
 function TCustomCheckBox.DialogChar(var Message: TLMKey): boolean;
 begin
   if IsAccel(Message.CharCode, Caption) and CanFocus then

lcl/include/customgroupbox.inc

@@ -26,6 +26,12 @@ begin
   Result.CY := 105;
 end;
 
+procedure TCustomGroupBox.CreateParams(var Params: TCreateParams);
+begin
+  inherited CreateParams(Params);
+  Params.Style := Params.Style or BS_GROUPBOX;
+end;
+
 {------------------------------------------------------------------------------
   function TCustomGroupBox.Create
 ------------------------------------------------------------------------------}

lcl/include/radiobutton.inc

@@ -105,6 +105,14 @@ begin
   end;
 end;
 
+procedure TRadioButton.CreateParams(var Params: TCreateParams);
+begin
+  inherited CreateParams(Params);
+  // BS_AUTORADIOBUTTON may hang the application,
+  // if the radiobuttons are not consecutive controls.
+  Params.Style := (Params.Style and not BS_3STATE) or BS_RADIOBUTTON;
+end;
+
 class procedure TRadioButton.WSRegisterClass;
 begin
   inherited WSRegisterClass;

lcl/include/togglebox.inc

@@ -22,11 +22,17 @@ begin
   RegisterToggleBox;
 end;
 
+procedure TToggleBox.CreateParams(var Params: TCreateParams);
+begin
+  inherited CreateParams(Params);
+  Params.Style := (Params.Style and not BS_3STATE) or BS_AUTOCHECKBOX or BS_PUSHLIKE;
+end;
+
 constructor TToggleBox.Create(TheOwner : TComponent);
 begin
   inherited Create(TheOwner);
   fCompStyle := csToggleBox;
-  AutoSize:=false;
+  AutoSize := False;
 end;
 
 {------------------------------------------------------------------------------}

lcl/interfaces/win32/win32wsstdctrls.pp

@@ -498,7 +498,6 @@ begin
     SubClassWndProc := @GroupBoxWindowProc;
     pClassName := @ButtonClsName[0];
     WindowTitle := StrCaption;
-    Flags := Flags or BS_GROUPBOX;
   end;
   // create window
   FinishCreateWindow(AWinControl, Params, False);
@@ -1570,7 +1569,6 @@ begin
   begin
     pClassName := @ButtonClsName[0];
     WindowTitle := StrCaption;
-    Flags := Flags or BS_3STATE;
   end;
   // create window
   FinishCreateWindow(AWinControl, Params, false);
@@ -1652,7 +1650,6 @@ begin
   begin
     pClassName := @ButtonClsName[0];
     WindowTitle := StrCaption;
-    Flags := Flags or BS_AUTOCHECKBOX or BS_PUSHLIKE;
   end;
   // create window
   FinishCreateWindow(AWinControl, Params, false);
@@ -1674,9 +1671,6 @@ begin
   begin
     pClassName := @ButtonClsName[0];
     WindowTitle := StrCaption;
-    // BS_AUTORADIOBUTTON may hang the application,
-    // if the radiobuttons are not consecutive controls.
-    Flags := Flags or BS_RADIOBUTTON;
   end;
   // create window
   FinishCreateWindow(AWinControl, Params, false);

lcl/interfaces/wince/wincewsstdctrls.pp

@@ -413,18 +413,10 @@ begin
   begin
     pClassName := @ButtonClsName;
     WindowTitle := StrCaption;
-    Flags := Flags Or BS_GROUPBOX;
   end;
   // create window
   Params.SubClassWndProc := @GroupBoxPanelWindowProc;
   FinishCreateWindow(AWinControl, Params, false);
-  // handle winxp panel hack
-  // if themed but does not have tabpage as parent
-  // remember we are a groupbox in need of erasebackground hack
-//  if TWinCEWidgetSet(WidgetSet).ThemesActive
-//      and not Params.WindowInfo^.hasTabParent then
-//  Params.WindowInfo^.isGroupBox := true;
-//  AWinControl.InvalidateClientRectCache(true);
   Result := Params.Window;
 end;
 
@@ -1268,7 +1260,6 @@ begin
   begin
     pClassName := @ButtonClsName;
     WindowTitle := StrCaption;
-    Flags := Flags or BS_3STATE;
   end;
   // create window
   FinishCreateWindow(AWinControl, Params, false);
@@ -1341,7 +1332,6 @@ begin
   begin
     pClassName := @ButtonClsName;
     WindowTitle := StrCaption;
-    Flags := Flags or BS_AUTOCHECKBOX or BS_PUSHLIKE;
   end;
   // create window
   FinishCreateWindow(AWinControl, Params, false);
@@ -1366,9 +1356,6 @@ begin
   begin
     pClassName := @ButtonClsName;
     WindowTitle := StrCaption;
-    // BS_AUTORADIOBUTTON may hang the application,
-    // if the radiobuttons are not consecutive controls.//roozbeh:is it so in wince?
-    Flags := Flags or BS_RADIOBUTTON;
   end;
   // create window
   FinishCreateWindow(AWinControl, Params, false);

lcl/lcltype.pp

@@ -906,7 +906,12 @@ const
   { Button styles }
   BS_PUSHBUTTON    = $00000000;
   BS_DEFPUSHBUTTON = $00000001;
+  BS_AUTOCHECKBOX  = $00000003;
+  BS_RADIOBUTTON   = $00000004;
+  BS_3STATE        = $00000005;
+  BS_GROUPBOX      = $00000007;
   BS_OWNERDRAW     = $0000000B;
+  BS_PUSHLIKE      = $00001000;
 
 const
 //==============================================

lcl/stdctrls.pp

@@ -163,6 +163,7 @@ type
   protected
     class procedure WSRegisterClass; override;
     class function GetControlClassDefaultSize: TSize; override;
+    procedure CreateParams(var Params: TCreateParams); override;
   public
     constructor Create(AOwner: TComponent); Override;
   end;
@@ -1194,6 +1195,7 @@ type
     procedure Loaded; override;
     procedure WSSetText(const AText: String); override;
     procedure TextChanged; override;
+    procedure CreateParams(var Params: TCreateParams); override;
   public
     constructor Create(TheOwner: TComponent); override;
   public
@@ -1263,9 +1265,9 @@ type
   { TToggleBox }
 
   TToggleBox = class(TCustomCheckBox)
-  private
   protected
     class procedure WSRegisterClass; override;
+    procedure CreateParams(var Params: TCreateParams); override;
   public
     constructor Create(TheOwner: TComponent); override;
   published
@@ -1315,6 +1317,7 @@ type
     procedure SetChecked(Value: Boolean); override;
     procedure DoChange(var Msg); message LM_CHANGED;
     procedure DoApplyChanges;
+    procedure CreateParams(var Params: TCreateParams); override;
   public
     constructor Create(TheOwner: TComponent); override;
   published