From ac30a1f0eea26dc238b1f4f56783a887958d03e2 Mon Sep 17 00:00:00 2001
From: mattias <nc-gaertnma@netcologne.de>
Date: Sat, 22 Nov 2003 17:22:15 +0000
Subject: [PATCH] moved TBevelCut to controls.pp

git-svn-id: trunk@4826 -
---
 lcl/controls.pp        | 30 ++++++++++++++++++------------
 lcl/graphics.pp        |  7 ++++---
 lcl/include/canvas.inc |  5 ++++-
 3 files changed, 26 insertions(+), 16 deletions(-)

diff --git a/lcl/controls.pp b/lcl/controls.pp
index 1ab5f902ec..edf72359d0 100644
--- a/lcl/controls.pp
+++ b/lcl/controls.pp
@@ -142,18 +142,18 @@ const
 
 
 const
-   mrNone = 0;
-   mrOK = mrNone + 1;
-   mrCancel = mrNone + 2;
-   mrAbort = mrNone + 3;
-   mrRetry = mrNone + 4;
-   mrIgnore = mrNone + 5;
-   mrYes = mrNone + 6;
-   mrNo = mrNone + 7;
-   mrAll = mrNone + 8;
-   mrNoToAll = mrNone + 9;
-   mrYesToAll = mrNone + 10;
-   mrLast = mrYesToAll;
+  mrNone = 0;
+  mrOK = mrNone + 1;
+  mrCancel = mrNone + 2;
+  mrAbort = mrNone + 3;
+  mrRetry = mrNone + 4;
+  mrIgnore = mrNone + 5;
+  mrYes = mrNone + 6;
+  mrNo = mrNone + 7;
+  mrAll = mrNone + 8;
+  mrNoToAll = mrNone + 9;
+  mrYesToAll = mrNone + 10;
+  mrLast = mrYesToAll;
 
 
 type
@@ -164,6 +164,7 @@ type
   TDate = type TDateTime;
   TTime = type TDateTime;
 
+  // ToDo: move this to a message definition unit
   TCMMouseWheel = record
     MSg: Cardinal;
     ShiftState : TShiftState;
@@ -203,6 +204,8 @@ type
   TBorderStyle = bsNone..bsSingle;
   TControlBorderStyle = TBorderStyle;
 
+  TBevelCut = TGraphicsBevelCut;
+
   TMouseButton = (mbLeft, mbRight, mbMiddle);
 
 const
@@ -1847,6 +1850,9 @@ end.
 { =============================================================================
 
   $Log$
+  Revision 1.158  2003/11/22 17:22:14  mattias
+  moved TBevelCut to controls.pp
+
   Revision 1.157  2003/11/03 16:57:47  peter
     * change $ifdef ver1_1 to $ifndef ver1_0 so it works also with
       fpc 1.9.x
diff --git a/lcl/graphics.pp b/lcl/graphics.pp
index 8652bb7002..2022d180f3 100644
--- a/lcl/graphics.pp
+++ b/lcl/graphics.pp
@@ -157,8 +157,6 @@ type
                           PercentDone: Byte; RedrawNow: Boolean; const R: TRect;
                           const Msg: string; var DoContinue: Boolean) of object;
 
-  TBevelCut = TGraphicsBevelCut;
-
   { For Delphi compatibility }
   TPixelFormat = (
     pfDevice,
@@ -715,7 +713,7 @@ type
     Procedure FillRect(X1,Y1,X2,Y2 : Integer);
     procedure FloodFill(X, Y: Integer; FillColor: TColor; FillStyle: TFillStyle);
     procedure Frame3d(var ARect : TRect; const FrameWidth : integer;
-                      const Style: TBevelCut);
+                      const Style: TGraphicsBevelCut);
     procedure Frame(const ARect: TRect);        // border using pen
     procedure Frame(X1,Y1,X2,Y2 : Integer);     // border using pen
     procedure FrameRect(const ARect: TRect);    // border using brush
@@ -1259,6 +1257,9 @@ end.
 { =============================================================================
 
   $Log$
+  Revision 1.97  2003/11/22 17:22:14  mattias
+  moved TBevelCut to controls.pp
+
   Revision 1.96  2003/11/03 16:57:47  peter
     * change $ifdef ver1_1 to $ifndef ver1_0 so it works also with
       fpc 1.9.x
diff --git a/lcl/include/canvas.inc b/lcl/include/canvas.inc
index 5258c6ce09..b170287134 100644
--- a/lcl/include/canvas.inc
+++ b/lcl/include/canvas.inc
@@ -597,7 +597,7 @@ end;
 
  ------------------------------------------------------------------------------}
 procedure TCanvas.Frame3d(var ARect: TRect; const FrameWidth : integer;
-  const Style : TBevelCut);
+  const Style : TGraphicsBevelCut);
 begin
   Changing;
   RequiredState([csHandleValid]);
@@ -1236,6 +1236,9 @@ end;
 { =============================================================================
 
   $Log$
+  Revision 1.55  2003/11/22 17:22:15  mattias
+  moved TBevelCut to controls.pp
+
   Revision 1.54  2003/11/03 16:57:47  peter
     * change $ifdef ver1_1 to $ifndef ver1_0 so it works also with
       fpc 1.9.x