You can subscribe to this list here.
| 2002 |
Jan
|
Feb
|
Mar
|
Apr
|
May
(109) |
Jun
(322) |
Jul
(693) |
Aug
(335) |
Sep
(147) |
Oct
(146) |
Nov
(279) |
Dec
(147) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2003 |
Jan
(362) |
Feb
(637) |
Mar
(407) |
Apr
(115) |
May
(134) |
Jun
(770) |
Jul
(330) |
Aug
(533) |
Sep
(585) |
Oct
(511) |
Nov
(692) |
Dec
(558) |
| 2004 |
Jan
(1696) |
Feb
(1207) |
Mar
(856) |
Apr
(788) |
May
(789) |
Jun
(416) |
Jul
(277) |
Aug
(353) |
Sep
(418) |
Oct
(176) |
Nov
(199) |
Dec
(528) |
| 2005 |
Jan
(322) |
Feb
(333) |
Mar
(276) |
Apr
(74) |
May
(272) |
Jun
(48) |
Jul
(64) |
Aug
(192) |
Sep
(174) |
Oct
(150) |
Nov
(95) |
Dec
(56) |
| 2006 |
Jan
(75) |
Feb
(165) |
Mar
(100) |
Apr
(182) |
May
(55) |
Jun
(135) |
Jul
(92) |
Aug
(67) |
Sep
(28) |
Oct
(46) |
Nov
(64) |
Dec
(49) |
| 2007 |
Jan
(67) |
Feb
(20) |
Mar
(53) |
Apr
(30) |
May
(28) |
Jun
(98) |
Jul
(27) |
Aug
(67) |
Sep
(29) |
Oct
(28) |
Nov
(42) |
Dec
(57) |
| 2008 |
Jan
(56) |
Feb
(37) |
Mar
(31) |
Apr
(21) |
May
(12) |
Jun
(12) |
Jul
(24) |
Aug
(32) |
Sep
(43) |
Oct
(79) |
Nov
(56) |
Dec
(53) |
| 2009 |
Jan
(84) |
Feb
(16) |
Mar
(43) |
Apr
(40) |
May
(22) |
Jun
(31) |
Jul
(61) |
Aug
(73) |
Sep
(39) |
Oct
(64) |
Nov
(19) |
Dec
(26) |
| 2010 |
Jan
(48) |
Feb
(16) |
Mar
(37) |
Apr
(20) |
May
(27) |
Jun
(33) |
Jul
(6) |
Aug
(6) |
Sep
(20) |
Oct
(37) |
Nov
(62) |
Dec
(11) |
| 2011 |
Jan
(12) |
Feb
(24) |
Mar
(15) |
Apr
(11) |
May
(14) |
Jun
(42) |
Jul
(14) |
Aug
(8) |
Sep
(27) |
Oct
(15) |
Nov
(47) |
Dec
(1) |
| 2012 |
Jan
(6) |
Feb
(70) |
Mar
(20) |
Apr
(4) |
May
(14) |
Jun
(73) |
Jul
(13) |
Aug
(19) |
Sep
(43) |
Oct
(17) |
Nov
(12) |
Dec
(3) |
| 2013 |
Jan
(16) |
Feb
(1) |
Mar
(3) |
Apr
(4) |
May
(23) |
Jun
(2) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2014 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
(1) |
Oct
|
Nov
|
Dec
|
| 2022 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
(3) |
Nov
|
Dec
|
|
From: paule32 <pau...@gm...> - 2022-10-31 16:19:18
|
Hello, Is there a free (Common) LISP JvInterpreter ? Thanks for ideas, paule32 |
|
From: paule32 <pau...@gm...> - 2022-10-31 16:18:04
|
Hello, is there a free usable C/C++ JvInterpreter ? Thanks for ideas, paule32 |
|
From: paule32 <pau...@gm...> - 2022-10-31 16:17:09
|
Hello, I download the JvInterpreter and the other Source Codes that comes with Jedi. I tried the following code: type TTestClass = class(TObject) public end; without Error. I tried the following code: type TTestClass = class(TObject) public constructor Create; end; And I get error in "constructor" Line. My Question: Is it not possible to use "constructors" ? When it is possible, how can I get this ? Thanks for ideas, paule32 |
|
From: Dalton N <ro...@ya...> - 2013-06-25 18:29:44
|
Hi, I reinstall and works, :) Thanks... ________________________________ De: Dalton N <ro...@ya...> Para: "jvc...@li..." <jvc...@li...> Enviadas: Terça-feira, 25 de Junho de 2013 15:11 Assunto: [JVCL-Checkins] JvDateXX.ShowNullDate; Property does not exist! Jedi 3.47 Help!!! After I update jed for 3.47 my projects having this problem : Error reading JvDateXX.ShowNullDate; Property does not exist! Thanks! ------------------------------------------------------------------------------ This SF.net email is sponsored by Windows: Build for Windows Store. http://p.sf.net/sfu/windows-dev2dev _______________________________________________ jvcl-checkins mailing list jvc...@li... https://lists.sourceforge.net/lists/listinfo/jvcl-checkins |
|
From: Dalton N <ro...@ya...> - 2013-06-25 18:11:25
|
Help!!! After I update jed for 3.47 my projects having this problem : Error reading JvDateXX.ShowNullDate; Property does not exist! Thanks! |
|
From: <ah...@us...> - 2013-05-25 16:01:34
|
Revision: 13529
http://jvcl.svn.sourceforge.net/jvcl/?rev=13529&view=rev
Author: ahuser
Date: 2013-05-25 16:01:27 +0000 (Sat, 25 May 2013)
Log Message:
-----------
Mantis 5923: TJvCustomURLGrabber can save a file of 0 size if Internet connection not available.
Modified Paths:
--------------
trunk/jvcl/run/JvUrlListGrabber.pas
Modified: trunk/jvcl/run/JvUrlListGrabber.pas
===================================================================
--- trunk/jvcl/run/JvUrlListGrabber.pas 2013-05-25 15:53:17 UTC (rev 13528)
+++ trunk/jvcl/run/JvUrlListGrabber.pas 2013-05-25 16:01:27 UTC (rev 13529)
@@ -385,6 +385,8 @@
FSize: Int64;
// What has been read so far
FBytesRead: Int64;
+ // True if data has been read
+ FGrabbingStarted: Boolean;
protected
// Event callers
procedure DoError(ErrorMsg: string);
@@ -976,6 +978,10 @@
procedure TJvCustomUrlGrabber.DoEnded;
begin
+ // Don't create empty file/stream if we didn't start grabbing
+ if not FGrabbingStarted Then
+ Exit;
+
Stream.Position := 0;
if FOutputMode = omStream then
begin
@@ -1238,6 +1244,7 @@
begin
NameThread(ThreadName);
SetGrabberStatus(gsStopped);
+ FGrabber.FGrabbingStarted := False;
FGrabber.Stream := nil;
try
Grab;
@@ -1252,10 +1259,11 @@
end;
end;
-procedure TJvCustomUrlGrabberThread.SetGrabberStatus(
- Status: TJvGrabberStatus);
+procedure TJvCustomUrlGrabberThread.SetGrabberStatus(Status: TJvGrabberStatus);
begin
FGrabber.FStatus := Status;
+ if Status = gsGrabbing then
+ FGrabber.FGrabbingStarted := True;
end;
procedure TJvCustomUrlGrabberThread.UpdateGrabberProgress;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ah...@us...> - 2013-05-25 15:53:24
|
Revision: 13528
http://jvcl.svn.sourceforge.net/jvcl/?rev=13528&view=rev
Author: ahuser
Date: 2013-05-25 15:53:17 +0000 (Sat, 25 May 2013)
Log Message:
-----------
Mantis 5920: TJvColorButton rendering broken after Enabled toggling
Modified Paths:
--------------
trunk/jvcl/run/JvColorButton.pas
Modified: trunk/jvcl/run/JvColorButton.pas
===================================================================
--- trunk/jvcl/run/JvColorButton.pas 2013-05-25 15:48:59 UTC (rev 13527)
+++ trunk/jvcl/run/JvColorButton.pas 2013-05-25 15:53:17 UTC (rev 13528)
@@ -286,7 +286,10 @@
OffsetRect(Rec, 1, 1);
if Enabled then
- Frame3D(Canvas, Rec, cl3DDkShadow, cl3DDkShadow, 1)
+ begin
+ Frame3D(Canvas, Rec, cl3DDkShadow, cl3DDkShadow, 1);
+ Canvas.Brush.Style := bsSolid;
+ end
else
begin
Frame3D(Canvas, Rec, clBtnShadow, clBtnHighLight, 1);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ah...@us...> - 2013-05-25 15:49:09
|
Revision: 13527
http://jvcl.svn.sourceforge.net/jvcl/?rev=13527&view=rev
Author: ahuser
Date: 2013-05-25 15:48:59 +0000 (Sat, 25 May 2013)
Log Message:
-----------
Mantis 5969: Reading a readonly property raises an exception
Modified Paths:
--------------
trunk/jvcl/run/JvPropertyStorage.pas
Modified: trunk/jvcl/run/JvPropertyStorage.pas
===================================================================
--- trunk/jvcl/run/JvPropertyStorage.pas 2013-05-25 14:32:24 UTC (rev 13526)
+++ trunk/jvcl/run/JvPropertyStorage.pas 2013-05-25 15:48:59 UTC (rev 13527)
@@ -266,8 +266,8 @@
procedure TJvPropertyStorage.LoadAnyProperty(PropInfo: PPropInfo);
begin
try
- if PropInfo <> nil then
- ReadProperty (AppStoragePath, GetItemName(PropInfo.Name), TPersistent(FObject), PropInfo.Name);
+ if (PropInfo <> nil) and (PropInfo.SetProc <> nil) then
+ ReadProperty(AppStoragePath, GetItemName(PropInfo.Name), TPersistent(FObject), PropInfo.Name);
except
{ ignore any exception }
end;
@@ -275,8 +275,8 @@
procedure TJvPropertyStorage.StoreAnyProperty(PropInfo: PPropInfo);
begin
- if PropInfo <> nil then
- WriteProperty (AppStoragePath, GetItemName(PropInfo.Name), TPersistent(FObject), PropInfo.Name);
+ if (PropInfo <> nil) and (PropInfo.SetProc <> nil) then // write only if we can load it again
+ WriteProperty(AppStoragePath, GetItemName(PropInfo.Name), TPersistent(FObject), PropInfo.Name);
end;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ah...@us...> - 2013-05-25 14:32:33
|
Revision: 13526
http://jvcl.svn.sourceforge.net/jvcl/?rev=13526&view=rev
Author: ahuser
Date: 2013-05-25 14:32:24 +0000 (Sat, 25 May 2013)
Log Message:
-----------
Mantis #6037: Prevent AutoSelect from stealing the selected item when processing messages
Modified Paths:
--------------
trunk/jvcl/run/JvListView.pas
Modified: trunk/jvcl/run/JvListView.pas
===================================================================
--- trunk/jvcl/run/JvListView.pas 2013-05-25 14:16:02 UTC (rev 13525)
+++ trunk/jvcl/run/JvListView.pas 2013-05-25 14:32:24 UTC (rev 13526)
@@ -1990,13 +1990,16 @@
var
lv: TListItem;
begin
- with Msg do
+ if AutoSelect and (Selected = nil) then // Mantis 6037: Prevent AutoSelect from stealing the selected item when processing messages
begin
- lv := TListItem(WParam);
- if Assigned(lv) and (Items.IndexOf(lv) >= 0) and (LParam = 1) then
+ with Msg do
begin
- lv.Selected := True;
- lv.Focused := True;
+ lv := TListItem(WParam);
+ if Assigned(lv) and (Items.IndexOf(lv) >= 0) and (LParam = 1) then
+ begin
+ lv.Selected := True;
+ lv.Focused := True;
+ end;
end;
end;
end;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ah...@us...> - 2013-05-25 14:16:17
|
Revision: 13525
http://jvcl.svn.sourceforge.net/jvcl/?rev=13525&view=rev
Author: ahuser
Date: 2013-05-25 14:16:02 +0000 (Sat, 25 May 2013)
Log Message:
-----------
Mantis 6016: TJvArrayButton with property CanDown and Downs for make buttons in pressed state
Modified Paths:
--------------
trunk/jvcl/run/JvArrayButton.pas
Modified: trunk/jvcl/run/JvArrayButton.pas
===================================================================
--- trunk/jvcl/run/JvArrayButton.pas 2013-05-25 14:01:53 UTC (rev 13524)
+++ trunk/jvcl/run/JvArrayButton.pas 2013-05-25 14:16:02 UTC (rev 13525)
@@ -46,6 +46,7 @@
private
FPtDown: TPoint;
FPushDown: Boolean;
+ FDown: Boolean;
FColor: TColor;
FRows: Integer;
FCols: Integer;
@@ -54,6 +55,7 @@
FColors: TStringList;
FHints: THintStringList;
FEnableds: array of Boolean;
+ FDowns: array of Boolean;
{$IFDEF JVCLThemesEnabled}
FMouseOverBtn: TPoint;
FThemed: Boolean;
@@ -70,6 +72,8 @@
procedure SetHints(const Value: THintStringList);
function GetEnableds(Index: Integer): Boolean;
procedure SetEnableds(Index: Integer; const Value: Boolean);
+ function GetDowns(Index: Integer): Boolean;
+ procedure SetDowns(Index: Integer; const Value: Boolean);
protected
procedure FontChanged; override;
procedure MouseDown(Button: TMouseButton; Shift: TShiftState; X, Y: Integer); override;
@@ -107,6 +111,7 @@
// A list of individual button Enabled state, from the top-left to the bottom-right button
property Enableds[Index: Integer]: Boolean read GetEnableds write SetEnableds;
+ property Downs[Index: Integer]: Boolean read GetDowns write SetDowns;
published
property Align;
property Anchors;
@@ -114,6 +119,8 @@
property Cols: Integer read FCols write SetCols;
{A List of button captions from the top-left to the bottom-right button}
property Captions: TStrings read GetCaptions write SetCaptions;
+ {Buttons can be stay in pressed state}
+ property CanDown: Boolean read FDown write FDown default False;
property Enabled;
property Font;
property Height default 35;
@@ -188,6 +195,7 @@
FHints.Free;
FColors.Free;
SetLength(FEnableds, 0);
+ SetLength(FDowns, 0);
inherited Destroy;
end;
@@ -205,13 +213,17 @@
Shift: TShiftState; X, Y: Integer);
var
Col, Row: Integer;
+ Index: Integer;
begin
if Button = mbLeft then
begin
MouseToCell(X, Y, Col, Row);
- if FEnableds[Row * Cols + Col] then
+ Index := Row * Cols + Col;
+ if FEnableds[Index] then
begin
FPushDown := True;
+ if FDown then
+ FDowns[Index] := not FDowns[Index];
FPtDown := Point(Col, Row);
Invalidate;
end;
@@ -346,12 +358,14 @@
if (FPtDown.X = Col) and (FPtDown.Y = Row) then
begin
if FPushDown then
- DrawDown
- else
- DrawUp;
+ DrawDown;
end
else
+ if FDowns[Index] then
+ DrawDown
+ else
DrawUp;
+
end;
end;
end;
@@ -376,6 +390,15 @@
end;
end;
+procedure TJvArrayButton.SetDowns(Index: Integer; const Value: Boolean);
+begin
+ if FDowns[Index] <> Value then
+ begin
+ FDowns[Index] := Value;
+ Invalidate;
+ end;
+end;
+
procedure TJvArrayButton.SetRows(const Value: Integer);
begin
if FRows <> Value then
@@ -390,6 +413,7 @@
procedure TJvArrayButton.SizeChanged;
var
OriginalEnableds: array of Boolean;
+ OriginalDowns: array of Boolean;
I: Integer;
MinLength: Integer;
begin
@@ -407,6 +431,24 @@
FEnableds[I] := OriginalEnableds[I];
for I := MinLength to Length(FEnableds) - 1 do
FEnableds[I] := True;
+
+//-----------------------------------------------
+
+ SetLength(OriginalDowns, Length(FDowns));
+
+ for I := 0 to Length(FDowns) - 1 do
+ OriginalDowns[I] := FDowns[I];
+
+ SetLength(FDowns, Rows * Cols);
+
+ MinLength := Length(OriginalDowns);
+ if MinLength > Length(FDowns) then
+ MinLength := Length(FDowns);
+
+ for I := 0 to MinLength - 1 do
+ FDowns[I] := OriginalDowns[I];
+ for I := MinLength to Length(FDowns) - 1 do
+ FDowns[I] := False;
end;
{$IFDEF JVCLThemesEnabled}
@@ -452,6 +494,11 @@
Result := FEnableds[Index];
end;
+function TJvArrayButton.GetDowns(Index: Integer): Boolean;
+begin
+ Result := FDowns[Index];
+end;
+
procedure TJvArrayButton.SetColors(const Value: TStrings);
begin
FColors.Assign(Value);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ah...@us...> - 2013-05-25 14:02:04
|
Revision: 13524
http://jvcl.svn.sourceforge.net/jvcl/?rev=13524&view=rev
Author: ahuser
Date: 2013-05-25 14:01:53 +0000 (Sat, 25 May 2013)
Log Message:
-----------
Mantis 5980: redundant loop body
Modified Paths:
--------------
trunk/jvcl/install/JVCLInstall/Utils.pas
Modified: trunk/jvcl/install/JVCLInstall/Utils.pas
===================================================================
--- trunk/jvcl/install/JVCLInstall/Utils.pas 2013-05-25 13:53:53 UTC (rev 13523)
+++ trunk/jvcl/install/JVCLInstall/Utils.pas 2013-05-25 14:01:53 UTC (rev 13524)
@@ -542,17 +542,15 @@
begin
// remove old paths
for j := 0 to High(Paths) do
- for i := List.Count - 1 downto 0 do
- if Paths[j] <> '' then
- begin
- Path := Paths[j];
- if (Pos(':', Path) = 0) and (Path[1] <> '$') then
- Path := PathDelim + ExtractFileName(Dir) + PathDelim + Paths[j];
- if EndsWith(List[i], Path, True) then
- List.Delete(i)
- else if EndsWith(List[i], Path + '\', True) then
+ if Paths[j] <> '' then
+ begin
+ Path := Paths[j];
+ if (Pos(':', Path) = 0) and (Path[1] <> '$') then
+ Path := PathDelim + ExtractFileName(Dir) + PathDelim + Paths[j];
+ for i := List.Count - 1 downto 0 do
+ if EndsWith(List[i], Path, True) or EndsWith(List[i], Path + '\', True) then
List.Delete(i);
- end;
+ end;
if Add then
// add new paths
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ah...@us...> - 2013-05-25 13:54:03
|
Revision: 13523
http://jvcl.svn.sourceforge.net/jvcl/?rev=13523&view=rev
Author: ahuser
Date: 2013-05-25 13:53:53 +0000 (Sat, 25 May 2013)
Log Message:
-----------
Mantis 6074: Bad type definition in TJvDeviceInfo crashed x64 target
Modified Paths:
--------------
trunk/jvcl/run/JvPrvwDoc.pas
Modified: trunk/jvcl/run/JvPrvwDoc.pas
===================================================================
--- trunk/jvcl/run/JvPrvwDoc.pas 2013-05-25 13:47:02 UTC (rev 13522)
+++ trunk/jvcl/run/JvPrvwDoc.pas 2013-05-25 13:53:53 UTC (rev 13523)
@@ -111,8 +111,8 @@
FPageWidth: Cardinal;
FLogPixelsX: Cardinal;
FOnChange: TNotifyEvent;
- FScreenDC: Longword;
- FReferenceHandle: Longword;
+ FScreenDC: HDC;
+ FReferenceHandle: HDC;
FPhysicalHeight: Cardinal;
FPhysicalWidth: Cardinal;
procedure SetLogPixelsY(const Value: Cardinal);
@@ -122,13 +122,13 @@
procedure SetPageHeight(const Value: Cardinal);
procedure SetPageWidth(const Value: Cardinal);
procedure DefaultDeviceInfo;
- procedure SetReferenceHandle(const Value: Longword);
+ procedure SetReferenceHandle(const Value: HDC);
procedure SetPhysicalHeight(const Value: Cardinal);
procedure SetPhysicalWidth(const Value: Cardinal);
procedure SetOffsetBottom(const Value: Cardinal);
procedure SetOffsetRight(const Value: Cardinal);
protected
- function GetScreenDC: Longword;
+ function GetScreenDC: HDC;
procedure Change;
public
constructor Create;
@@ -143,7 +143,7 @@
function MMToYPx(MM: Single): Integer;
property OnChange: TNotifyEvent read FOnChange write FOnChange;
published
- property ReferenceHandle: Longword read FReferenceHandle write SetReferenceHandle;
+ property ReferenceHandle: HDC read FReferenceHandle write SetReferenceHandle;
property LogPixelsX: Cardinal read FLogPixelsX write SetLogPixesX;
property LogPixelsY: Cardinal read FLogPixelsY write SetLogPixelsY;
property PhysicalWidth: Cardinal read FPhysicalWidth write SetPhysicalWidth;
@@ -695,7 +695,7 @@
FOnChange(Self);
end;
-function TJvDeviceInfo.GetScreenDC: Longword;
+function TJvDeviceInfo.GetScreenDC: HDC;
begin
if FScreenDC <> 0 then
ReleaseDC(HWND_DESKTOP, FScreenDC);
@@ -813,7 +813,7 @@
end;
end;
-procedure TJvDeviceInfo.SetReferenceHandle(const Value: Longword);
+procedure TJvDeviceInfo.SetReferenceHandle(const Value: HDC);
begin
FReferenceHandle := Value;
if FReferenceHandle = 0 then
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ah...@us...> - 2013-05-25 13:47:15
|
Revision: 13522
http://jvcl.svn.sourceforge.net/jvcl/?rev=13522&view=rev
Author: ahuser
Date: 2013-05-25 13:47:02 +0000 (Sat, 25 May 2013)
Log Message:
-----------
Mantis 6101: JvTracker not update OnChange when you move the cursor keys
Modified Paths:
--------------
trunk/jvcl/run/JvTracker.pas
Modified: trunk/jvcl/run/JvTracker.pas
===================================================================
--- trunk/jvcl/run/JvTracker.pas 2013-05-25 13:40:28 UTC (rev 13521)
+++ trunk/jvcl/run/JvTracker.pas 2013-05-25 13:47:02 UTC (rev 13522)
@@ -42,6 +42,12 @@
interface
uses
+ {$IFDEF HAS_UNIT_SYSTEM_UITYPES}
+ System.UITypes, // inline
+ {$ENDIF HAS_UNIT_SYSTEM_UITYPES}
+ {$IFDEF HAS_UNIT_TYPES}
+ Types, // inline
+ {$ENDIF HAS_UNIT_TYPES}
{$IFDEF UNITVERSIONING}
JclUnitVersioning,
{$ENDIF UNITVERSIONING}
@@ -859,7 +865,11 @@
Value := Value - FStep;
VK_RIGHT, VK_DOWN:
Value := Value + FStep;
+ else
+ inherited;
+ Exit;
end;
+ DoChangedValue(FValue);
end;
{$IFDEF UNITVERSIONING}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ah...@us...> - 2013-05-25 13:40:40
|
Revision: 13521
http://jvcl.svn.sourceforge.net/jvcl/?rev=13521&view=rev
Author: ahuser
Date: 2013-05-25 13:40:28 +0000 (Sat, 25 May 2013)
Log Message:
-----------
Mantis 6103: Assign TJvTreeNode.Checked doesn't work
Modified Paths:
--------------
trunk/jvcl/run/JvCheckTreeView.pas
trunk/jvcl/run/JvComCtrls.pas
Modified: trunk/jvcl/run/JvCheckTreeView.pas
===================================================================
--- trunk/jvcl/run/JvCheckTreeView.pas 2013-05-25 13:11:27 UTC (rev 13520)
+++ trunk/jvcl/run/JvCheckTreeView.pas 2013-05-25 13:40:28 UTC (rev 13521)
@@ -400,8 +400,8 @@
mask := TVIF_STATE;
hItem := Node.ItemId;
if TreeView_GetItem(Handle, Item) then
- Result := (((Item.State and TVIS_STATEIMAGEMASK) or TVIS_CHECKED) = TVIS_CHECKED) or
- (((Item.State and TVIS_STATEIMAGEMASK) or TVIS_CHECKED shl 1) = TVIS_CHECKED shl 1)
+ Result := (((Item.state and TVIS_STATEIMAGEMASK) or TVIS_CHECKED) = TVIS_CHECKED) or
+ (((Item.state and TVIS_STATEIMAGEMASK) or TVIS_CHECKED shl 1) = TVIS_CHECKED shl 1)
else
Result := False;
end;
@@ -507,18 +507,15 @@
Item: TTVItem;
begin
FillChar(Item, SizeOf(Item), 0);
- with Item do
- begin
- hItem := Node.ItemId;
- mask := TVIF_STATE;
- StateMask := TVIS_STATEIMAGEMASK;
- TreeView_GetItem(Handle, Item);
- if Value then
- Item.State := Item.State + TVIS_CHECKED
- else
- Item.State := Item.State - TVIS_CHECKED;
- TreeView_SetItem(Handle, Item);
- end;
+ Item.hItem := Node.ItemId;
+ Item.mask := TVIF_STATE;
+ Item.stateMask := TVIS_STATEIMAGEMASK;
+ TreeView_GetItem(Handle, Item);
+ if Value then
+ Item.state := TVIS_CHECKED
+ else
+ Item.state := TVIS_CHECKED shr 1;
+ TreeView_SetItem(Handle, Item);
end;
procedure TJvCheckTreeView.SetRadioItem(Node: TTreeNode; const Value: Boolean);
@@ -595,11 +592,11 @@
begin
Item.hItem := Node.ItemId;
Item.mask := TVIF_STATE;
- Item.StateMask := TVIS_STATEIMAGEMASK;
+ Item.stateMask := TVIS_STATEIMAGEMASK;
TreeView_GetItem(Handle, Item);
- if ((Item.State and TVIS_STATEIMAGEMASK) <> Cardinal(IndexToStateImageMask(CheckBoxOptions.RadioUncheckedIndex))) and
- ((Item.State and TVIS_STATEIMAGEMASK) <> Cardinal(IndexToStateImageMask(CheckBoxOptions.RadioCheckedIndex))) then
+ if ((Item.state and TVIS_STATEIMAGEMASK) <> UINT(IndexToStateImageMask(CheckBoxOptions.RadioUncheckedIndex))) and
+ ((Item.state and TVIS_STATEIMAGEMASK) <> UINT(IndexToStateImageMask(CheckBoxOptions.RadioCheckedIndex))) then
begin
Item.mask := TVIF_STATE or TVIF_HANDLE;
Item.stateMask := TVIS_STATEIMAGEMASK;
Modified: trunk/jvcl/run/JvComCtrls.pas
===================================================================
--- trunk/jvcl/run/JvComCtrls.pas 2013-05-25 13:11:27 UTC (rev 13520)
+++ trunk/jvcl/run/JvComCtrls.pas 2013-05-25 13:40:28 UTC (rev 13521)
@@ -2560,7 +2560,7 @@
mask := TVIF_STATE;
hItem := ItemId;
if TreeView_GetItem(Handle, Item) then
- Result := ((Item.State and TVIS_BOLD) = TVIS_BOLD)
+ Result := ((Item.state and TVIS_BOLD) = TVIS_BOLD)
else
Result := False;
end;
@@ -2581,7 +2581,7 @@
mask := TVIF_STATE;
hItem := ItemId;
if TreeView_GetItem(Handle, Item) then
- Result := ((Item.State and TVIS_CHECKED) = TVIS_CHECKED)
+ Result := ((Item.state and TVIS_CHECKED) = TVIS_CHECKED)
else
Result := False;
end;
@@ -2602,9 +2602,9 @@
hItem := ItemId;
StateMask := TVIS_BOLD;
if Value then
- Item.State := TVIS_BOLD
+ Item.state := TVIS_BOLD
else
- Item.State := 0;
+ Item.state := 0;
TreeView_SetItem(Handle, Item);
end;
end;
@@ -2618,30 +2618,24 @@
begin
FChecked := Value;
if Owner.Owner is TJvTreeView then
- begin
- TJvTreeView(Owner.Owner).SetCheckedInState(Self, FChecked);
- end
+ TJvTreeView(Owner.Owner).SetCheckedInState(Self, FChecked)
else
begin
FillChar(Item, SizeOf(Item), 0);
- with Item do
- begin
- hItem := ItemId;
- mask := TVIF_STATE;
- StateMask := TVIS_STATEIMAGEMASK;
- if Value then
- Item.State := TVIS_CHECKED
- else
- Item.State := TVIS_CHECKED shr 1;
- TreeView_SetItem(Handle, Item);
- end;
+ Item.hItem := ItemId;
+ Item.mask := TVIF_STATE;
+ Item.stateMask := TVIS_STATEIMAGEMASK;
+ if Value then
+ Item.state := TVIS_CHECKED
+ else
+ Item.state := TVIS_CHECKED shr 1;
+ TreeView_SetItem(Handle, Item);
end;
DoCheckedChange;
end;
end;
-procedure TJvTreeNode.MoveTo(Destination: TTreeNode;
- Mode: TNodeAttachMode);
+procedure TJvTreeNode.MoveTo(Destination: TTreeNode; Mode: TNodeAttachMode);
var
SaveItem, Item: TTVItem;
begin
@@ -2841,7 +2835,7 @@
mask := TVIF_STATE;
hItem := Node.ItemId;
if TreeView_GetItem(Handle, Item) then
- Result := ((Item.State and TVIS_CHECKED) = TVIS_CHECKED)
+ Result := ((Item.state and TVIS_CHECKED) = TVIS_CHECKED)
else
Result := False;
end;
@@ -3021,9 +3015,9 @@
mask := TVIF_STATE;
StateMask := TVIS_STATEIMAGEMASK;
if Value then
- Item.State := TVIS_CHECKED
+ Item.state := TVIS_CHECKED
else
- Item.State := TVIS_CHECKED shr 1;
+ Item.state := TVIS_CHECKED shr 1;
TreeView_SetItem(Handle, Item);
end;
end;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ah...@us...> - 2013-05-25 13:11:33
|
Revision: 13520
http://jvcl.svn.sourceforge.net/jvcl/?rev=13520&view=rev
Author: ahuser
Date: 2013-05-25 13:11:27 +0000 (Sat, 25 May 2013)
Log Message:
-----------
Mantis 6133: JvTrayIcon prevents application from closing with FormCloseQuery()
Modified Paths:
--------------
trunk/jvcl/run/JvTrayIcon.pas
Modified: trunk/jvcl/run/JvTrayIcon.pas
===================================================================
--- trunk/jvcl/run/JvTrayIcon.pas 2013-05-25 13:08:38 UTC (rev 13519)
+++ trunk/jvcl/run/JvTrayIcon.pas 2013-05-25 13:11:27 UTC (rev 13520)
@@ -182,7 +182,7 @@
procedure DoMouseUp(Button: TMouseButton; Shift: TShiftState; X, Y: Integer);
procedure DoDoubleClick(Button: TMouseButton; Shift: TShiftState; X, Y: Integer);
procedure DoClick(Button: TMouseButton; Shift: TShiftState; X, Y: Integer);
- procedure doOnQueryEndSession;
+ procedure DoOnQueryEndSession;
function ApplicationHook(var Msg: TMessage): Boolean;
function NotifyIcon(uFlags: UINT; dwMessage: DWORD): Boolean;
procedure SetCurrentIcon(Value: TIcon); //HEG: New
@@ -826,7 +826,7 @@
DoContextPopup(X, Y);
end;
-procedure TJvTrayIcon.doOnQueryEndSession;
+procedure TJvTrayIcon.DoOnQueryEndSession;
begin
if Assigned(FOnQueryEndSession) then
FOnQueryEndSession(Self);
@@ -1489,14 +1489,8 @@
end;
WM_QUERYENDSESSION:
begin
- doOnQueryEndSession;
- // Add by Winston Feng 2003-9-28
- // Handle the QueryEndSession and TaskbarCreated message, so trayicon
- // will be deleted and restored correctly.
- // For D2009 and above, we must let the default window proc handle it.
- {$IFNDEF DELPHI2009_UP}
- Result := 1;
- {$ENDIF ~DELPHI2009_UP}
+ DoOnQueryEndSession;
+ Result := DefWindowProc(FHandle, Msg, WParam, LParam);
end;
WM_ENDSESSION:
// (rb) Is it really necessairy to respond to WM_ENDSESSION?
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ah...@us...> - 2013-05-25 13:08:46
|
Revision: 13519
http://jvcl.svn.sourceforge.net/jvcl/?rev=13519&view=rev
Author: ahuser
Date: 2013-05-25 13:08:38 +0000 (Sat, 25 May 2013)
Log Message:
-----------
Update svn:ingore for XE4
Property Changed:
----------------
trunk/jvcl/lib/d18/win32/debug/
trunk/jvcl/lib/d18/win64/
trunk/jvcl/lib/d18/win64/debug/
Property changes on: trunk/jvcl/lib/d18/win32/debug
___________________________________________________________________
Added: svn:ignore
+ *.dcu
*.bpi
*.dcp
*.lib
*.dfm
Property changes on: trunk/jvcl/lib/d18/win64
___________________________________________________________________
Modified: svn:ignore
- *.dcu
*.dcp
*.dfm
*.a
+ *.dcu
*.dcp
*.bpi
*.lib
*.dfm
*.a
*.o
Property changes on: trunk/jvcl/lib/d18/win64/debug
___________________________________________________________________
Added: svn:ignore
+ *.dcu
*.dcp
*.bpi
*.lib
*.dfm
*.a
*.o
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ah...@us...> - 2013-05-25 12:51:38
|
Revision: 13518
http://jvcl.svn.sourceforge.net/jvcl/?rev=13518&view=rev
Author: ahuser
Date: 2013-05-25 12:51:28 +0000 (Sat, 25 May 2013)
Log Message:
-----------
Mantis #6130: Property ExplicitWidth does not exist when using Delphi 7
Modified Paths:
--------------
trunk/jvcl/run/JvHLEditorPropertyForm.dfm
trunk/jvcl/run/JvJVCLAboutForm.dfm
trunk/jvcl/run/JvLogForm.dfm
trunk/jvcl/run/JvProfilerForm.dfm
trunk/jvcl/run/JvSpellerForm.dfm
Modified: trunk/jvcl/run/JvHLEditorPropertyForm.dfm
===================================================================
--- trunk/jvcl/run/JvHLEditorPropertyForm.dfm 2013-05-25 12:24:24 UTC (rev 13517)
+++ trunk/jvcl/run/JvHLEditorPropertyForm.dfm 2013-05-25 12:51:28 UTC (rev 13518)
@@ -26,10 +26,6 @@
TabOrder = 0
object tsEditor: TTabSheet
Caption = 'Editor'
- ExplicitLeft = 0
- ExplicitTop = 0
- ExplicitWidth = 0
- ExplicitHeight = 0
object lblEditorSpeedSettings: TLabel
Left = 30
Top = 11
@@ -173,10 +169,6 @@
end
object tsColors: TTabSheet
Caption = 'Colors'
- ExplicitLeft = 0
- ExplicitTop = 0
- ExplicitWidth = 0
- ExplicitHeight = 0
object lblColorSpeedSettingsFor: TLabel
Left = 16
Top = 11
Modified: trunk/jvcl/run/JvJVCLAboutForm.dfm
===================================================================
--- trunk/jvcl/run/JvJVCLAboutForm.dfm 2013-05-25 12:24:24 UTC (rev 13517)
+++ trunk/jvcl/run/JvJVCLAboutForm.dfm 2013-05-25 12:51:28 UTC (rev 13518)
@@ -635,7 +635,6 @@
C383C1C62B2174AB86419B6981FF0070D7F537450D5C14ACF547F2C0DA65DAB6
3ECD31F7119A5FECDBAFF9F59BFEFD9AFEA7A8AB8CB97A12F53FFFD9}
OnMouseDown = Panel1MouseDown
- ExplicitWidth = 137
end
object imgProjectJEDI: TImage
Left = 13
Modified: trunk/jvcl/run/JvLogForm.dfm
===================================================================
--- trunk/jvcl/run/JvLogForm.dfm 2013-05-25 12:24:24 UTC (rev 13517)
+++ trunk/jvcl/run/JvLogForm.dfm 2013-05-25 12:51:28 UTC (rev 13518)
@@ -41,7 +41,6 @@
ParentShowHint = False
ShowHint = True
TabOrder = 0
- ExplicitWidth = 413
object ToolButton2: TToolButton
Left = 0
Top = 0
@@ -97,8 +96,6 @@
RowSelect = True
TabOrder = 1
ViewStyle = vsReport
- ExplicitWidth = 413
- ExplicitHeight = 313
end
object ImageList1: TImageList
Left = 16
Modified: trunk/jvcl/run/JvProfilerForm.dfm
===================================================================
--- trunk/jvcl/run/JvProfilerForm.dfm 2013-05-25 12:24:24 UTC (rev 13517)
+++ trunk/jvcl/run/JvProfilerForm.dfm 2013-05-25 12:51:28 UTC (rev 13518)
@@ -51,7 +51,6 @@
Align = alBottom
BevelOuter = bvNone
TabOrder = 0
- ExplicitTop = 233
DesignSize = (
445
33)
@@ -143,6 +142,5 @@
TabOrder = 1
ViewStyle = vsReport
OnColumnClick = lvReportColumnClick
- ExplicitHeight = 233
end
end
Modified: trunk/jvcl/run/JvSpellerForm.dfm
===================================================================
--- trunk/jvcl/run/JvSpellerForm.dfm 2013-05-25 12:24:24 UTC (rev 13517)
+++ trunk/jvcl/run/JvSpellerForm.dfm 2013-05-25 12:51:28 UTC (rev 13518)
@@ -25,8 +25,6 @@
ParentShowHint = False
ShowHint = True
WordWrap = True
- ExplicitWidth = 50
- ExplicitHeight = 13
end
object TextPanel: TPanel
Left = 0
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ah...@us...> - 2013-05-25 12:24:35
|
Revision: 13517
http://jvcl.svn.sourceforge.net/jvcl/?rev=13517&view=rev
Author: ahuser
Date: 2013-05-25 12:24:24 +0000 (Sat, 25 May 2013)
Log Message:
-----------
Mantis #6069: TJvDBGrid.CalcSizingState
Modified Paths:
--------------
trunk/jvcl/run/JvDBGrid.pas
Modified: trunk/jvcl/run/JvDBGrid.pas
===================================================================
--- trunk/jvcl/run/JvDBGrid.pas 2013-05-25 12:09:03 UTC (rev 13516)
+++ trunk/jvcl/run/JvDBGrid.pas 2013-05-25 12:24:24 UTC (rev 13517)
@@ -3767,10 +3767,10 @@
end;
procedure TJvDBGrid.CalcSizingState(X, Y: Integer; var State: TGridState;
- var Index: Longint; var SizingPos, SizingOfs: Integer;
- var FixedInfo: TGridDrawInfo);
+ var Index: Longint; var SizingPos, SizingOfs: Integer; var FixedInfo: TGridDrawInfo);
var
Coord: TGridCoord;
+ DrawInfo: TGridDrawInfo;
begin
inherited CalcSizingState(X, Y, State, Index, SizingPos, SizingOfs, FixedInfo);
@@ -3778,14 +3778,18 @@
if not (dgColumnResize in Options) and not (csDesigning in ComponentState) then
Exit;
-
FCanResizeColumn := State = gsColSizing; // If true, mouse double clicking can resize column.
- // Mantis 5818: the inherited code sometimes gives an invalid index for the column
- if Index > LeftCol + VisibleColCount then
- Index := LeftCol + VisibleColCount;
+ { Mantis 5818: Index-out-of-range error when there is only one visible column partially displayed }
+ CalcDrawInfo(DrawInfo);
+ if (DrawInfo.Horz.FullVisBoundary = DrawInfo.Horz.FixedBoundary) then
+ Index := Index - 1; // Index from inherited code has the value of 2.
- FResizeColumnIndex := Index - 1;// Store the column index to resize.
+ { Store the column index to resize }
+ if dgIndicator in Options then
+ FResizeColumnIndex := Index - 1
+ else
+ FResizeColumnIndex := Index; // Mantis 6061
if (State = gsNormal) and (Y <= RowHeights[0]) then
begin
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ah...@us...> - 2013-05-25 12:09:14
|
Revision: 13516
http://jvcl.svn.sourceforge.net/jvcl/?rev=13516&view=rev
Author: ahuser
Date: 2013-05-25 12:09:03 +0000 (Sat, 25 May 2013)
Log Message:
-----------
Mantis #6085: TJvWizard.FindNextEnabledPage causes infinite loop in IDE
Modified Paths:
--------------
trunk/jvcl/run/JvWizard.pas
Modified: trunk/jvcl/run/JvWizard.pas
===================================================================
--- trunk/jvcl/run/JvWizard.pas 2013-05-23 16:54:27 UTC (rev 13515)
+++ trunk/jvcl/run/JvWizard.pas 2013-05-25 12:09:03 UTC (rev 13516)
@@ -994,7 +994,7 @@
procedure TJvWizardButtonControl.CMVisibleChanged(var Msg: TMessage);
begin
inherited;
- if Assigned(FWizard) then
+ if FWizard <> nil then
FWizard.RepositionButtons;
end;
@@ -1005,13 +1005,13 @@
Stop: Boolean;
Page: TJvWizardCustomPage;
begin
- if Assigned(FWizard) then
+ if FWizard <> nil then
begin
if not (csDesigning in ComponentState) then
begin
Stop := False;
Page := FWizard.FActivePage;
- if Assigned(Page) then
+ if Page <> nil then
ButtonClick(Page, Stop);
if Stop then
Exit;
@@ -1176,7 +1176,7 @@
if Assigned(OnClick) then
inherited Click
else
- if Assigned(FWizard) and Assigned(FWizard.ActivePage) then
+ if (FWizard <> nil) and (FWizard.ActivePage <> nil) then
begin
if Assigned(FWizard.ActivePage.OnHelpButtonClick) then
inherited Click
@@ -1201,7 +1201,7 @@
function TJvWizardNavigateButton.GetCaption: string;
begin
- if Assigned(FControl) then
+ if FControl <> nil then
Result := FControl.Caption
else
Result := '';
@@ -1209,7 +1209,7 @@
function TJvWizardNavigateButton.GetGlyph: TBitmap;
begin
- if Assigned(FControl) then
+ if FControl <> nil then
Result := FControl.Glyph
else
Result := nil;
@@ -1217,7 +1217,7 @@
function TJvWizardNavigateButton.GetLayout: TButtonLayout;
begin
- if Assigned(FControl) then
+ if FControl <> nil then
Result := FControl.Layout
else
Result := blGlyphLeft;
@@ -1225,7 +1225,7 @@
function TJvWizardNavigateButton.GetNumGlyphs: Integer;
begin
- if Assigned(FControl) then
+ if FControl <> nil then
Result := FControl.NumGlyphs
else
Result := 0;
@@ -1233,31 +1233,31 @@
procedure TJvWizardNavigateButton.SetCaption(const Value: string);
begin
- if Assigned(FControl) then
+ if FControl <> nil then
FControl.Caption := Value;
end;
procedure TJvWizardNavigateButton.SetGlyph(const Value: TBitmap);
begin
- if Assigned(FControl) then
+ if FControl <> nil then
FControl.Glyph := Value;
end;
procedure TJvWizardNavigateButton.SetNumGlyphs(const Value: Integer);
begin
- if Assigned(FControl) then
+ if FControl <> nil then
FControl.NumGlyphs := Value;
end;
procedure TJvWizardNavigateButton.SetLayout(const Value: TButtonLayout);
begin
- if Assigned(FControl) then
+ if FControl <> nil then
FControl.Layout := Value;
end;
function TJvWizardNavigateButton.GetModalResult: TModalResult;
begin
- if Assigned(FControl) then
+ if FControl <> nil then
Result := FControl.ModalResult
else
Result := mrNone;
@@ -1265,13 +1265,13 @@
procedure TJvWizardNavigateButton.SetModalResult(const Value: TModalResult);
begin
- if Assigned(FControl) then
+ if FControl <> nil then
FControl.ModalResult := Value;
end;
function TJvWizardNavigateButton.GetButtonWidth: Integer;
begin
- if Assigned(FControl) then
+ if FControl <> nil then
Result := FControl.Width
else
Result := 0;
@@ -1279,10 +1279,10 @@
procedure TJvWizardNavigateButton.SetButtonWidth(const Value: Integer);
begin
- if Assigned(FControl) and (FControl.Width <> Value) then
+ if (FControl <> nil) and (FControl.Width <> Value) then
begin
FControl.Width := Value;
- if Assigned(FControl.FWizard) then
+ if FControl.FWizard <> nil then
FControl.FWizard.RepositionButtons;
end;
end;
@@ -1309,7 +1309,7 @@
destructor TJvWizardRouteMapControl.Destroy;
begin
- if Assigned(Wizard) then
+ if Wizard <> nil then
Wizard.FRouteMap := nil;
FPages.Free;
FImage.Free;
@@ -1323,9 +1323,9 @@
procedure TJvWizardRouteMapControl.DoAddPage(const APage: TJvWizardCustomPage);
begin
- if Assigned(FWizard) then
+ if FWizard <> nil then
begin
- if Assigned(APage) and (FPages.IndexOf(APage) < 0) then
+ if (APage <> nil) and (FPages.IndexOf(APage) < 0) then
FPages.Add(APage);
WizardPageAdded(APage);
end;
@@ -1335,9 +1335,9 @@
var
I: Integer;
begin
- if Assigned(FWizard) then
+ if FWizard <> nil then
begin
- if Assigned(APage) then
+ if (APage <> nil) then
begin
I := FPages.Remove(APage);
if FPageIndex = I then
@@ -1349,9 +1349,9 @@
procedure TJvWizardRouteMapControl.DoActivatePage(const APage: TJvWizardCustomPage);
begin
- if Assigned(FWizard) then
+ if FWizard <> nil then
begin
- if Assigned(APage) then
+ if APage <> nil then
FPageIndex := FPages.IndexOf(APage);
WizardPageActivated(APage);
end;
@@ -1359,16 +1359,16 @@
procedure TJvWizardRouteMapControl.DoUpdatePage(const APage: TJvWizardCustomPage);
begin
- if Assigned(FWizard) then
+ if FWizard <> nil then
WizardPageUpdated(APage);
end;
procedure TJvWizardRouteMapControl.DoMovePage(const APage: TJvWizardCustomPage;
const OldIndex: Integer);
begin
- if Assigned(FWizard) then
+ if FWizard <> nil then
begin
- if Assigned(APage) then
+ if APage <> nil then
begin
FPages.Move(OldIndex, APage.PageIndex);
if OldIndex = FPageIndex then
@@ -1414,7 +1414,7 @@
begin
if (FPageIndex <> Value) and (Value >= 0) and (Value < PageCount) then
begin
- if Assigned(FWizard) and (Pages[Value].Wizard = FWizard) then
+ if (FWizard <> nil) and (Pages[Value].Wizard = FWizard) then
begin
FWizard.SetActivePage(Pages[Value]);
// read PageIndex from Wizard because the OnChanging event could have stopped it from switching to the page
@@ -1448,8 +1448,7 @@
if Button = mbLeft then
begin
APage := PageAtPos(Point(X, Y));
- if Assigned(APage) and ((csDesigning in ComponentState) or
- (APage.Enabled and APage.EnableJumpToPage)) then
+ if (APage <> nil) and ((csDesigning in ComponentState) or (APage.Enabled and APage.EnableJumpToPage)) then
begin
if APage.PageIndex = PageIndex + 1 then
Wizard.SelectNextPage
@@ -1467,7 +1466,7 @@
var
I: Integer;
begin
- if Assigned(AParent) then
+ if AParent <> nil then
begin
if not ((AParent is TJvWizard) or (AParent is TJvWizardCustomPage)) then
raise EJvWizardError.CreateRes(@RsEInvalidParentControl);
@@ -1475,7 +1474,7 @@
AParent := TJvWizardCustomPage(AParent).Wizard;
end;
inherited SetParent(AParent);
- if Assigned(AParent) then
+ if AParent <> nil then
begin
FWizard := TJvWizard(AParent);
FWizard.FRouteMap := Self;
@@ -1483,7 +1482,7 @@
for I := 0 to FWizard.PageCount - 1 do
FPages.Add(FWizard.FPages[I]);
- if Assigned(FWizard.FActivePage) then
+ if FWizard.FActivePage <> nil then
FPageIndex := FWizard.FActivePage.PageIndex
else
FPageIndex := -1;
@@ -1524,7 +1523,7 @@
function TJvWizardRouteMapControl.CanDisplay(const APage: TJvWizardCustomPage): Boolean;
begin
- Result := Assigned(APage) and ((csDesigning in ComponentState) or APage.Enabled);
+ Result := (APage <> nil) and ((csDesigning in ComponentState) or APage.Enabled);
if not (csDesigning in ComponentState) and Assigned(FOnDisplaying) then
FOnDisplaying(Self, APage, Result);
end;
@@ -1554,7 +1553,7 @@
procedure TJvWizardImage.PaintTo(const ACanvas: TCanvas; ARect: TRect);
begin
- if Assigned(FPicture.Graphic) then
+ if FPicture.Graphic <> nil then
JvWizardDrawImage(ACanvas, FPicture.Graphic, ARect, FAlignment, FLayout);
end;
@@ -1588,7 +1587,7 @@
AGraphic: TGraphic;
begin
AGraphic := FPicture.Graphic;
- if Assigned(AGraphic) then
+ if AGraphic <> nil then
Result := AGraphic.Transparent
else
Result := FTransparent;
@@ -1600,8 +1599,7 @@
begin
AGraphic := FPicture.Graphic;
FTransparent := Value;
- if Assigned(AGraphic) and
- not ( (AGraphic is TMetaFile) or (AGraphic is TIcon)) then
+ if (AGraphic <> nil) and not ((AGraphic is TMetaFile) or (AGraphic is TIcon)) then
AGraphic.Transparent := Value;
end;
@@ -1668,7 +1666,7 @@
procedure TJvWizardPageTitle.DoChange;
begin
- if Assigned(FWizardPageHeader) then
+ if FWizardPageHeader <> nil then
FWizardPageHeader.DoChange;
end;
@@ -1690,7 +1688,7 @@
if FWizardPageHeader <> Value then
begin
FWizardPageHeader := Value;
- if Assigned(FWizardPageHeader) and Assigned(FWizardPageHeader.WizardPage) then
+ if (FWizardPageHeader <> nil) and (FWizardPageHeader.WizardPage <> nil) then
AdjustFont(FWizardPageHeader.WizardPage.Font);
FFont.OnChange := FontChange;
end;
@@ -1725,8 +1723,7 @@
var
ATextRect: TRect;
begin
- if FVisible and Assigned(FWizardPageHeader) and
- Assigned(FWizardPageHeader.WizardPage) then
+ if FVisible and (FWizardPageHeader <> nil) and (FWizardPageHeader.WizardPage <> nil) then
begin
ACanvas.Font.Assign(FFont);
ATextRect := GetTextRect(ACanvas, ARect);
@@ -1796,10 +1793,10 @@
begin
FText := Value;
DoChange;
- if Assigned(FWizardPageHeader) and
- Assigned(FWizardPageHeader.WizardPage) and
- Assigned(FWizardPageHeader.WizardPage.Wizard) and
- Assigned(FWizardPageHeader.WizardPage.Wizard.FRouteMap) then
+ if (FWizardPageHeader <> nil) and
+ (FWizardPageHeader.WizardPage <> nil) and
+ (FWizardPageHeader.WizardPage.Wizard <> nil) and
+ (FWizardPageHeader.WizardPage.Wizard.FRouteMap <> nil) then
begin
FWizardPageHeader.WizardPage.Wizard.FRouteMap.DoUpdatePage(FWizardPageHeader.WizardPage);
end;
@@ -1817,7 +1814,7 @@
procedure TJvWizardPageTitle.AdjustFont(const AFont: TFont);
begin
- if Assigned(AFont) then
+ if AFont <> nil then
begin
FFont.Name := AFont.Name;
FFont.Charset := AFont.Charset;
@@ -1827,7 +1824,7 @@
procedure TJvWizardPageTitle.FontChange(Sender: TObject);
begin
// Font has changed, set the ParentFont property to False.
- if Assigned(FWizardPageHeader) then
+ if FWizardPageHeader <> nil then
FWizardPageHeader.ParentFont := False;
DoChange;
end;
@@ -1855,7 +1852,7 @@
procedure TJvWizardPageObject.DoChange;
begin
- if Assigned(FWizardPage) then
+ if FWizardPage <> nil then
FWizardPage.Invalidate;
end;
@@ -2002,18 +1999,17 @@
Brush.Color := Color;
FillRect(R);
end;
- if Assigned(WizardPage) then
+ if WizardPage <> nil then
begin
{ Show Header Divider }
if {(csDesigning in WizardPage.ComponentState) or} FShowDivider then
JvWizardDrawBorderEdges(ACanvas, R, fsGroove, [beBottom]);
{ Draw Header Image first }
- if Assigned(WizardPage.Wizard) then
+ if WizardPage.Wizard <> nil then
begin
AImages := WizardPage.Wizard.HeaderImages;
- if Assigned(AImages) and (FImageIndex >= 0) and
- (FImageIndex < AImages.Count) then
+ if (AImages <> nil) and (FImageIndex >= 0) and (FImageIndex < AImages.Count) then
begin
ImageRect := GetImageRect(AImages, R);
{ R is the area where the title and subtitle paint to. }
@@ -2031,11 +2027,11 @@
procedure TJvWizardPageHeader.AdjustTitleFont;
begin
- if Assigned(FWizardPage) and FParentFont then
+ if (FWizardPage <> nil) and FParentFont then
begin
- if Assigned(FTitle) then
+ if FTitle <> nil then
FTitle.AdjustFont(FWizardPage.Font);
- if Assigned(FSubtitle) then
+ if FSubtitle <> nil then
FSubtitle.AdjustFont(FWizardPage.Font);
end;
end;
@@ -2056,7 +2052,7 @@
procedure TJvWizardPageHeader.VisibleChanged;
begin
inherited VisibleChanged;
- if Assigned(WizardPage) then
+ if WizardPage <> nil then
WizardPage.Realign;
end;
@@ -2094,7 +2090,7 @@
begin
FAlign := Value;
DoChange;
- if Assigned(WizardPage) then
+ if WizardPage <> nil then
WizardPage.Realign;
end;
end;
@@ -2145,7 +2141,7 @@
procedure TJvWizardWaterMark.VisibleChanged;
begin
inherited VisibleChanged;
- if Assigned(WizardPage) then
+ if WizardPage <> nil then
WizardPage.Realign;
end;
@@ -2212,7 +2208,7 @@
destructor TJvWizardCustomPage.Destroy;
begin
- if Assigned(FWizard) then
+ if FWizard <> nil then
FWizard.RemovePage(Self);
FPanel.Free;
FImage.Free;
@@ -2255,16 +2251,14 @@
NextPage: TJvWizardCustomPage;
begin
inherited;
- if Assigned(FWizard) then
+ if FWizard <> nil then
begin
- if Assigned(FWizard.FRouteMap) then
+ if FWizard.FRouteMap <> nil then
FWizard.FRouteMap.DoUpdatePage(Self);
- if not ((csDesigning in ComponentState) or Enabled) and
- (FWizard.ActivePage = Self) then
+ if not ((csDesigning in ComponentState) or Enabled) and (FWizard.ActivePage = Self) then
begin
- NextPage := FWizard.FindNextPage(PageIndex, 1,
- not (csDesigning in ComponentState));
- if not Assigned(NextPage) then
+ NextPage := FWizard.FindNextPage(PageIndex, 1, not (csDesigning in ComponentState));
+ if NextPage = nil then
NextPage := FWizard.FindNextPage(PageIndex, -1, not (csDesigning in ComponentState));
FWizard.SetActivePage(NextPage);
end;
@@ -2274,7 +2268,7 @@
procedure TJvWizardCustomPage.CMTextChanged(var Msg: TMessage);
begin
Invalidate;
- if Assigned(FWizard) and Assigned(FWizard.FRouteMap) then
+ if (FWizard <> nil) and (FWizard.FRouteMap <> nil) then
FWizard.FRouteMap.DoUpdatePage(Self);
end;
@@ -2288,17 +2282,17 @@
begin
if FWizard <> AWizard then
begin
- if Assigned(FWizard) then
+ if FWizard <> nil then
FWizard.RemovePage(Self);
Parent := AWizard;
- if Assigned(AWizard) then
+ if AWizard <> nil then
AWizard.InsertPage(Self);
end;
end;
function TJvWizardCustomPage.GetPageIndex: Integer;
begin
- if Assigned(FWizard) then
+ if FWizard <> nil then
Result := FWizard.FPages.IndexOf(Self)
else
Result := -1;
@@ -2315,11 +2309,11 @@
var
OldIndex: Integer;
begin
- if Assigned(FWizard) and (Value >= 0) and (Value < FWizard.FPages.Count) then
+ if (FWizard <> nil) and (Value >= 0) and (Value < FWizard.FPages.Count) then
begin
OldIndex := PageIndex;
FWizard.FPages.Move(OldIndex, Value);
- if Assigned(FWizard.FRouteMap) then
+ if FWizard.FRouteMap <> nil then
FWizard.FRouteMap.DoMovePage(Self, OldIndex);
end;
end;
@@ -2411,7 +2405,7 @@
if FEnabledButtons <> Value then
begin
FEnabledButtons := Value;
- if Assigned(FWizard) and (FWizard.FActivePage = Self) then
+ if (FWizard <> nil) and (FWizard.FActivePage = Self) then
FWizard.UpdateButtonsStatus;
end;
end;
@@ -2421,7 +2415,7 @@
if FVisibleButtons <> Value then
begin
FVisibleButtons := Value;
- if Assigned(FWizard) and (FWizard.FActivePage = Self) then
+ if (FWizard <> nil) and (FWizard.FActivePage = Self) then
begin
{ if there is no buttons are visible, then we don't need
to display the button bar. }
@@ -2648,8 +2642,9 @@
CheckDisable: Boolean): TJvWizardCustomPage;
begin
Result := FindNextPage(PageIndex, Step, CheckDisable);
- while (Result <> nil) and not Result.EnableJumpToPage do
- Result := FindNextPage(Result.PageIndex, Step, CheckDisable);
+ if not (csDesigning in ComponentState) then
+ while (Result <> nil) and not Result.EnableJumpToPage do
+ Result := FindNextPage(Result.PageIndex, Step, CheckDisable);
end;
procedure TJvWizard.SelectFirstPage;
@@ -2657,11 +2652,11 @@
AFirstPage: TJvWizardCustomPage;
begin
AFirstPage := FindNextEnabledPage(-1, 1, not (csDesigning in ComponentState));
- if Assigned(AFirstPage) then
+ if AFirstPage <> nil then
begin
if not (csDesigning in ComponentState) and Assigned(FOnSelectFirstPage) then
FOnSelectFirstPage(Self, FActivePage, AFirstPage);
- if Assigned(AFirstPage) then
+ if AFirstPage <> nil then
SetActivePage(AFirstPage);
end;
end;
@@ -2671,11 +2666,11 @@
ALastPage: TJvWizardCustomPage;
begin
ALastPage := FindNextEnabledPage(FPages.Count, -1, not (csDesigning in ComponentState));
- if Assigned(ALastPage) then
+ if ALastPage <> nil then
begin
if not (csDesigning in ComponentState) and Assigned(FOnSelectLastPage) then
FOnSelectLastPage(Self, FActivePage, ALastPage);
- if Assigned(ALastPage) then
+ if ALastPage <> nil then
SetActivePage(ALastPage);
end;
end;
@@ -2685,11 +2680,11 @@
ANextPage: TJvWizardCustomPage;
begin
ANextPage := FindNextEnabledPage(GetActivePageIndex, 1, not (csDesigning in ComponentState));
- if Assigned(ANextPage) then
+ if ANextPage <> nil then
begin
if not (csDesigning in ComponentState) and Assigned(FOnSelectNextPage) then
FOnSelectNextPage(Self, FActivePage, ANextPage);
- if Assigned(ANextPage) then
+ if ANextPage <> nil then
SetActivePage(ANextPage);
end;
end;
@@ -2699,11 +2694,11 @@
APriorPage: TJvWizardCustomPage;
begin
APriorPage := FindNextEnabledPage(GetActivePageIndex, -1, not (csDesigning in ComponentState));
- if Assigned(APriorPage) then
+ if APriorPage <> nil then
begin
if not (csDesigning in ComponentState) and Assigned(FOnSelectPriorPage) then
FOnSelectPriorPage(Self, FActivePage, APriorPage);
- if Assigned(APriorPage) then
+ if APriorPage <> nil then
SetActivePage(APriorPage);
end;
end;
@@ -2713,7 +2708,7 @@
AFirstPage: TJvWizardCustomPage;
begin
AFirstPage := FindNextPage(-1, 1, CheckDisable);
- Result := not Assigned(AFirstPage) or (APage = AFirstPage);
+ Result := (AFirstPage = nil) or (APage = AFirstPage);
end;
function TJvWizard.IsLastPage(const APage: TJvWizardCustomPage; CheckDisable: Boolean): Boolean;
@@ -2721,14 +2716,13 @@
ALastPage: TJvWizardCustomPage;
begin
ALastPage := FindNextPage(FPages.Count, -1, CheckDisable);
- Result := not Assigned(ALastPage) or (APage = ALastPage);
+ Result := (ALastPage = nil) or (APage = ALastPage);
end;
procedure TJvWizard.SetActivePage(Page: TJvWizardCustomPage);
begin
if not (csLoading in ComponentState) and
- (not Assigned(Page) or ((Page.Wizard = Self) and
- ((csDesigning in ComponentState) or Page.Enabled))) then
+ ((Page = nil) or ((Page.Wizard = Self) and ((csDesigning in ComponentState) or Page.Enabled))) then
begin
ChangeActivePage(Page);
end;
@@ -2745,13 +2739,13 @@
Exit;
ParentForm := GetParentForm(Self);
- if Assigned(ParentForm) and Assigned(FActivePage) and
+ if (ParentForm <> nil) and (FActivePage <> nil) and
FActivePage.ContainsControl(ParentForm.ActiveControl) and FActivePage.CanFocus then
begin
ParentForm.ActiveControl := FActivePage;
end;
- if Assigned(FActivePage) then
+ if FActivePage <> nil then
begin
{ FActivePage.Exit, called just before the page is hidden. }
FActivePage.ExitPage(Page);
@@ -2760,7 +2754,7 @@
{ Just in case the new page is changed to be disabled again after
the above OnExitPage event is called. }
- if Assigned(Page) and not (Page.Enabled or (csDesigning in ComponentState)) then
+ if (Page <> nil) and not (Page.Enabled or (csDesigning in ComponentState)) then
begin
if IsForward(FActivePage, Page) then
Page := FindNextPage(GetActivePageIndex) // try go forward
@@ -2768,13 +2762,13 @@
Page := FindNextPage(GetActivePageIndex, -1); // try go backward
end;
- if Assigned(Page) then
+ if Page <> nil then
begin
{ FActivePage.Enter, called before the page shows up. }
Page.Enter(FActivePage);
Page.BringToFront;
Page.Visible := True;
- if Assigned(ParentForm) then
+ if ParentForm <> nil then
begin
if Page.CanFocus then
ParentForm.ActiveControl := Page
@@ -2785,19 +2779,18 @@
end;
FActivePage := Page;
- if Assigned(FRouteMap) then
+ if FRouteMap <> nil then
FRouteMap.DoActivatePage(FActivePage);
if AutoHideButtonBar then
begin
- if Assigned(FActivePage) and (FActivePage.FVisibleButtons = []) then
+ if (FActivePage <> nil) and (FActivePage.FVisibleButtons = []) then
ButtonBarHeight := 0
else
ButtonBarHeight := ciButtonBarHeight;
end;
{ At design time, if the Page's Enabled property set to False,
the following if block never gets called. }
- if Assigned(ParentForm) and Assigned(FActivePage) and
- (ParentForm.ActiveControl = FActivePage) then
+ if (ParentForm <> nil) and (FActivePage <> nil) and (ParentForm.ActiveControl = FActivePage) then
begin
FActivePage.SelectFirst;
FActivePage.Done;
@@ -2810,7 +2803,7 @@
procedure TJvWizard.InsertPage(Page: TJvWizardCustomPage);
begin
FPages.Add(Page);
- if Assigned(FRouteMap) then
+ if FRouteMap <> nil then
FRouteMap.DoAddPage(Page);
end;
@@ -2825,7 +2818,7 @@
if NextPage = Page then
NextPage := nil;
- if Assigned(FRouteMap) then
+ if FRouteMap <> nil then
FRouteMap.DoDeletePage(Page);
FPages.Remove(Page);
SetActivePage(NextPage);
@@ -2836,7 +2829,7 @@
function TJvWizard.GetActivePageIndex: Integer;
begin
- if Assigned(ActivePage) then
+ if ActivePage <> nil then
Result := ActivePage.PageIndex
else
Result := -1;
@@ -2888,7 +2881,7 @@
function TJvWizard.GetShowRouteMap: Boolean;
begin
- if Assigned(FRouteMap) then
+ if FRouteMap <> nil then
Result := FRouteMap.Visible
else
Result := False;
@@ -2896,7 +2889,7 @@
procedure TJvWizard.SetShowRouteMap(Value: Boolean);
begin
- if Assigned(FRouteMap) then
+ if FRouteMap <> nil then
FRouteMap.Visible := Value;
end;
@@ -2917,13 +2910,13 @@
procedure TJvWizard.SetHeaderImages(Value: TCustomImageList);
begin
ReplaceImageListReference(Self, Value, FHeaderImages, FImageChangeLink);
- if Assigned(FActivePage) then
+ if FActivePage <> nil then
FActivePage.Invalidate;
end;
function TJvWizard.GetButtonClick(Index: Integer): TNotifyEvent;
begin
- if Assigned(FNavigateButtons[TJvWizardButtonKind(Index)].Control) then
+ if FNavigateButtons[TJvWizardButtonKind(Index)].Control <> nil then
Result := FNavigateButtons[TJvWizardButtonKind(Index)].Control.OnClick
else
Result := nil;
@@ -2931,7 +2924,7 @@
procedure TJvWizard.SetButtonClick(Index: Integer; const Value: TNotifyEvent);
begin
- if Assigned(FNavigateButtons[TJvWizardButtonKind(Index)].Control) then
+ if FNavigateButtons[TJvWizardButtonKind(Index)].Control <> nil then
FNavigateButtons[TJvWizardButtonKind(Index)].Control.OnClick := Value;
end;
@@ -2945,7 +2938,7 @@
Pt: TPoint;
begin
Pt := SmallPointToPoint(Msg.Pos);
- if Assigned(FActivePage) and PtInRect(FActivePage.BoundsRect, Pt) then
+ if (FActivePage <> nil) and PtInRect(FActivePage.BoundsRect, Pt) then
Msg.Result := 1;
end;
@@ -2972,11 +2965,11 @@
AEnabledButtonSet: TJvWizardButtonSet;
AVisibleButtonSet: TJvWizardButtonSet;
begin
- if not Assigned(Parent) then
+ if Parent = nil then
Exit;
AEnabledButtonSet := [bkCancel];
AVisibleButtonSet := [bkBack, bkNext, bkCancel];
- if Assigned(FActivePage) then
+ if FActivePage <> nil then
begin
{ By default, the Back button should be disabled for the first
page at run time }
@@ -3032,12 +3025,12 @@
end;
begin
- if not Assigned(Parent) then
+ if Parent = nil then
Exit;
if FButtonBarHeight > ciButtonHeight then
begin
AButtonSet := [bkBack, bkNext, bkCancel];
- if Assigned(FActivePage) then
+ if FActivePage <> nil then
begin
AButtonSet := FActivePage.FVisibleButtons;
if csDesigning in ComponentState then
@@ -3106,7 +3099,7 @@
procedure TJvWizard.ImageListChange;
begin
- if HandleAllocated and (Sender = FHeaderImages) and Assigned(FActivePage) then
+ if HandleAllocated and (Sender = FHeaderImages) and (FActivePage <> nil) then
FActivePage.Invalidate;
end;
@@ -3125,9 +3118,9 @@
function TJvWizard.IsForward(const FromPage, ToPage: TJvWizardCustomPage): Boolean;
begin
- if Assigned(FromPage) and Assigned(ToPage) and (FromPage.Wizard <> ToPage.Wizard) then
+ if (FromPage <> nil) and (ToPage <> nil) and (FromPage.Wizard <> ToPage.Wizard) then
raise EJvWizardError.CreateRes(@RsEInvalidWizardPage);
- Result := not Assigned(FromPage) or (Assigned(ToPage) and (FromPage.PageIndex < ToPage.PageIndex));
+ Result := (FromPage = nil) or ((ToPage <> nil) and (FromPage.PageIndex < ToPage.PageIndex));
end;
procedure TJvWizard.SetAutoHideButtonBar(const Value: Boolean);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ah...@us...> - 2013-05-23 16:54:36
|
Revision: 13515
http://jvcl.svn.sourceforge.net/jvcl/?rev=13515&view=rev
Author: ahuser
Date: 2013-05-23 16:54:27 +0000 (Thu, 23 May 2013)
Log Message:
-----------
Mantis #6142: TJvInterpreterIdentifierList.Sort not work in delphi x64
Modified Paths:
--------------
trunk/jvcl/run/JvInterpreter.pas
Modified: trunk/jvcl/run/JvInterpreter.pas
===================================================================
--- trunk/jvcl/run/JvInterpreter.pas 2013-05-21 15:59:14 UTC (rev 13514)
+++ trunk/jvcl/run/JvInterpreter.pas 2013-05-23 16:54:27 UTC (rev 13515)
@@ -2870,22 +2870,21 @@
Index := L;
end;
-procedure TJvInterpreterIdentifierList.Sort(Compare: TListSortCompare = nil);
+function SortIdentifier(Item1, Item2: Pointer): Integer;
+begin
+ { function AnsiStrIComp about 30% faster than AnsiCompareText }
+ { Result := AnsiCompareText(TJvInterpreterIdentifier(Item1).Identifier,
+ TJvInterpreterIdentifier(Item2).Identifier); }
+ Result := AnsiStrIComp(PChar(TJvInterpreterIdentifier(Item1).Identifier),
+ PChar(TJvInterpreterIdentifier(Item2).Identifier));
+end;
- function SortIdentifier(Item1, Item2: Pointer): Integer;
- begin
- { function AnsiStrIComp about 30% faster than AnsiCompareText }
- { Result := AnsiCompareText(TJvInterpreterIdentifier(Item1).Identifier,
- TJvInterpreterIdentifier(Item2).Identifier); }
- Result := AnsiStrIComp(PChar(TJvInterpreterIdentifier(Item1).Identifier),
- PChar(TJvInterpreterIdentifier(Item2).Identifier));
- end;
-
+procedure TJvInterpreterIdentifierList.Sort(Compare: TListSortCompare = nil);
begin
if Assigned(Compare) then
inherited Sort(Compare)
else
- inherited Sort(TListSortCompare(@SortIdentifier));
+ inherited Sort(SortIdentifier);
end;
function TJvInterpreterIdentifierList.IndexOf(const UnitName, Identifier: string): TJvInterpreterIdentifier;
@@ -8205,7 +8204,7 @@
//=== { TJvInterpreterMethodList } ===========================================
-function SortIdentifier(Item1, Item2: Pointer): Integer;
+function SortMethodIdentifier(Item1, Item2: Pointer): Integer;
begin
{ function AnsiStrIComp about 30% faster than AnsiCompareText }
{ Result := AnsiCompareText(TJvInterpreterIdentifier(Item1).Identifier,
@@ -8225,7 +8224,7 @@
procedure TJvInterpreterMethodList.Sort(Compare: TListSortCompare);
begin
- inherited Sort(SortIdentifier);
+ inherited Sort(SortMethodIdentifier);
end;
//=== { TJvInterpreterRecord } ===============================================
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ah...@us...> - 2013-05-21 15:59:20
|
Revision: 13514
http://jvcl.svn.sourceforge.net/jvcl/?rev=13514&view=rev
Author: ahuser
Date: 2013-05-21 15:59:14 +0000 (Tue, 21 May 2013)
Log Message:
-----------
Paint disabled state (as suggested by Ma2xx)
Modified Paths:
--------------
trunk/jvcl/run/JvNavigationPane.pas
Modified: trunk/jvcl/run/JvNavigationPane.pas
===================================================================
--- trunk/jvcl/run/JvNavigationPane.pas 2013-05-15 10:25:55 UTC (rev 13513)
+++ trunk/jvcl/run/JvNavigationPane.pas 2013-05-21 15:59:14 UTC (rev 13514)
@@ -34,7 +34,7 @@
JclUnitVersioning,
{$ENDIF UNITVERSIONING}
SysUtils, Classes,
- Windows, Messages, Controls, Graphics, Menus, ExtCtrls, ImgList,
+ Windows, Messages, Controls, Graphics, Menus, ExtCtrls, ImgList, Math,
{$IFDEF HAS_UNIT_SYSTEM_UITYPES}
System.UITypes,
{$ENDIF HAS_UNIT_SYSTEM_UITYPES}
@@ -2338,23 +2338,46 @@
Result := Assigned(Images) and (ImageIndex >= 0);
end;
+
+ function ColorBrightness(const aColor:Longint; const aChangeValue:Integer; aDestColor:Longint):Longint;
+ //Change Brightness from aColor to aDestColor with aChangeValue in procent (100%=aDestColor)
+ type
+ TRGBColor = packed record
+ case Boolean of
+ True : (Color: Int32);
+ False: (r: Byte;
+ g: Byte;
+ b: Byte;
+ a: Byte);
+ end;
+ var
+ Rgb, RgbDest: TRGBColor;
+ begin
+ Rgb.Color:=ColorToRGB(aColor);
+ RgbDest.Color:=ColorToRGB(aDestColor);
+ Rgb.r := Min(Max(Rgb.r - Round(aChangeValue * (Rgb.r - RgbDest.r) / 100), 0), $FF);
+ Rgb.g := Min(Max(Rgb.g - Round(aChangeValue * (Rgb.g - RgbDest.g) / 100), 0), $FF);
+ Rgb.b := Min(Max(Rgb.b - Round(aChangeValue * (Rgb.b - RgbDest.b) / 100), 0), $FF);
+ Result := Rgb.color;
+ end;
+
begin
R := ClientRect;
if HotTrack and (bsMouseInside in MouseStates) then
begin
if bsMouseDown in MouseStates then
- GradientFillRect(Canvas, R, Colors.ButtonSelectedColorTo, Colors.ButtonSelectedColorFrom, fdTopToBottom, 32)
+ GradientFillRect(Canvas, R, Colors.ButtonSelectedColorTo, Colors.ButtonSelectedColorFrom, fdTopToBottom, 32)
else
- GradientFillRect(Canvas, R, Colors.ButtonHotColorFrom, Colors.ButtonHotColorTo, fdTopToBottom, 32);
+ GradientFillRect(Canvas, R, Colors.ButtonHotColorFrom, Colors.ButtonHotColorTo, fdTopToBottom, 32);
end
else
if Down then
- GradientFillRect(Canvas, R, Colors.ButtonSelectedColorFrom, Colors.ButtonSelectedColorTo, fdTopToBottom, 32)
+ GradientFillRect(Canvas, R, Colors.ButtonSelectedColorFrom, Colors.ButtonSelectedColorTo, fdTopToBottom, 32)
else
if bsMouseDown in MouseStates then
- GradientFillRect(Canvas, R, Colors.ButtonSelectedColorTo, Colors.ButtonSelectedColorFrom, fdTopToBottom, 32)
+ GradientFillRect(Canvas, R, Colors.ButtonSelectedColorTo, Colors.ButtonSelectedColorFrom, fdTopToBottom, 32)
else
- GradientFillRect(Canvas, ClientRect, Colors.ButtonColorFrom, Colors.ButtonColorTo, fdTopToBottom, 32);
+ GradientFillRect(Canvas, ClientRect, Colors.ButtonColorFrom, Colors.ButtonColorTo, fdTopToBottom, 32);
InflateRect(R, -4, -4);
if IsValidImage then
begin
@@ -2365,17 +2388,20 @@
end;
if Caption <> '' then
begin
- if HotTrack and (bsMouseInside in MouseStates) and not (bsMouseDown in MouseStates) then
+ if HotTrack and (bsMouseInside in MouseStates) and not (bsMouseDown in MouseStates) then
Canvas.Font := HotTrackFont
else
Canvas.Font := Font;
SetBkMode(Canvas.Handle, TRANSPARENT);
+ if not Enabled then
+ Canvas.Font.Color := ColorBrightness(Font.Color, 75, Canvas.Pixels[(R.Right - R.Left) div 2, (R.Bottom - R.Top) div 2]);
+
TempRect := R;
DrawText(Canvas, Caption, Length(Caption), TempRect,
- DT_CALCRECT or cAlignment[Alignment] or cWordWrap[WordWrap] or DT_VCENTER);
+ DT_CALCRECT or cAlignment[Alignment] or cWordWrap[WordWrap] or DT_VCENTER);
if WordWrap then
- OffsetRect(R, 0, ((R.Bottom - R.Top) - (TempRect.Bottom - TempRect.Top)) div 2);
+ OffsetRect(R, 0, ((R.Bottom - R.Top) - (TempRect.Bottom - TempRect.Top)) div 2);
DrawText(Canvas, Caption, Length(Caption), R,
cAlignment[Alignment] or cWordWrap[WordWrap] or DT_VCENTER);
end;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ah...@us...> - 2013-05-15 10:26:03
|
Revision: 13513
http://jvcl.svn.sourceforge.net/jvcl/?rev=13513&view=rev
Author: ahuser
Date: 2013-05-15 10:25:55 +0000 (Wed, 15 May 2013)
Log Message:
-----------
Removed System.Actions that XE4 automatically added to the uses list.
Modified Paths:
--------------
trunk/jvcl/install/JVCLInstall/Frames/FrmPackageSelection.pas
Modified: trunk/jvcl/install/JVCLInstall/Frames/FrmPackageSelection.pas
===================================================================
--- trunk/jvcl/install/JVCLInstall/Frames/FrmPackageSelection.pas 2013-05-15 06:53:34 UTC (rev 13512)
+++ trunk/jvcl/install/JVCLInstall/Frames/FrmPackageSelection.pas 2013-05-15 10:25:55 UTC (rev 13513)
@@ -34,7 +34,7 @@
Windows, Messages, Types, SysUtils, Classes, Graphics, Controls, Forms,
Dialogs, ComCtrls, StdCtrls, CheckLst, ImgList, ExtCtrls, Menus, ActnList,
ShellAPI, CommCtrl,
- JVCL3Install, JVCLData, PackageInformation, PackageUtils, HtHint, System.Actions;
+ JVCL3Install, JVCLData, PackageInformation, PackageUtils, HtHint;
type
TFramePackageSelection = class(TFrame)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ah...@us...> - 2013-05-15 06:53:41
|
Revision: 13512
http://jvcl.svn.sourceforge.net/jvcl/?rev=13512&view=rev
Author: ahuser
Date: 2013-05-15 06:53:34 +0000 (Wed, 15 May 2013)
Log Message:
-----------
Only a part of a word was selected if another application had the focus when dbl-clicking on the editor
Modified Paths:
--------------
trunk/jvcl/run/JvEditorCommon.pas
Modified: trunk/jvcl/run/JvEditorCommon.pas
===================================================================
--- trunk/jvcl/run/JvEditorCommon.pas 2013-05-14 21:38:20 UTC (rev 13511)
+++ trunk/jvcl/run/JvEditorCommon.pas 2013-05-15 06:53:34 UTC (rev 13512)
@@ -3524,6 +3524,7 @@
pt: TPoint;
XX, YY: Integer;
begin
+ FSelection.Selecting := False; // may be true from a MouseDown+MouseMove, if another application had the focus when dbl-clicking on the editor
FDoubleClick := True;
if Assigned(FOnDblClick) then
FOnDblClick(Self);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ah...@us...> - 2013-05-14 21:38:30
|
Revision: 13511
http://jvcl.svn.sourceforge.net/jvcl/?rev=13511&view=rev
Author: ahuser
Date: 2013-05-14 21:38:20 +0000 (Tue, 14 May 2013)
Log Message:
-----------
XE4 support for InnoSetup installer
Modified Paths:
--------------
trunk/jvcl/install/ISS/BuildSetup.bat
trunk/jvcl/install/ISS/CompInstall.dll
trunk/jvcl/install/ISS/IdeComponents.iss
trunk/jvcl/install/ISS/Install.iss
Modified: trunk/jvcl/install/ISS/BuildSetup.bat
===================================================================
--- trunk/jvcl/install/ISS/BuildSetup.bat 2013-05-14 15:55:18 UTC (rev 13510)
+++ trunk/jvcl/install/ISS/BuildSetup.bat 2013-05-14 21:38:20 UTC (rev 13511)
@@ -16,18 +16,14 @@
SET JVCLBUILTDIR=%SETUPDIR%\setupbuild
:: == Find JCL root dir ==
-SET JCLROOT=%JVCLROOT%\..\jcl
-if exist "%JCLROOT%\source\common\JclBase.pas" goto JclRootDirFound
-:: Try the "trunk" checkout
SET JCLROOT=%JVCLROOT%\..\jcl\jcl
-if not exist "%JCLROOT%\source\common\JclBase.pas" goto NoRootDirFound
+if exist "%JCLROOT%\source\common\JclBase.pas" goto JclRootDirFound
+goto NoRootDirFound
:JclRootDirFound
-SET JCLBUILTDIR=%JCLROOT%\..\JclInnoSetup\setupbuild
+SET JCLBUILTDIR=%JCLROOT%\..\thirdparty\InnoSetup\setupbuild
if not exist "%JCLROOT%\..\Install.iss" goto JclInnoSetupDirFound
-:: Try the "trunk" checkout
-SET JCLBUILTDIR=%JCLROOT%\..\InnoSetup\setupbuild
-if not exist "%JCLROOT%\..\Install.iss" goto NoJclInnoSetupDirFound
+goto NoJclInnoSetupDirFound
:JclInnoSetupDirFound
SET InnoSetupDir=%JCLBUILTDIR%\..\InnoSetup
Modified: trunk/jvcl/install/ISS/CompInstall.dll
===================================================================
(Binary files differ)
Modified: trunk/jvcl/install/ISS/IdeComponents.iss
===================================================================
--- trunk/jvcl/install/ISS/IdeComponents.iss 2013-05-14 15:55:18 UTC (rev 13510)
+++ trunk/jvcl/install/ISS/IdeComponents.iss 2013-05-14 21:38:20 UTC (rev 13511)
@@ -34,3 +34,6 @@
#ifdef Include_Delphi17
Name: "IDE\Delphi17"; Description: "Install for RAD Studio XE3"; Types: full prefered; Check: IsDelphiInstalled(17)
#endif
+#ifdef Include_Delphi18
+Name: "IDE\Delphi18"; Description: "Install for RAD Studio XE4"; Types: full prefered; Check: IsDelphiInstalled(18)
+#endif
Modified: trunk/jvcl/install/ISS/Install.iss
===================================================================
--- trunk/jvcl/install/ISS/Install.iss 2013-05-14 15:55:18 UTC (rev 13510)
+++ trunk/jvcl/install/ISS/Install.iss 2013-05-14 21:38:20 UTC (rev 13511)
@@ -19,8 +19,6 @@
#define Include_Examples
#include "Settings.iss"
-; get the JCL version
-#include "..\..\..\JclInnoSetup\Settings.iss"
#define MyAppId "Jedi Visual Component Library"
#define MyAppName "JEDI Visual Component Library"
@@ -59,6 +57,9 @@
#define JvclLib17 JvclLib
#define JvclBpl17 JvclBpl
#define JvclHpp17 JvclHpp
+#define JvclLib18 JvclLib
+#define JvclBpl18 JvclBpl
+#define JvclHpp18 JvclHpp
#endif
@@ -167,40 +168,58 @@
Name: "{app}\bin"
Name: "{app}\dcu"
; DCU/OBJ output directories
+; Delphi 6
Name: "{app}\lib\d6"
Name: "{app}\lib\d6\debug"
+; Delphi 7
Name: "{app}\lib\d7"
Name: "{app}\lib\d7\debug"
+; 2005
Name: "{app}\lib\d9"
Name: "{app}\lib\d9\debug"
+; 2006
Name: "{app}\lib\d10"
Name: "{app}\lib\d10\debug"
+; 2007
Name: "{app}\lib\d11"
Name: "{app}\lib\d11\debug"
+; 2009
Name: "{app}\lib\d12"
Name: "{app}\lib\d12\debug"
+; 2010
Name: "{app}\lib\d14"
Name: "{app}\lib\d14\debug"
+; XE
Name: "{app}\lib\d15"
Name: "{app}\lib\d15\debug"
-Name: "{app}\lib\d16\"
+; XE2
+Name: "{app}\lib\d16"
Name: "{app}\lib\d16\win32"
Name: "{app}\lib\d16\win32\debug"
Name: "{app}\lib\d16\win64"
Name: "{app}\lib\d16\win64\debug"
+; XE3
+Name: "{app}\lib\d17"
Name: "{app}\lib\d17\win32"
Name: "{app}\lib\d17\win32\debug"
Name: "{app}\lib\d17\win64"
Name: "{app}\lib\d17\win64\debug"
+; XE4
+Name: "{app}\lib\d18"
+Name: "{app}\lib\d18\win32"
+Name: "{app}\lib\d18\win32\debug"
+Name: "{app}\lib\d18\win64"
+Name: "{app}\lib\d18\win64\debug"
+
[Files]
-Source: {#JvclRoot}\*; DestDir: "{app}"; Flags: ignoreversion
+Source: {#JvclRoot}\*; DestDir: "{app}"; Excludes: ".git,.svn"; Flags: ignoreversion
Source: {#JvclRoot}\bin\*.csv; DestDir: "{app}\bin"; Flags: ignoreversion
Source: {#JvclRoot}\bin\*.bmp; DestDir: "{app}\bin"; Flags: ignoreversion
Source: {#JvclRoot}\bin\*.mdb; DestDir: "{app}\bin"; Flags: ignoreversion
Source: {#JvclRoot}\bin\Data\*; DestDir: "{app}\bin\Data"; Flags: ignoreversion
Source: {#JvclRoot}\common\*.inc; DestDir: "{app}\common"; Excludes: "jedi.inc"; Flags: ignoreversion
-Source: {#JvclRoot}\common\jedi\*; DestDir: "{app}\common"; Flags: ignoreversion
+Source: {#JvclRoot}\common\jedi\*; DestDir: "{app}\common"; Excludes: ".git"; Flags: ignoreversion
Source: {#JvclRoot}\run\*.pas; DestDir: "{app}\run"; Flags: ignoreversion
Source: {#JvclRoot}\run\*.dfm; DestDir: "{app}\run"; Flags: ignoreversion
Source: {#JvclRoot}\design\*.pas; DestDir: "{app}\design"; Flags: ignoreversion
@@ -282,6 +301,13 @@
Source: {#JvclBpl17}\Win64\*; DestDir: "{code:GetDelphiBplDir|17}\Win64"; Components: "IDE\Delphi17"; Flags: ignoreversion sortfilesbyextension
Source: {#JvclHpp17}\*; DestDir: "{app}\include\d17"; Components: "IDE\Delphi17"; Flags: ignoreversion sortfilesbyextension
#endif
+#ifdef Include_Delphi18
+; SolidBreak; lib\Delphi XE4
+Source: {#JvclLib18}\*; DestDir: "{app}\lib\d18"; Excludes: ".svn,__history,*.txt"; Components: "IDE\Delphi18"; Flags: ignoreversion recursesubdirs sortfilesbyextension createallsubdirs solidbreak
+Source: {#JvclBpl18}\*; DestDir: "{code:GetDelphiBplDir|18}"; Components: "IDE\Delphi18"; Flags: ignoreversion sortfilesbyextension
+Source: {#JvclBpl18}\Win64\*; DestDir: "{code:GetDelphiBplDir|18}\Win64"; Components: "IDE\Delphi18"; Flags: ignoreversion sortfilesbyextension
+Source: {#JvclHpp18}\*; DestDir: "{app}\include\d18"; Components: "IDE\Delphi18"; Flags: ignoreversion sortfilesbyextension
+#endif
#endif
@@ -377,6 +403,15 @@
Root: HKCU; Subkey: "{code:GetDelphiRegKey|17}\Jedi\JVCL\IDE"; ValueType: dword; ValueName: "RegisterGlobalDesignEditors"; ValueData: 1; Components: "Options\RegisterGlobalDesignEditors"; Flags: uninsdeletevalue;
Root: HKCU; Subkey: "{code:GetDelphiRegKey|17}\Globals"; ValueType: string; ValueName: "ForceEnvOptionsUpdate"; ValueData: "1"; Components: "IDE\Delphi17";
#endif
+#ifdef Include_Delphi18
+; Delphi XE4
+Root: HKCU; Subkey: "{code:GetDelphiRegKey|18}\Jedi\JVCL"; ValueType: string; ValueName: "BplDir"; ValueData: {code:GetDelphiBplDir|18}; Components: "IDE\Delphi18"; Flags: uninsdeletevalue;
+Root: HKCU; Subkey: "{code:GetDelphiRegKey|18}\Jedi\JVCL"; ValueType: string; ValueName: "DcpDir"; ValueData: {app}\lib\d18; Components: "IDE\Delphi18"; Flags: uninsdeletevalue;
+Root: HKCU; Subkey: "{code:GetDelphiRegKey|18}\Jedi\JVCL"; ValueType: string; ValueName: "RootDir"; ValueData: {app}; Components: "IDE\Delphi18"; Flags: uninsdeletevalue;
+Root: HKCU; Subkey: "{code:GetDelphiRegKey|18}\Jedi\JVCL"; ValueType: string; ValueName: "Version"; ValueData: {#JvclVersionStr}; Components: "IDE\Delphi18"; Flags: uninsdeletevalue;
+Root: HKCU; Subkey: "{code:GetDelphiRegKey|18}\Jedi\JVCL\IDE"; ValueType: dword; ValueName: "RegisterGlobalDesignEditors"; ValueData: 1; Components: "Options\RegisterGlobalDesignEditors"; Flags: uninsdeletevalue;
+Root: HKCU; Subkey: "{code:GetDelphiRegKey|18}\Globals"; ValueType: string; ValueName: "ForceEnvOptionsUpdate"; ValueData: "1"; Components: "IDE\Delphi18";
+#endif
#endif
@@ -444,6 +479,15 @@
Type: files; Name: "{app}\include\d17\*"
Type: files; Name: "{code:GetDelphiBplDir|17}\Jv*.*"
Type: files; Name: "{code:GetDelphiBplDir|17}\Win64\Jv*.*"
+; lib\Delphi/C++Builder XE4
+Type: files; Name: "{app}\lib\d18\win32\*"
+Type: files; Name: "{app}\lib\d18\win32\debug\*"
+Type: files; Name: "{app}\lib\d18\win64\*"
+Type: files; Name: "{app}\lib\d18\win64\debug\*"
+Type: files; Name: "{app}\include\d18\*"
+Type: files; Name: "{code:GetDelphiBplDir|18}\Jv*.*"
+Type: files; Name: "{code:GetDelphiBplDir|18}\Win64\Jv*.*"
+
[Icons]
Name: "{group}\{cm:ProgramOnTheWeb,{#MyAppName}}"; Filename: "{#MyAppURL}"
Name: "{group}\{cm:UninstallProgram,{#MyAppName}}"; Filename: "{uninstallexe}"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ah...@us...> - 2013-05-14 15:55:29
|
Revision: 13510
http://jvcl.svn.sourceforge.net/jvcl/?rev=13510&view=rev
Author: ahuser
Date: 2013-05-14 15:55:18 +0000 (Tue, 14 May 2013)
Log Message:
-----------
Fixing/Hiding remaining warnings
Modified Paths:
--------------
trunk/jvcl/make.proj
trunk/jvcl/run/JvDBUtils.pas
trunk/jvcl/run/JvDesignImp.pas
trunk/jvcl/run/JvInterpreter_Db.pas
Modified: trunk/jvcl/make.proj
===================================================================
--- trunk/jvcl/make.proj 2013-05-13 23:06:28 UTC (rev 13509)
+++ trunk/jvcl/make.proj 2013-05-14 15:55:18 UTC (rev 13510)
@@ -49,7 +49,7 @@
<EditionDirVersion Condition=" Exists('$(BDS)\bin\dcc150.dll') ">d15</EditionDirVersion> <!-- XE -->
<EditionDirVersion Condition=" Exists('$(BDS)\bin\dcc32160.dll') ">d16</EditionDirVersion> <!-- XE2 -->
<EditionDirVersion Condition=" Exists('$(BDS)\bin\dcc32170.dll') ">d17</EditionDirVersion> <!-- XE3 -->
- <EditionDirVersion Condition=" Exists('$(BDS)\bin\dcc32180.dll') ">d17</EditionDirVersion> <!-- XE4 -->
+ <EditionDirVersion Condition=" Exists('$(BDS)\bin\dcc32180.dll') ">d18</EditionDirVersion> <!-- XE4 -->
<LibDirVersion>$(EditionDirVersion)\$(Platform)</LibDirVersion>
<LibDirVersion Condition=" '$(EditionDirVersion)' == 'd12' or '$(EditionDirVersion)' == 'd14' or '$(EditionDirVersion)' == 'd15' ">$(EditionDirVersion)</LibDirVersion>
Modified: trunk/jvcl/run/JvDBUtils.pas
===================================================================
--- trunk/jvcl/run/JvDBUtils.pas 2013-05-13 23:06:28 UTC (rev 13509)
+++ trunk/jvcl/run/JvDBUtils.pas 2013-05-14 15:55:18 UTC (rev 13510)
@@ -932,7 +932,7 @@
DS := TDataSetAccess(DataSet);
DS.CheckBrowseMode;
if ForceScrollEvents or (rmCenter in Mode) then DS.DoBeforeScroll;
- DS.InternalGotoBookmark({$IFNDEF RTL250_UP}Pointer{$ENDIF}(Bookmark));
+ DS.InternalGotoBookmark({$IFNDEF RTL240_UP}Pointer{$ENDIF}(Bookmark));
DS.Resync(Mode);
if ForceScrollEvents or (rmCenter in Mode) then DS.DoAfterScroll;
end;
Modified: trunk/jvcl/run/JvDesignImp.pas
===================================================================
--- trunk/jvcl/run/JvDesignImp.pas 2013-05-13 23:06:28 UTC (rev 13509)
+++ trunk/jvcl/run/JvDesignImp.pas 2013-05-14 15:55:18 UTC (rev 13510)
@@ -1242,12 +1242,12 @@
{$IFDEF RTL240_UP}
procedure TJvDesignDesigner.DrawSelectionMarks(AControl: TControl);
begin
- {$MESSAGE WARN 'Check and implement TJvDesignDesigner.DrawSelectionMarks if necessary'}
+ {.$MESSAGE WARN 'Check and implement TJvDesignDesigner.DrawSelectionMarks if necessary'}
end;
function TJvDesignDesigner.IsSelected(AControl: TControl): Boolean;
begin
- {$MESSAGE WARN 'Check and implement TJvDesignDesigner.IsSelected if necessary'}
+ {.$MESSAGE WARN 'Check and implement TJvDesignDesigner.IsSelected if necessary'}
Result := False;
end;
{$ENDIF RTL240_UP}
Modified: trunk/jvcl/run/JvInterpreter_Db.pas
===================================================================
--- trunk/jvcl/run/JvInterpreter_Db.pas 2013-05-13 23:06:28 UTC (rev 13509)
+++ trunk/jvcl/run/JvInterpreter_Db.pas 2013-05-14 15:55:18 UTC (rev 13510)
@@ -2237,12 +2237,14 @@
{ procedure Translate(Src, Dest: PChar; ToOem: Boolean); }
+{$WARNINGS OFF} // we want to call the deprecated function
procedure TDataSet_Translate(var Value: Variant; Args: TJvInterpreterArgs);
begin
TDataSet(Args.Obj).Translate(PAnsiChar(AnsiString(Args.Values[0])),
PAnsiChar(AnsiString(Args.Values[1])),
Args.Values[2]);
end;
+{$WARNINGS ON}
{ procedure UpdateCursorPos; }
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|