From 6c1332e65d5790e0823539b36019d09077821ea6 Mon Sep 17 00:00:00 2001 From: sekelsenmat Date: Sun, 17 Feb 2008 16:51:06 +0000 Subject: [PATCH] Cleanup of unused functions on wince. git-svn-id: trunk@14170 - --- lcl/interfaces/wince/winceproc.pp | 53 ++-------------------------- lcl/interfaces/wince/wincewsforms.pp | 10 +++--- 2 files changed, 7 insertions(+), 56 deletions(-) diff --git a/lcl/interfaces/wince/winceproc.pp b/lcl/interfaces/wince/winceproc.pp index 6f6f88819b..b050f557a4 100644 --- a/lcl/interfaces/wince/winceproc.pp +++ b/lcl/interfaces/wince/winceproc.pp @@ -55,10 +55,7 @@ procedure AssertEx(const Message: String); function GetShiftState: TShiftState; function DeliverMessage(const Target: Pointer; var Message): Integer; function DeliverMessage(const Target: TObject; var Message: TLMessage): Integer; -procedure CallEvent(const Target: TObject; Event: TNotifyEvent; - const Data: Pointer; const EventType: TEventType); function ObjectToHWND(Const AObject: TObject): HWND; -function GetDesigningBorderStyle(const AForm: TCustomForm): TFormBorderStyle; function BytesPerLine(nWidth, nBitsPerPixel: Integer): Integer; function CreateDIBSectionFromDescription(ADC: HDC; const ADesc: TRawImageDescription; out ABitsPtr: Pointer): HBITMAP; @@ -77,7 +74,6 @@ function GetLCLClientBoundsOffset(Handle: HWnd; var Rect: TRect): boolean; Procedure LCLBoundsToWin32Bounds(Sender: TObject; var Left, Top, Width, Height: Integer); Procedure LCLFormSizeToWin32Size(Form: TCustomForm; var AWidth, AHeight: Integer); -Procedure Win32PosToLCLPos(Sender: TObject; var Left, Top: SmallInt); procedure GetWin32ControlPos(Window, Parent: HWND; var Left, Top: integer); procedure UpdateWindowStyle(Handle: HWnd; Style: integer; StyleMask: integer); @@ -602,29 +598,6 @@ Begin Result := Message.Result; End; -{----------------------------------------------------------------------------- - Procedure: CallEvent - Params: Target - the object for which the event will be called - Event - event to call - Data - misc data - EventType - the type of event - Returns: Nothing - - Calls an event --------------------------------------------------------------------------------} -Procedure CallEvent(Const Target: TObject; Event: TNotifyEvent; Const Data: Pointer; Const EventType: TEventType); -Begin - If Assigned(Target) And Assigned(Event) Then - Begin - Case EventType Of - etNotify: - Begin - Event(Target); - End; - End; - End; -End; - {------------------------------------------------------------------------------ Function: ObjectToHWND Params: AObject - An LCL Object @@ -972,7 +945,7 @@ var TheWinControl: TWinControl; ARect: TRect; Ignore: Integer; -Begin +begin Result:=false; if (Sender = nil) or (not (Sender is TWinControl)) then exit; TheWinControl:=TWinControl(Sender); @@ -1065,24 +1038,13 @@ begin Right := AWidth; Bottom := AHeight; end; - BorderStyle := GetDesigningBorderStyle(Form); + BorderStyle := Form.BorderStyle; Windows.AdjustWindowRectEx(@SizeRect, BorderStyleToWin32Flags( BorderStyle), false, BorderStyleToWin32FlagsEx(BorderStyle)); AWidth := SizeRect.Right - SizeRect.Left; AHeight := SizeRect.Bottom - SizeRect.Top; end; -//roozbeh...new update what is it?! -Procedure Win32PosToLCLPos(Sender: TObject; var Left, Top: SmallInt); -var - ORect: TRect; -Begin - if (Sender=nil) or (not (Sender is TWinControl)) then exit; - if not GetLCLClientBoundsOffset(TWinControl(Sender).Parent, ORect) then exit; - dec(Left, ORect.Left); - dec(Top, ORect.Top); -End; - procedure GetWin32ControlPos(Window, Parent: HWND; var Left, Top: integer); var parRect, winRect: Windows.TRect; @@ -1172,17 +1134,6 @@ begin end; end; -//roozbeh:new update test it - -function GetDesigningBorderStyle(const AForm: TCustomForm): TFormBorderStyle; -{$NOTE Belongs in Win32WSForms, but is needed in windowproc} -begin -// if csDesigning in AForm.ComponentState then -// Result := bsSizeable -// else - Result := AForm.BorderStyle; -end; - function GetFileVersion(FileName: string): dword; var buf: pointer; diff --git a/lcl/interfaces/wince/wincewsforms.pp b/lcl/interfaces/wince/wincewsforms.pp index c5599c4dd9..cfe4998d45 100644 --- a/lcl/interfaces/wince/wincewsforms.pp +++ b/lcl/interfaces/wince/wincewsforms.pp @@ -212,7 +212,7 @@ begin BorderIcons := AForm.BorderIcons; if biSystemMenu in BorderIcons then Result := Result or WS_SYSMENU; - if GetDesigningBorderStyle(AForm) in [bsNone, bsSingle, bsSizeable] then + if AForm.BorderStyle in [bsNone, bsSingle, bsSizeable] then begin if biMinimize in BorderIcons then Result := Result or WS_MINIMIZE; @@ -225,7 +225,7 @@ procedure CalcFormWindowFlags(const AForm: TCustomForm; var Flags, FlagsEx: dwor var BorderStyle: TFormBorderStyle; begin - BorderStyle := GetDesigningBorderStyle(AForm); + BorderStyle := AForm.BorderStyle; Flags := BorderStyleToWin32Flags(BorderStyle); if AForm.Parent <> nil then Flags := (Flags or WS_CHILD) and not WS_POPUP; @@ -267,7 +267,7 @@ begin CalcFormWindowFlags(lForm, Flags, FlagsEx); SubClassWndProc := nil; Parent := 0; - BorderStyle := GetDesigningBorderStyle(TCustomForm(AWinControl)); + BorderStyle := TCustomForm(AWinControl).BorderStyle; if (BorderStyle <> bsDialog) and (BorderStyle <> bsNone) then begin Left:=CW_USEDEFAULT; @@ -320,7 +320,7 @@ begin Right := ALeft + AWidth; Bottom := ATop + AHeight; end; - BorderStyle := GetDesigningBorderStyle(TCustomForm(AWinControl)); + BorderStyle := TCustomForm(AWinControl).BorderStyle; Windows.AdjustWindowRectEx(@SizeRect, BorderStyleToWin32Flags( BorderStyle), false, BorderStyleToWin32FlagsEx(BorderStyle)); @@ -335,7 +335,7 @@ var iconHandle: HICON; begin winHandle := AForm.Handle; - if GetDesigningBorderStyle(AForm) = bsDialog then + if AForm.BorderStyle = bsDialog then iconHandle := 0 { TODO: fix icon handling else