LCL, custom handling of checkbox states (windows, this enables the use of allowgrayed without cbGrayed state, specially useful for dbcheckbox), fix cbGrayed state under gtk2

git-svn-id: trunk@20012 -

lcl/include/customcheckbox.inc

@@ -38,15 +38,6 @@ begin
   end;
 end;
 
-procedure TCustomCheckBox.SetAllowGrayed(const AValue: Boolean);
-begin
-  if AValue<>FAllowGrayed then begin
-    FAllowGrayed := AValue;
-    if HandleAllocated then
-      TWSCustomCheckBoxClass(WidgetSetClass).AllowGrayedChanged(Self);
-  end;
-end;
-
 {------------------------------------------------------------------------------
   Method: TCustomCheckBox.GetState
   Params:  none

lcl/interfaces/gtk/gtkcallback.inc

@@ -471,6 +471,23 @@ end;
 function gtktoggledCB( widget: PGtkWidget; data: gPointer): GBoolean; cdecl;
 var
   Mess : TLMessage;
+
+  procedure ChangeCheckbox(AGrayed,AChecked: boolean);
+  begin
+    LockOnChange(PgtkObject(Widget),1);
+    {$IFDEF GTK1}
+    if AGrayed then
+      gtk_object_set_data(PgtkObject(Widget), 'Grayed', Widget)
+    else
+      gtk_object_set_data(PgtkObject(Widget), 'Grayed', nil);
+    {$ENDIF}
+    {$IFDEF GTK2}
+    gtk_toggle_button_set_Inconsistent(PGtkToggleButton(Widget), AGrayed);
+    {$ENDIF}
+    gtk_toggle_button_set_active(PGtkToggleButton(Widget), AChecked);
+    LockOnChange(PgtkObject(Widget),-1);
+  end;
+
 begin
   //DebugLn('gtktoggledCB ',DbgSName(TObject(Data)));
   Result := CallBackDefaultReturn;
@@ -480,7 +497,26 @@ begin
   if LockOnChange(PgtkObject(Widget),0) > 0 then Exit;
 
   if GtkWidgetIsA(Widget,gtk_toggle_button_get_type) then begin
-    gtk_object_set_data(PgtkObject(Widget), 'Grayed', nil);
+
+    if TObject(Data) is TCustomCheckbox then begin
+    {$IFDEF GTK1}
+      if gtk_object_get_data(PgtkObject(Widget), 'Grayed')<>nil then
+        ChangeCheckbox(false, true)
+      else
+      if TCustomCheckbox(Data).AllowGrayed and
+         gtk_toggle_button_get_active(PGtkToggleButton(Widget)) then
+        ChangeCheckbox(true, false);
+    {$ENDIF}
+    {$IFDEF GTK2}
+      if gtk_toggle_button_get_inconsistent(PGtkToggleButton(Widget)) then
+        ChangeCheckbox(false, true)
+      else
+      if TCustomCheckbox(Data).AllowGrayed and
+         gtk_toggle_button_get_active(PGtkToggleButton(Widget)) then
+        ChangeCheckbox(true, false);
+    {$ENDIF}
+    end;
+
   end;
 
   Mess.Msg := LM_CHANGED;

lcl/interfaces/gtk2/gtk2wsstdctrls.pp

@@ -800,13 +800,13 @@ var
   ToggleButton: PGtkToggleButton;
 begin
   ToggleButton:=PGtkToggleButton(ACustomCheckBox.Handle);
-  if ACustomCheckBox.AllowGrayed
-  and gtk_toggle_button_get_inconsistent(ToggleButton) then
-    Result:=cbGrayed
-  else if gtk_toggle_button_get_active(ToggleButton) then
+  if gtk_toggle_button_get_inconsistent(ToggleButton) then
+    Result := cbGrayed
+  else
+  if gtk_toggle_button_get_active(ToggleButton) then
     Result := cbChecked
   else
-    Result := cbUnChecked;
+    Result := cbUnchecked;
 end;
 
 class procedure TGtk2WSCustomCheckBox.SetShortCut(
@@ -830,8 +830,8 @@ begin
   GtkObject := PGtkObject(ACustomCheckBox.Handle);
   LockOnChange(GtkObject,1);
   ToggleButton:=PGtkToggleButton(GtkObject);
-  gtk_toggle_button_set_active(ToggleButton, NewState=cbChecked);
   gtk_toggle_button_set_inconsistent(ToggleButton, NewState=cbGrayed);
+  gtk_toggle_button_set_active(ToggleButton, NewState=cbChecked);
   LockOnChange(GtkObject,-1);
 end;
 

lcl/interfaces/win32/win32callback.inc

@@ -1351,6 +1351,33 @@ begin
         // buddy controls use 'awincontrol' to designate associated wincontrol
         if lWinControl = nil then
           lWinControl := GetWindowInfo(HWND(LParam))^.AWinControl;
+
+        if lWinControl is TCustomCheckbox then begin
+          case HIWORD(WParam) of
+            BN_CLICKED:
+              begin
+                // to allow cbGrayed state at the same time as not AllowGrayed
+                // in checkboxes (needed by dbcheckbox for null fields) we need
+                // to handle checkbox state ourselves, according to msdn state
+                // sequence goes from checked->cleared->grayed etc.
+                Flags := SendMessage(lWinControl.Handle, BM_GETCHECK, 0, 0);
+                if (Flags=BST_CHECKED) then
+                  Flags := BST_UNCHECKED
+                else
+                if (Flags=BST_UNCHECKED) and
+                   TCustomCheckbox(lWinControl).AllowGrayed then
+                  Flags := BST_INDETERMINATE
+                else
+                  Flags := BST_CHECKED;
+                Windows.SendMessage(lWinControl.Handle, BM_SETCHECK,
+                                                    Windows.WPARAM(flags), 0);
+
+                LMessage.Msg := LM_CLICKED;
+              end;
+            BN_KILLFOCUS:
+              LMessage.Msg := LM_EXIT;
+          end
+        end else
         if lWinControl is TButtonControl then
           case HIWORD(WParam) of
             BN_CLICKED:   LMessage.Msg := LM_CLICKED;

lcl/interfaces/win32/win32wsstdctrls.pp

@@ -257,7 +257,6 @@ type
     class procedure SetBiDiMode(const AWinControl: TWinControl; UseRightToLeftAlign,
       UseRightToLeftReading, UseRightToLeftScrollBar : Boolean); override;
     class procedure SetState(const ACustomCheckBox: TCustomCheckBox; const NewState: TCheckBoxState); override;
-    class procedure AllowGrayedChanged(const ACustomCheckbox: TCustomCheckbox); override;
   end;
 
   { TWin32WSCheckBox }
@@ -1467,10 +1466,7 @@ begin
   begin
     pClassName := @ButtonClsName[0];
     WindowTitle := StrCaption;
-    if TCustomCheckBox(AWinControl).AllowGrayed then
-      Flags := Flags or BS_AUTO3STATE
-    else
-      Flags := Flags or BS_AUTOCHECKBOX;
+    Flags := Flags or BS_3STATE;
   end;
   // create window
   FinishCreateWindow(AWinControl, Params, false);
@@ -1538,12 +1534,6 @@ begin
   Windows.SendMessage(ACustomCheckBox.Handle, BM_SETCHECK, Flags, 0);
 end;
 
-class procedure TWin32WSCustomCheckBox.AllowGrayedChanged(
-  const ACustomCheckbox: TCustomCheckbox);
-begin
-  RecreateWnd(ACustomCheckbox);
-end;
-
 { TWin32WSToggleBox }
 
 class function TWin32WSToggleBox.CreateHandle(const AWinControl: TWinControl;

lcl/stdctrls.pp

@@ -1166,7 +1166,6 @@ type
     FAllowGrayed: Boolean;
     FState: TCheckBoxState;
     FShortCut: TShortcut;
-    procedure SetAllowGrayed(const AValue: Boolean);
     procedure SetState(Value: TCheckBoxState);
     function GetState: TCheckBoxState;
     procedure DoChange(var Msg); message LM_CHANGED;
@@ -1189,7 +1188,7 @@ type
     constructor Create(TheOwner: TComponent); override;
   public
     property AutoSize default true;
-    property AllowGrayed: Boolean read FAllowGrayed write SetAllowGrayed default false;
+    property AllowGrayed: Boolean read FAllowGrayed write FAllowGrayed default false;
     property State: TCheckBoxState read GetState write SetState default cbUnchecked;
     property TabStop default true;
     property OnChange;

lcl/widgetset/wsstdctrls.pp

@@ -222,7 +222,6 @@ type
     class procedure SetShortCut(const ACustomCheckBox: TCustomCheckBox;
       const OldShortCut, NewShortCut: TShortCut); virtual;
     class procedure SetState(const ACustomCheckBox: TCustomCheckBox; const NewState: TCheckBoxState); virtual;
-    class procedure AllowGrayedChanged(const ACustomCheckbox: TCustomCheckbox); virtual;
   end;
   TWSCustomCheckBoxClass = class of TWSCustomCheckBox;
 
@@ -579,11 +578,6 @@ class procedure TWSCustomCheckBox.SetState(const ACustomCheckBox: TCustomCheckBo
 begin
 end;
 
-class procedure TWSCustomCheckBox.AllowGrayedChanged(
-  const ACustomCheckbox: TCustomCheckbox);
-begin
-end;
-
 { WidgetSetRegistration }
 
 procedure RegisterCustomScrollBar;