From d2ab60647acfbfc66e3071d8a029085158870c3f Mon Sep 17 00:00:00 2001 From: blikblum Date: Thu, 16 Sep 2010 19:02:43 +0000 Subject: [PATCH] lcl,win32: implement GetBkColor. Issue #14792 git-svn-id: trunk@27388 - --- lcl/include/intfbasewinapi.inc | 5 +++++ lcl/include/winapi.inc | 5 +++++ lcl/include/winapih.inc | 1 + lcl/interfaces/win32/win32winapi.inc | 5 +++++ lcl/interfaces/win32/win32winapih.inc | 1 + 5 files changed, 17 insertions(+) diff --git a/lcl/include/intfbasewinapi.inc b/lcl/include/intfbasewinapi.inc index 53f4105404..020eb4d1f1 100644 --- a/lcl/include/intfbasewinapi.inc +++ b/lcl/include/intfbasewinapi.inc @@ -906,6 +906,11 @@ begin Result := 0; end; +function TWidgetSet.GetBkColor(DC: HDC): TColorRef; +begin + Result := 0; +end; + function TWidgetSet.GetCapture : HWND; begin Result := 0; diff --git a/lcl/include/winapi.inc b/lcl/include/winapi.inc index 8d7fa6566f..132268aae6 100644 --- a/lcl/include/winapi.inc +++ b/lcl/include/winapi.inc @@ -315,6 +315,11 @@ begin Result := WidgetSet.GetBitmapBits(Bitmap, Count, Bits); end; +function GetBkColor(DC: HDC): TColorRef; +begin + Result := WidgetSet.GetBkColor(DC); +end; + function GetCapture: HWND; Begin Result := WidgetSet.GetCapture; diff --git a/lcl/include/winapih.inc b/lcl/include/winapih.inc index 97aaf761f7..adfec07d8f 100644 --- a/lcl/include/winapih.inc +++ b/lcl/include/winapih.inc @@ -114,6 +114,7 @@ function FrameRect(DC: HDC; const ARect: TRect; hBr: HBRUSH): Integer; {$IFDEF I function GetActiveWindow : HWND; {$IFDEF IF_BASE_MEMBER}virtual;{$ENDIF} function GetBitmapBits(Bitmap: HBITMAP; Count: Longint; Bits: Pointer): Longint; {$IFDEF IF_BASE_MEMBER}virtual;{$ENDIF} +function GetBkColor(DC: HDC): TColorRef; {$IFDEF IF_BASE_MEMBER}virtual;{$ENDIF} function GetCapture : HWND; {$IFDEF IF_BASE_MEMBER}virtual;{$ENDIF} function GetCaretPos(var lpPoint: TPoint): Boolean; {$IFDEF IF_BASE_MEMBER}virtual;{$ENDIF} function GetClientRect(handle : HWND; var Rect: TRect) : Boolean; {$IFDEF IF_BASE_MEMBER}virtual;{$ENDIF} diff --git a/lcl/interfaces/win32/win32winapi.inc b/lcl/interfaces/win32/win32winapi.inc index 5328c1a187..2e10309121 100644 --- a/lcl/interfaces/win32/win32winapi.inc +++ b/lcl/interfaces/win32/win32winapi.inc @@ -1762,6 +1762,11 @@ begin Result := Windows.GetBitmapBits(Bitmap, Count, Bits); end; +function TWin32WidgetSet.GetBkColor(DC: HDC): TColorRef; +begin + Result := TColorRef(Windows.GetBkColor(DC)); +end; + function TWin32WidgetSet.CreateDIBSection(DC: HDC; const p2: tagBitmapInfo; p3: UINT; var p4: Pointer; p5: THandle; p6: DWORD): HBITMAP; diff --git a/lcl/interfaces/win32/win32winapih.inc b/lcl/interfaces/win32/win32winapih.inc index f125434804..f61a953852 100644 --- a/lcl/interfaces/win32/win32winapih.inc +++ b/lcl/interfaces/win32/win32winapih.inc @@ -92,6 +92,7 @@ function FrameRect(DC: HDC; const ARect: TRect; hBr: HBRUSH) : integer; override function GetActiveWindow: HWND; override; function GetBitmapBits(Bitmap: HBITMAP; Count: Longint; Bits: Pointer): Longint; override; +function GetBkColor(DC: HDC): TColorRef; override; function GetCapture: HWND; override; function GetCaretPos(Var LPPoint: TPoint): Boolean; override; function GetCharABCWidths(DC: HDC; P2, P3: UINT; Const ABCStructs): Boolean; override;