* winapi: moved winapi macros to winapi includes (so they don't get added twice)

git-svn-id: trunk@23545 -

lcl/include/winapi.inc

@@ -1206,6 +1206,18 @@ begin
   lpMaxPos := Info.nMax;
 end;
 
+{------------------------------------------------------------------------------
+  Function: IndexToOverlayMask
+  Params: iOverlay:
+  Returns:
+
+ ------------------------------------------------------------------------------}
+function IndexToOverlayMask(iOverlay: UINT): UINT; inline;
+begin
+  Result := iOverlay shl 8;
+end;
+
+
 {------------------------------------------------------------------------------
   Function: InflateRect
   Params:   ARect: points to structure that increases or decreases in size.
@@ -1331,6 +1343,19 @@ begin
   MTimerMap.Delete(MapID);
 end;
 
+{------------------------------------------------------------------------------
+  Function: MakeLong
+  Params: A:
+          B:
+  Returns:
+
+ ------------------------------------------------------------------------------}
+function MakeLong(A, B: Word): DWORD; inline;
+begin
+  Result := A or B shl 16;
+end;
+
+
 {------------------------------------------------------------------------------
   Function: MakeLParam
   Params:
@@ -1353,6 +1378,31 @@ begin
   Result := MakeLong(l, h);
 end;
 
+{------------------------------------------------------------------------------
+  Function: MakeROP4
+  Params: fore:
+          back:
+  Returns:
+
+ ------------------------------------------------------------------------------}
+function MakeRop4(fore,back: DWORD): DWORD; inline;
+begin
+  Result := ((back shl 8) and $FF000000) or fore;
+end;
+
+{------------------------------------------------------------------------------
+  Function: MakeWord
+  Params: A:
+          B:
+  Returns:
+
+ ------------------------------------------------------------------------------}
+function MakeWord(A, B: Byte): Word; inline;
+begin
+  Result := A or B shl 8;
+end;
+
+
 {------------------------------------------------------------------------------
   Function: MakeWParam
   Params:

lcl/include/winapih.inc

@@ -162,6 +162,7 @@ function GradientFill(DC: HDC; Vertices: PTriVertex; NumVertices : Longint;
 
 function HideCaret(hWnd: HWND): Boolean; {$IFDEF IF_BASE_MEMBER}virtual;{$ENDIF}
 
+//function IndexToOverlayMask --> independent
 //function InflateRect --> independent
 procedure InitializeCriticalSection(var CritSection: TCriticalSection); {$IFDEF IF_BASE_MEMBER}virtual;{$ENDIF}
 function IntersectClipRect(dc: hdc; Left, Top, Right,Bottom: Integer): Integer; {$IFDEF IF_BASE_MEMBER}virtual;{$ENDIF}
@@ -181,6 +182,9 @@ function IsZoomed(handle: HWND): boolean; {$IFDEF IF_BASE_MEMBER}virtual;{$ENDIF
 procedure LeaveCriticalSection(var CritSection: TCriticalSection); {$IFDEF IF_BASE_MEMBER}virtual;{$ENDIF}
 function LineTo(DC: HDC; X, Y: Integer): Boolean; {$IFDEF IF_BASE_MEMBER}virtual;{$ENDIF}
 
+//function MakeLong --> independent
+//function MakeROP4 --> independent
+//function MakeWord --> independent
 function MaskBlt(DestDC: HDC; X, Y, Width, Height: Integer; SrcDC: HDC; XSrc, YSrc: Integer; Mask: HBITMAP; XMask, YMask: Integer; Rop: DWORD): Boolean; {$IFDEF IF_BASE_MEMBER}virtual;{$ENDIF}
 function MaskBlt(DestDC: HDC; X, Y, Width, Height: Integer; SrcDC: HDC; XSrc, YSrc: Integer; Mask: HBITMAP; XMask, YMask: Integer): Boolean; {$IFDEF IF_BASE_MEMBER}virtual;{$ENDIF}
 function MessageBox(hWnd: HWND; lpText, lpCaption: PChar; uType: Cardinal): integer; {$IFDEF IF_BASE_MEMBER}virtual;{$ENDIF}
@@ -300,6 +304,7 @@ function GetBValue(RGB : DWORD) : BYTE; inline;
 procedure GetRGBValues(RGB : DWORD; var R, G, B: Byte); inline;
 procedure GetRGBIntValues(RGB : DWORD; var R, G, B: integer); inline;
 
+function IndexToOverlayMask(iOverlay: UINT): UINT; inline;
 function InflateRect(var ARect: TRect; dx, dy: Integer): Boolean;
 function IntersectRect(var DestRect: TRect; const SrcRect1, SrcRect2: TRect): Boolean;
 function IsCharAlphaNumeric(c : Char) : Boolean;
@@ -307,6 +312,9 @@ function IsRectEmpty(const ARect: TRect): Boolean;
 
 function KillTimer(Wnd: HWND; uIDEvent: UINT_PTR): BOOL;
 
+function MakeLong(A,B: Word): DWORD; inline;
+function MakeROP4(fore, back: DWORD): DWORD;inline;
+function MakeWord(A,B: Byte): Word; inline;
 function MakeWParam(l, h: Word): WPARAM; inline;
 function MakeLParam(l, h: Word): LPARAM; inline;
 function MakeLResult(l, h: Word): LRESULT; inline;

lcl/lclintf.pas

@@ -64,16 +64,6 @@ uses
 // All interface communication (Our additions)
 {$I lclintfh.inc}
 
-//-------------------------
-// Some MACROs
-//-------------------------
-function MakeLong(A,B: Word): LongInt; inline;
-function MakeWord(A,B: Byte): Word; inline;
-function MakeRop4(fore,back: DWORD): DWORD; inline;
-function IndexToOverlayMask(iOverlay: UINT): UINT; inline;
-
-//-------------------------
-
 function PredefinedClipboardFormat(
   AFormat: TPredefinedClipboardFormat): TClipboardFormat;
 
@@ -188,25 +178,6 @@ begin
 end;
 {$ENDIF}
 
-function MakeLong(A,B : Word) : LongInt; inline;
-begin
-  Result := A or B shl 16;
-end;
-
-function MakeWord(A,B : Byte) : Word; inline;
-begin
-  Result := A or B shl 8;
-end;
-
-function MakeRop4(fore,back: DWORD): DWORD; inline;
-begin
-  Result := ((back shl 8) and $FF000000) or fore;
-end;
-
-function IndexToOverlayMask(iOverlay: UINT): UINT; inline;
-begin
-  Result := iOverlay shl 8;
-end;
 
 function PredefinedClipboardFormat(AFormat: TPredefinedClipboardFormat
   ): TClipboardFormat;