paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-04-07 01:57:57 +02:00
Code Issues Packages Projects Releases Wiki Activity

Frame3D rect now var again

Browse Source 
git-svn-id: trunk@5151 -
This commit is contained in:
mattias 2004-02-03 08:54:09 +00:00
parent efcf97843b
commit 726e5d46a3
11 changed files with 85 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
Makefile
View File

@ -1,5 +1,5 @@
#
# Don't edit, this file is generated by FPCMake Version 1.1 [2003/12/21]
# Don't edit, this file is generated by FPCMake Version 1.1 [2004/02/02]
#
default: all
MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom
@ -183,11 +183,14 @@ override FPCDIR:=$(FPCDIR)/..
ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),)
override FPCDIR:=$(FPCDIR)/..
ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),)
override FPCDIR:=$(BASEDIR)
ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),)
override FPCDIR=c:/pp
endif
endif
endif
endif
endif
ifndef CROSSDIR
CROSSDIR:=$(FPCDIR)/cross/$(FULL_TARGET)
endif
@ -231,7 +234,7 @@ override CLEAN_FILES+=$(wildcard ./designer/*$(OEXT)) $(wildcard ./designer/*$(P
override INSTALL_BASEDIR=share/lazarus
override DIST_DESTDIR=$(BASEDIR)/dist
override COMPILER_OPTIONS+=-gl
override COMPILER_INCLUDEDIR+=include include/$(OS_TARGET)
override COMPILER_INCLUDEDIR+=debugger designer packager include include/$(OS_TARGET)
override COMPILER_UNITDIR+=lcl/units/$(CPU_TARGET)/$(OS_TARGET) lcl/units/$(CPU_TARGET)/$(OS_TARGET)/$(LCL_PLATFORM) components/units/$(CPU_TARGET)/$(OS_TARGET) components/custom components/mpaslex designer designer/units debugger ideintf/units packager packager/units/$(CPU_TARGET)/$(OS_TARGET) .
override COMPILER_TARGETDIR+=.
ifdef REQUIRE_UNITSDIR
@ -437,7 +440,7 @@ CROSSBINDIR=
endif
ifeq ($(OS_SOURCE),linux)
ifndef GCCLIBDIR
GCCLIBDIR:=$(shell dirname `(gcc -v 2>&1)| head -n 1| awk '{ print $$4 } '`)
GCCLIBDIR:=$(shell dirname `gcc -print-libgcc-file-name`)
endif
ifndef OTHERLIBDIR
OTHERLIBDIR:=$(shell grep -v "^\#" /etc/ld.so.conf | awk '{ ORS=" "; print $1 }')
@ -1100,6 +1103,32 @@ REQUIRE_PACKAGES_IBASE=1
REQUIRE_PACKAGES_SQLITE=1
endif
endif
ifeq ($(OS_TARGET),netbsd)
ifeq ($(CPU_TARGET),powerpc)
REQUIRE_PACKAGES_RTL=1
REQUIRE_PACKAGES_PASZLIB=1
REQUIRE_PACKAGES_NETDB=1
REQUIRE_PACKAGES_LIBASYNC=1
REQUIRE_PACKAGES_FCL=1
REQUIRE_PACKAGES_REGEXPR=1
REQUIRE_PACKAGES_MYSQL=1
REQUIRE_PACKAGES_IBASE=1
REQUIRE_PACKAGES_SQLITE=1
endif
endif
ifeq ($(OS_TARGET),netbsd)
ifeq ($(CPU_TARGET),sparc)
REQUIRE_PACKAGES_RTL=1
REQUIRE_PACKAGES_PASZLIB=1
REQUIRE_PACKAGES_NETDB=1
REQUIRE_PACKAGES_LIBASYNC=1
REQUIRE_PACKAGES_FCL=1
REQUIRE_PACKAGES_REGEXPR=1
REQUIRE_PACKAGES_MYSQL=1
REQUIRE_PACKAGES_IBASE=1
REQUIRE_PACKAGES_SQLITE=1
endif
endif
ifeq ($(OS_TARGET),amiga)
ifeq ($(CPU_TARGET),m68k)
REQUIRE_PACKAGES_RTL=1
@ -1220,10 +1249,14 @@ ifeq ($(OS_TARGET),darwin)
ifeq ($(CPU_TARGET),powerpc)
REQUIRE_PACKAGES_RTL=1
REQUIRE_PACKAGES_PASZLIB=1
REQUIRE_PACKAGES_FCL=1
REQUIRE_PACKAGES_REGEXPR=1
REQUIRE_PACKAGES_NETDB=1
REQUIRE_PACKAGES_LIBASYNC=1
REQUIRE_PACKAGES_PTHREADS=1
REQUIRE_PACKAGES_FCL=1
REQUIRE_PACKAGES_REGEXPR=1
REQUIRE_PACKAGES_MYSQL=1
REQUIRE_PACKAGES_IBASE=1
REQUIRE_PACKAGES_SQLITE=1
endif
endif
ifeq ($(OS_TARGET),emx)

2
Makefile.fpc
View File

@ -24,7 +24,7 @@ unitdir=lcl/units/$(CPU_TARGET)/$(OS_TARGET) \
designer designer/units debugger \
ideintf/units \
packager packager/units/$(CPU_TARGET)/$(OS_TARGET) .
includedir=include include/$(OS_TARGET)
includedir=debugger designer packager include include/$(OS_TARGET)
targetdir=.
[clean]

5
lcl/graphics.pp
View File

@ -720,7 +720,7 @@ type
Procedure FillRect(const ARect : TRect);
Procedure FillRect(X1,Y1,X2,Y2 : Integer);
procedure FloodFill(X, Y: Integer; FillColor: TColor; FillStyle: TFillStyle);
procedure Frame3d(const ARect : TRect; const FrameWidth : integer;
procedure Frame3d(var ARect : TRect; const FrameWidth : integer;
const Style: TGraphicsBevelCut);
procedure Frame(const ARect: TRect); // border using pen
procedure Frame(X1,Y1,X2,Y2 : Integer); // border using pen
@ -1261,6 +1261,9 @@ end.
{ =============================================================================
$Log$
Revision 1.108 2004/02/03 08:54:09 mattias
Frame3D rect now var again
Revision 1.107 2004/02/02 22:01:51 mattias
fpImage is now used as default, deactivate it with -dDisableFPImage

7
lcl/include/canvas.inc
View File

@ -592,10 +592,10 @@ end;
{------------------------------------------------------------------------------
Method: TCanvas.Frame3d
Params: Rect
Returns: Nothing
Returns: the inflated rectangle (the inner rectangle without the frame)
------------------------------------------------------------------------------}
procedure TCanvas.Frame3d(const ARect: TRect; const FrameWidth : integer;
procedure TCanvas.Frame3d(var ARect: TRect; const FrameWidth : integer;
const Style : TGraphicsBevelCut);
begin
Changing;
@ -1257,6 +1257,9 @@ end;
{ =============================================================================
$Log$
Revision 1.64 2004/02/03 08:54:09 mattias
Frame3D rect now var again
Revision 1.63 2004/02/02 15:46:19 mattias
implemented basic TSplitter, still many ToDos

10
lcl/include/intfbaselcl.inc
View File

@ -112,7 +112,7 @@ begin
Result:= 0;
end;
function TInterfaceBase.Frame3d(DC: HDC; const ARect: TRect;
function TInterfaceBase.Frame3d(DC: HDC; var ARect: TRect;
const FrameWidth: integer; const Style: TGraphicsBevelCut) : boolean;
begin
Result:= false;
@ -561,8 +561,11 @@ end;
function TInterfaceBase.DrawSplitter(DC: HDC; const ARect: TRect;
Horizontal: boolean): boolean;
var
DrawingRect: TRect;
begin
Result := Frame3D(DC,ARect,1,bvRaised);
DrawingRect:=ARect;
Result := Frame3D(DC,DrawingRect,1,bvRaised);
end;
function TInterfaceBase.SetCaretRespondToFocus(Handle: HWnd;
@ -603,6 +606,9 @@ end;
{ =============================================================================
$Log$
Revision 1.16 2004/02/03 08:54:09 mattias
Frame3D rect now var again
Revision 1.15 2004/02/02 15:46:19 mattias
implemented basic TSplitter, still many ToDos

5
lcl/include/lclintf.inc
View File

@ -110,7 +110,7 @@ begin
Result:= InterfaceObject.Frame(DC, ARect);
end;
function Frame3d(DC : HDC; const ARect : TRect; const FrameWidth : integer;
function Frame3d(DC : HDC; var ARect : TRect; const FrameWidth : integer;
const Style: TGraphicsBevelCut) : boolean;
begin
Result:= InterfaceObject.Frame3d(DC, ARect, FrameWidth, Style);
@ -506,6 +506,9 @@ end;
{ =============================================================================
$Log$
Revision 1.14 2004/02/03 08:54:09 mattias
Frame3D rect now var again
Revision 1.13 2004/02/02 15:46:19 mattias
implemented basic TSplitter, still many ToDos

5
lcl/include/lclintfh.inc
View File

@ -75,7 +75,7 @@ function GetScrollbarVisible(Handle: HWND; SBStyle: Integer): boolean; {$IFDEF I
function GetWindowRelativePosition(Handle : hwnd; var Left, Top: integer): boolean; {$IFDEF IF_BASE_MEMBER}virtual;{$ENDIF}
function Frame(DC: HDC; const ARect: TRect): Integer; {$IFDEF IF_BASE_MEMBER}virtual;{$ENDIF}
function Frame3d(DC: HDC; const ARect: TRect; const FrameWidth : integer; const Style : TGraphicsBevelCut): Boolean; {$IFDEF IF_BASE_MEMBER}virtual;{$ENDIF}
function Frame3d(DC: HDC; var ARect: TRect; const FrameWidth : integer; const Style : TGraphicsBevelCut): Boolean; {$IFDEF IF_BASE_MEMBER}virtual;{$ENDIF}
function GetAcceleratorString(const AVKey: Byte; const AShiftState: TShiftState): String; {$IFDEF IF_BASE_MEMBER}virtual;{$ENDIF}
@ -148,6 +148,9 @@ procedure RaiseLastOSError;
{ =============================================================================
$Log$
Revision 1.14 2004/02/03 08:54:09 mattias
Frame3D rect now var again
Revision 1.13 2004/02/02 15:46:19 mattias
implemented basic TSplitter, still many ToDos

15
lcl/interfaces/gtk/gtkwinapi.inc
View File

@ -3365,7 +3365,7 @@ end;
Draws a 3d border in GTK native style.
------------------------------------------------------------------------------}
function TGtkObject.Frame3d(DC : HDC; const ARect : TRect;
function TGtkObject.Frame3d(DC : HDC; var ARect : TRect;
const FrameWidth : integer; const Style : TBevelCut) : boolean;
const GTKThinShadowType: array[TBevelCut] of integer =
@ -3381,7 +3381,6 @@ var
Area: TGdkRectangle;
ShadowType: Integer;
AWindow: PGdkWindow;
CurRect: TRect;
begin
Result := IsValidDC(DC);
if not Result then exit;
@ -3434,8 +3433,6 @@ begin
//' light_gc=',HexStr(Cardinal(TheStyle^.light_gc[GTK_STATE_NORMAL]),8),
//'');
CurRect:=ARect;
for i:= 1 to FrameWidth do begin
{ // left edge
gdk_draw_line(Drawable, LeftTopGC,
@ -3463,9 +3460,10 @@ begin
@Area,
ClientWidget,
'button',
CurRect.Left+DCOrigin.X, CurRect.Top+DCOrigin.Y,
CurRect.Right-CurRect.Left, CurRect.Bottom-CurRect.Top);
InflateRect(CurRect, -1, -1);
ARect.Left+DCOrigin.X, ARect.Top+DCOrigin.Y,
ARect.Right-ARect.Left, ARect.Bottom-ARect.Top);
// inflate the rectangle (! ARect will be returned to the user with this)
InflateRect(ARect, -1, -1);
end;
end;
end;
@ -8693,6 +8691,9 @@ end;
{ =============================================================================
$Log$
Revision 1.325 2004/02/03 08:54:09 mattias
Frame3D rect now var again
Revision 1.324 2004/02/02 15:46:19 mattias
implemented basic TSplitter, still many ToDos

5
lcl/interfaces/gtk/gtkwinapih.inc
View File

@ -80,7 +80,7 @@ function ExtSelectClipRGN(dc: hdc; rgn : hrgn; Mode : Longint) : Integer; overr
function FillRect(DC: HDC; const Rect: TRect; Brush: HBRUSH): Boolean; override;
function Frame(DC: HDC; const ARect: TRect): Integer; override;
function Frame3d(DC: HDC; const ARect: TRect; const FrameWidth : integer; const Style : TBevelCut): Boolean; override;
function Frame3d(DC: HDC; var ARect: TRect; const FrameWidth : integer; const Style : TBevelCut): Boolean; override;
function FrameRect(DC: HDC; const ARect: TRect; hBr: HBRUSH): Integer; override;
Function GetActiveWindow : HWND; override;
@ -214,6 +214,9 @@ Function WindowFromPoint(Point : TPoint) : HWND; override;
{ =============================================================================
$Log$
Revision 1.86 2004/02/03 08:54:09 mattias
Frame3D rect now var again
Revision 1.85 2004/02/02 15:46:19 mattias
implemented basic TSplitter, still many ToDos

6
lcl/interfaces/win32/win32winapi.inc
View File

@ -1156,7 +1156,8 @@ End;
Draws a 3D border in GTK native style.
NOTE: This function is mapped to DrawEdge on Windows.
------------------------------------------------------------------------------}
Function TWin32Object.Frame3D(DC: HDC; const Rect: TRect; Const FrameWidth: Integer; Const Style: TBevelCut): Boolean;
Function TWin32Object.Frame3D(DC: HDC; var Rect: TRect;
Const FrameWidth: Integer; Const Style: TBevelCut): Boolean;
Const
Edge: Array[TBevelCut] Of Integer = (0, EDGE_ETCHED, EDGE_RAISED);
Begin
@ -2911,6 +2912,9 @@ end;
{ =============================================================================
$Log$
Revision 1.98 2004/02/03 08:54:09 mattias
Frame3D rect now var again
Revision 1.97 2004/02/02 15:46:19 mattias
implemented basic TSplitter, still many ToDos

5
lcl/interfaces/win32/win32winapih.inc
View File

@ -77,7 +77,7 @@ function ExtSelectClipRGN(dc: hdc; rgn : hrgn; Mode : Longint) : Integer; overri
Function FillRect(DC: HDC; Const Rect: TRect; Brush: HBRUSH): Boolean; Override;
{ Draws a 3D border in GTK native style. }
Function Frame3D(DC: HDC; const Rect: TRect; Const FrameWidth: Integer; Const Style: TBevelCut): Boolean; Override;
Function Frame3D(DC: HDC; var Rect: TRect; Const FrameWidth: Integer; Const Style: TBevelCut): Boolean; Override;
function GetBitmapRawImageDescription(Bitmap: HBITMAP; Desc: PRawImageDescription): Boolean; Override;
function GetDeviceRawImageDescription(DC: HDC; Desc: PRawImageDescription): boolean; Override;
@ -190,6 +190,9 @@ Procedure DeleteCriticalSection(var CritSection: TCriticalSection); Override;
{ =============================================================================
$Log$
Revision 1.45 2004/02/03 08:54:09 mattias
Frame3D rect now var again
Revision 1.44 2004/02/02 15:46:19 mattias
implemented basic TSplitter, still many ToDos