diff --git a/lcl/include/winapi.inc b/lcl/include/winapi.inc index e51f73990d..5e7984c0bc 100644 --- a/lcl/include/winapi.inc +++ b/lcl/include/winapi.inc @@ -982,6 +982,17 @@ begin then Rect.Top := Rect.Top + 25; end; +{------------------------------------------------------------------------------ + Function: CharLower + Params: + Returns: + + ------------------------------------------------------------------------------} +function CharLower(c: char): char; inline; +begin + Result := LowerCaseChars[c]; +end; + {------------------------------------------------------------------------------ Function: CharLowerBuff Params: pStr: @@ -997,6 +1008,16 @@ begin Result := -1; end; +{------------------------------------------------------------------------------ + Function: CharUpper + Params: + Returns: + + ------------------------------------------------------------------------------} +function CharUpper(c: char): char; inline; +begin + Result := UpperCaseChars[c]; +end; {------------------------------------------------------------------------------ Function: CopyRect pbd diff --git a/lcl/include/winapih.inc b/lcl/include/winapih.inc index ec79a86ce0..a6eeea8f39 100644 --- a/lcl/include/winapih.inc +++ b/lcl/include/winapih.inc @@ -46,7 +46,9 @@ function BitBlt(DestDC: HDC; X, Y, Width, Height: Integer; SrcDC: HDC; XSrc, YSr function CallNextHookEx(hhk : HHOOK; ncode : Integer; WParam: WParam; LParam: LParam) : Integer; {$IFDEF IF_BASE_MEMBER}virtual;{$ENDIF} function CallWindowProc(lpPrevWndFunc : TFarProc; Handle : HWND; Msg : UINT; WParam: WParam; LParam: LParam): Integer; {$IFDEF IF_BASE_MEMBER}virtual;{$ENDIF} +//function CharLower --> independent //function CharLowerBuff --> independent +//function CharUpper --> independent function ClientToScreen(Handle : HWND; var P : TPoint) : Boolean; {$IFDEF IF_BASE_MEMBER}virtual;{$ENDIF} function CombineRgn(Dest, Src1, Src2 : HRGN; fnCombineMode : Longint) : Longint; {$IFDEF IF_BASE_MEMBER}virtual;{$ENDIF} function CreateBitmap(Width, Height: Integer; Planes, BitCount: Longint; BitmapBits: Pointer): HBITMAP; {$IFDEF IF_BASE_MEMBER}virtual;{$ENDIF} @@ -276,7 +278,9 @@ function WindowFromPoint(Point : TPoint) : HWND; {$IFDEF IF_BASE_MEMBER}virtual; function AdjustWindowRectEx(Var Rect: TRect; Style1: Word; MenuExist : Boolean; Style2 : Word) : Boolean; +function CharLower(c: char): char; inline; function CharLowerBuff(pStr : PChar; Len : Integer): Integer; +function CharUpper(c: char): char; inline; function CopyRect(var DestRect: TRect; const SrcRect: TRect): Boolean; function CreateEllipticRgnIndirect(const ARect: TRect): HRGN; function CreateFont(Height, Width, Escapement, Orientation, Weight: Integer; diff --git a/lcl/lclintf.pas b/lcl/lclintf.pas index ad2e3b5668..5b269d3328 100644 --- a/lcl/lclintf.pas +++ b/lcl/lclintf.pas @@ -77,8 +77,6 @@ function IndexToOverlayMask(iOverlay: UINT): UINT; inline; function PredefinedClipboardFormat( AFormat: TPredefinedClipboardFormat): TClipboardFormat; -function CharLower(c: char): char; inline; -function CharUpper(c: char): char; inline; function MsgKeyDataToShiftState(KeyData: Longint): TShiftState; @@ -219,16 +217,6 @@ begin Result:=FPredefinedClipboardFormats[AFormat]; end; -function CharLower(c: char): char; inline; -begin - Result:=LowerCaseChars[c]; -end; - -function CharUpper(c: char): char; inline; -begin - Result:=UpperCaseChars[c]; -end; - function MsgKeyDataToShiftState(KeyData: Longint): TShiftState; begin Result := [];