cocoa: send LM_CLICKED for button clicks and LM_CHANGED for checkbox change

git-svn-id: trunk@34125 -

lcl/interfaces/cocoa/cocoaprivate.pp

@@ -94,6 +94,12 @@ type
     function ResetCursorRects: Boolean;
   end;
 
+  { IButtonCallback }
+
+  IButtonCallback = interface(ICommonCallback)
+    procedure ButtonClick;
+  end;
+
   { IWindowCallback }
 
   IWindowCallback = interface(ICommonCallBack)
@@ -124,7 +130,7 @@ type
   protected
     procedure actionButtonClick(sender: NSObject); message 'actionButtonClick:';
   public
-    callback  : ICommonCallback;
+    callback: IButtonCallback;
     function initWithFrame(frameRect: NSRect): id; override;
     function acceptsFirstResponder: Boolean; override;
     procedure mouseDown(event: NSEvent); override;
@@ -203,7 +209,7 @@ type
 
   TCocoaComboBoxList = class(TStringList)
   private
-    fOwner  : TCocoaComboBox;
+    FOwner: TCocoaComboBox;
   protected
     procedure Changed; override;
   public
@@ -306,14 +312,15 @@ end;
 
 procedure TCocoaButton.actionButtonClick(sender: NSObject);
 begin
-  callback.MouseClick(1);
+  // this is the action handler of button
-  //todo: simulate MouseUp
+  callback.ButtonClick;
 end;
 
 function TCocoaButton.initWithFrame(frameRect: NSRect): id;
 begin
   Result := inherited initWithFrame(frameRect);
-  if Assigned(Result) then begin
+  if Assigned(Result) then
+  begin
     setTarget(Self);
     setAction(objcselector('actionButtonClick:'));
   end;
@@ -321,7 +328,7 @@ end;
 
 function TCocoaButton.acceptsFirstResponder: Boolean;
 begin
-  Result:=true;
+  Result := True;
 end;
 
 procedure TCocoaButton.mouseUp(event: NSEvent);

lcl/interfaces/cocoa/cocoawsbuttons.pp

@@ -34,7 +34,7 @@ uses
   // widgetset
   WSButtons, WSLCLClasses, WSProc,
   // LCL Carbon
-  CocoaWSStdCtrls, CocoaUtils;
+  CocoaWSCommon, CocoaWSStdCtrls, CocoaUtils;
 
 type
 
@@ -72,7 +72,7 @@ class function TCocoaWSBitBtn.CreateHandle(const AWinControl: TWinControl;
 var
   btn: NSButton;
 begin
-  btn:=AllocButton(AWinControl, AParams, NSRoundedBezelStyle, NSMomentaryPushInButton);
+  btn := AllocButton(AWinControl, TLCLButtonCallBack, AParams, NSRoundedBezelStyle, NSMomentaryPushInButton);
   if Assigned(btn) then
     AddViewToNSObject(btn, NSObject(AParams.WndParent), AParams.X, AParams.Y);
   Result := TLCLIntfHandle(btn);

lcl/interfaces/cocoa/cocoawscommon.pas

@@ -38,6 +38,8 @@ type
     function ResetCursorRects: Boolean; virtual;
   end;
 
+  TLCLCommonCallBackClass = class of TLCLCommonCallBack;
+
   { TCocoaWSWinControl }
 
   TCocoaWSWinControl=class(TWSWinControl)

lcl/interfaces/cocoa/cocoawsstdctrls.pp

@@ -146,6 +146,14 @@ type
     class function GetText(const AWinControl: TWinControl; var AText: String): Boolean; override;
   end;
 
+  { TLCLButtonCallback }
+
+  TLCLButtonCallback = class(TLCLCommonCallback, IButtonCallback)
+  public
+    procedure ButtonClick; virtual;
+  end;
+  TLCLButtonCallBackClass = class of TLCLButtonCallBack;
+
   { TCocoaWSButton }
 
   TCocoaWSButton = class(TWSButton)
@@ -154,6 +162,13 @@ type
     class procedure SetDefault(const AButton: TCustomButton; ADefault: Boolean); override;
   end;
 
+  { TLCLCheckBoxCallback }
+
+  TLCLCheckBoxCallback = class(TLCLButtonCallBack)
+  public
+    procedure ButtonClick; override;
+  end;
+
   { TCocoaWSCustomCheckBox }
 
   TCocoaWSCustomCheckBox = class(TWSCustomCheckBox)
@@ -188,20 +203,20 @@ type
   end;
 
 function AllocTextView(ATarget: TWinControl; const AParams: TCreateParams; fieldEditor: Boolean): NSTextView;
-function AllocButton(ATarget: TWinControl; const AParams: TCreateParams; btnBezel: NSBezelStyle; btnType: NSButtonType): NSButton;
+function AllocButton(const ATarget: TWinControl; const ACallBackClass: TLCLButtonCallBackClass; const AParams: TCreateParams; btnBezel: NSBezelStyle; btnType: NSButtonType): NSButton;
 function AllocTextField(ATarget: TWinControl; const AParams: TCreateParams): TCocoaTextField;
 function AllocSecureTextField(ATarget: TWinControl; const AParams: TCreateParams): TCocoaSecureTextField;
 
 implementation
 
-function AllocButton(ATarget: TWinControl; const AParams: TCreateParams; btnBezel: NSBezelStyle; btnType: NSButtonType): NSButton;
+function AllocButton(const ATarget: TWinControl; const ACallBackClass: TLCLButtonCallBackClass; const AParams: TCreateParams; btnBezel: NSBezelStyle; btnType: NSButtonType): NSButton;
 var
   cap: NSString;
 begin
   Result := TCocoaButton.alloc.lclInitWithCreateParams(AParams);
   if Assigned(Result) then
   begin
-    TCocoaButton(Result).callback:=TLCLCommonCallback.Create(Result, ATarget);
+    TCocoaButton(Result).callback := ACallBackClass.Create(Result, ATarget);
     Result.initWithFrame(CreateParamsToNSRect(AParams));
     cap := NSStringUTF8(AParams.Caption);
     Result.setTitle(cap);
@@ -240,6 +255,22 @@ begin
   end;
 end;
 
+{ TLCLButtonCallback }
+
+procedure TLCLButtonCallback.ButtonClick;
+begin
+  SendSimpleMessage(Target, LM_CLICKED);
+end;
+
+{ TLCLCheckBoxCallback }
+
+procedure TLCLCheckBoxCallback.ButtonClick;
+begin
+  inherited;
+  SendSimpleMessage(Target, LM_CHANGED);
+  // todo: win32 has something about dbcheckbox handling here. so maybe we need to handle it special too
+end;
+
 { TLCLComboboxCallback }
 
 procedure TLCLComboboxCallback.ComboBoxWillPopUp;
@@ -280,7 +311,7 @@ class function TCocoaWSButton.CreateHandle(const AWinControl: TWinControl;
 var
   btn: NSButton;
 begin
-  btn:=AllocButton(AWinControl, AParams, NSRoundedBezelStyle, NSMomentaryPushInButton);
+  btn := AllocButton(AWinControl, TLCLButtonCallback, AParams, NSRoundedBezelStyle, NSMomentaryPushInButton);
   if Assigned(btn) then
     AddViewToNSObject(btn, NSObject(AParams.WndParent), AParams.X, AParams.Y);
   Result:=TLCLIntfHandle(btn);
@@ -322,7 +353,7 @@ class function TCocoaWSCustomCheckBox.CreateHandle(const AWinControl: TWinContro
 var
   btn: NSButton;
 begin
-  btn:=AllocButton(AWinControl, AParams, 0, NSSwitchButton);
+  btn := AllocButton(AWinControl, TLCLCheckBoxCallBack, AParams, 0, NSSwitchButton);
   if Assigned(btn) then
     AddViewToNSObject(btn, NSObject(AParams.WndParent), AParams.X, AParams.Y);
   Result := TLCLIntfHandle(btn);
@@ -371,7 +402,7 @@ class function TCocoaWSRadioButton.CreateHandle(const AWinControl: TWinControl;
 var
   btn: NSButton;
 begin
-  btn:=AllocButton(AWinControl, AParams, 0, NSRadioButton);
+  btn := AllocButton(AWinControl, TLCLCheckBoxCallBack, AParams, 0, NSRadioButton);
   Result := TLCLIntfHandle(btn);
 end;
 
@@ -712,7 +743,7 @@ var
   btn: NSButton;
   cl: NSButtonCell;
 begin
-  btn:=AllocButton(AWinControl, AParams, NSTexturedRoundedBezelStyle, NSToggleButton);
+  btn := AllocButton(AWinControl, TLCLButtonCallBack, AParams, NSTexturedRoundedBezelStyle, NSToggleButton);
   cl := NSButtonCell(NSButton(btn).cell);
   cl.setShowsStateBy(cl.showsStateBy or NSContentsCellMask);
   Result := TLCLIntfHandle(btn);