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: <wp...@us...> - 2012-10-08 19:00:02
|
Revision: 13459 http://jvcl.svn.sourceforge.net/jvcl/?rev=13459&view=rev Author: wpostma Date: 2012-10-08 18:59:55 +0000 (Mon, 08 Oct 2012) Log Message: ----------- Mantis # 6009 - obscure Access violation fixed when a JvCustomComboEdit is wrapped up as an activeX control. I have marked in the constructor that the FButton is constructed too late in the constructor, for ActiveX purposes, but it seems safer for me to add some if-assigned checks (which is what I did) rather than reorder the FButton creation code to be earlier, when I'm really not sure that any point in the constructor is always early enough. Modified Paths: -------------- trunk/jvcl/run/JvToolEdit.pas Modified: trunk/jvcl/run/JvToolEdit.pas =================================================================== --- trunk/jvcl/run/JvToolEdit.pas 2012-10-08 18:50:00 UTC (rev 13458) +++ trunk/jvcl/run/JvToolEdit.pas 2012-10-08 18:59:55 UTC (rev 13459) @@ -1708,7 +1708,7 @@ FBtnControl.Visible := True; FBtnControl.Parent := Self; FBtnControl.Align := alCustom; - FButton := TJvEditButton.Create(Self); + FButton := TJvEditButton.Create(Self); // this happens too late in some cases, causing a crash. FButton.SetBounds(0, 0, FBtnControl.Width, FBtnControl.Height); FButton.Visible := True; FButton.Align := alClient; @@ -3011,6 +3011,9 @@ StyleExtraBorder: Integer; {$ENDIF JVCLThemesEnabled} begin + if not Assigned(FButton) then + exit; + {$IFDEF JVCLThemesEnabled} if StyleServices.Enabled then begin This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <wp...@us...> - 2012-10-08 18:50:07
|
Revision: 13458 http://jvcl.svn.sourceforge.net/jvcl/?rev=13458&view=rev Author: wpostma Date: 2012-10-08 18:50:00 +0000 (Mon, 08 Oct 2012) Log Message: ----------- Mantis # 6008 - Removing incorrect assertions. Also making designtime paint helper function virtual for benefit of those who subclass TJvChart and want to make it do different things in designtime paint, more easily. Modified Paths: -------------- trunk/jvcl/run/JvChart.pas Modified: trunk/jvcl/run/JvChart.pas =================================================================== --- trunk/jvcl/run/JvChart.pas 2012-10-06 17:31:53 UTC (rev 13457) +++ trunk/jvcl/run/JvChart.pas 2012-10-08 18:50:00 UTC (rev 13458) @@ -807,7 +807,7 @@ function GetChartCanvasHeight: Integer; //WP NEW 2007 function DestRect: TRect; // from TImage - procedure DesignModePaint; // Invoked by Paint method when we're in design mode. + procedure DesignModePaint; virtual; // Invoked by Paint method when we're in design mode. procedure Paint; override; // from TImage procedure Resize; override; // from TControl procedure Loaded; override; @@ -3256,12 +3256,12 @@ //Dec(X,4); //Inc(X, 2*J); Y := YTempOrigin; - Assert(Y < aHeight); +// Assert(Y < aHeight); Assert(Y > 0); Assert(X > 0); //if (X>=aWidth) then // OutputDebugString('foo!'); - Assert(X < aWidth); +// Assert(X < aWidth); X2 := BarXPosition(N + 1) - 3; // Make a space between groups, 4 pixels per XValue Index: //Dec(X2,4); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ah...@us...> - 2012-10-06 17:32:00
|
Revision: 13457 http://jvcl.svn.sourceforge.net/jvcl/?rev=13457&view=rev Author: ahuser Date: 2012-10-06 17:31:53 +0000 (Sat, 06 Oct 2012) Log Message: ----------- Mantis #5997: TJvMemoryData - strange behavior The overloaded deprecated base class method InternalGotoBookmark(Pointer) from XE3 was called instead of the overriden method. Modified Paths: -------------- trunk/jvcl/run/JvMemoryDataset.pas Modified: trunk/jvcl/run/JvMemoryDataset.pas =================================================================== --- trunk/jvcl/run/JvMemoryDataset.pas 2012-10-06 09:14:10 UTC (rev 13456) +++ trunk/jvcl/run/JvMemoryDataset.pas 2012-10-06 17:31:53 UTC (rev 13457) @@ -94,6 +94,7 @@ TSaveLoadState = (slsNone, slsLoading, slsSaving); TCompareRecords = function(Item1, Item2: TJvMemoryRecord): Integer of object; TWordArray = array of Word; + TJvBookmarkData = Integer; {$IFDEF RTL240_UP} PJvMemBuffer = PByte; TJvBookmark = TBookmark; @@ -181,6 +182,7 @@ procedure DoBeforeApplyRecord(ADataset: TDataset; RS: TRecordStatus; Found: Boolean); procedure DoAfterApplyRecord(ADataset: TDataset; RS: TRecordStatus; Apply: Boolean); procedure SetUseDataSetFilter(const Value: Boolean); + procedure InternalGotoBookmarkData(BookmarkData: TJvBookmarkData); protected function FindFieldData(Buffer: Pointer; Field: TField): Pointer; function CompareFields(Data1, Data2: Pointer; FieldType: TFieldType; @@ -410,11 +412,10 @@ STATUSNAME = 'C67F70Z90'; (* Magic *) type - TBookmarkData = Integer; PMemBookmarkInfo = ^TMemBookmarkInfo; TMemBookmarkInfo = record - BookmarkData: TBookmarkData; + BookmarkData: TJvBookmarkData; BookmarkFlag: TBookmarkFlag; end; @@ -1229,8 +1230,8 @@ function TJvMemoryData.BookmarkValid(Bookmark: TBookmark): Boolean; begin Result := (Bookmark <> nil) and FActive and - (TBookmarkData({$IFDEF RTL200_UP}Pointer(@Bookmark[0]){$ELSE}Bookmark{$ENDIF RTL200_UP}^) > Low(Integer)) and - (TBookmarkData({$IFDEF RTL200_UP}Pointer(@Bookmark[0]){$ELSE}Bookmark{$ENDIF RTL200_UP}^) <= FLastID); + (TJvBookmarkData({$IFDEF RTL200_UP}Pointer(@Bookmark[0]){$ELSE}Bookmark{$ENDIF RTL200_UP}^) > Low(Integer)) and + (TJvBookmarkData({$IFDEF RTL200_UP}Pointer(@Bookmark[0]){$ELSE}Bookmark{$ENDIF RTL200_UP}^) <= FLastID); end; function TJvMemoryData.CompareBookmarks(Bookmark1, Bookmark2: TBookmark): Integer; @@ -1244,12 +1245,12 @@ if (Bookmark1 = nil) and (Bookmark2 <> nil) then Result := -1 else - if TBookmarkData({$IFDEF RTL200_UP}Pointer(@Bookmark1[0]){$ELSE}Bookmark1{$ENDIF RTL200_UP}^) > - TBookmarkData({$IFDEF RTL200_UP}Pointer(@Bookmark2[0]){$ELSE}Bookmark2{$ENDIF RTL200_UP}^) then + if TJvBookmarkData({$IFDEF RTL200_UP}Pointer(@Bookmark1[0]){$ELSE}Bookmark1{$ENDIF RTL200_UP}^) > + TJvBookmarkData({$IFDEF RTL200_UP}Pointer(@Bookmark2[0]){$ELSE}Bookmark2{$ENDIF RTL200_UP}^) then Result := 1 else - if TBookmarkData({$IFDEF RTL200_UP}Pointer(@Bookmark1[0]){$ELSE}Bookmark1{$ENDIF RTL200_UP}^) < - TBookmarkData({$IFDEF RTL200_UP}Pointer(@Bookmark2[0]){$ELSE}Bookmark2{$ENDIF RTL200_UP}^) then + if TJvBookmarkData({$IFDEF RTL200_UP}Pointer(@Bookmark1[0]){$ELSE}Bookmark1{$ENDIF RTL200_UP}^) < + TJvBookmarkData({$IFDEF RTL200_UP}Pointer(@Bookmark2[0]){$ELSE}Bookmark2{$ENDIF RTL200_UP}^) then Result := -1 else Result := 0; @@ -1257,12 +1258,12 @@ procedure TJvMemoryData.GetBookmarkData(Buffer: PJvMemBuffer; Data: TJvBookmark); begin - Move(PMemBookmarkInfo(Buffer + FBookmarkOfs)^.BookmarkData, {$IFDEF RTL240_UP}PByte(@Data[0]){$ELSE}Data{$ENDIF RTL240_UP}^, SizeOf(TBookmarkData)); + Move(PMemBookmarkInfo(Buffer + FBookmarkOfs)^.BookmarkData, {$IFDEF RTL240_UP}PByte(@Data[0]){$ELSE}Data{$ENDIF RTL240_UP}^, SizeOf(TJvBookmarkData)); end; procedure TJvMemoryData.SetBookmarkData(Buffer: PJvMemBuffer; Data: TJvBookmark); begin - Move({$IFDEF RTL240_UP}PByte(@Data[0]){$ELSE}Data{$ENDIF RTL240_UP}^, PMemBookmarkInfo(Buffer + FBookmarkOfs)^.BookmarkData, SizeOf(TBookmarkData)); + Move({$IFDEF RTL240_UP}PByte(@Data[0]){$ELSE}Data{$ENDIF RTL240_UP}^, PMemBookmarkInfo(Buffer + FBookmarkOfs)^.BookmarkData, SizeOf(TJvBookmarkData)); end; function TJvMemoryData.GetBookmarkFlag(Buffer: PJvMemBuffer): TBookmarkFlag; @@ -1275,13 +1276,13 @@ PMemBookmarkInfo(Buffer + FBookmarkOfs)^.BookmarkFlag := Value; end; -procedure TJvMemoryData.InternalGotoBookmark(Bookmark: TJvBookmark); +procedure TJvMemoryData.InternalGotoBookmarkData(BookmarkData: TJvBookmarkData); var Rec: TJvMemoryRecord; SavePos: Integer; Accept: Boolean; begin - Rec := FindRecordID(TBookmarkData({$IFDEF RTL240_UP}PByte(@Bookmark[0]){$ELSE}Bookmark{$ENDIF RTL240_UP}^)); + Rec := FindRecordID(BookmarkData); if Rec <> nil then begin Accept := True; @@ -1297,9 +1298,14 @@ end; end; +procedure TJvMemoryData.InternalGotoBookmark(Bookmark: TJvBookmark); +begin + InternalGotoBookmarkData(TJvBookmarkData({$IFDEF RTL240_UP}PByte(@Bookmark[0]){$ELSE}Bookmark{$ENDIF RTL240_UP}^)); +end; + procedure TJvMemoryData.InternalSetToRecord(Buffer: PJvMemBuffer); begin - InternalGotoBookmark(@PMemBookmarkInfo(Buffer + FBookmarkOfs)^.BookmarkData); + InternalGotoBookmarkData(PMemBookmarkInfo(Buffer + FBookmarkOfs)^.BookmarkData); end; procedure TJvMemoryData.InternalFirst; @@ -1548,7 +1554,7 @@ procedure TJvMemoryData.InternalOpen; begin - BookmarkSize := SizeOf(TBookmarkData); + BookmarkSize := SizeOf(TJvBookmarkData); if DefaultFields then CreateFields; BindFields(True); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ah...@us...> - 2012-10-06 09:14:16
|
Revision: 13456 http://jvcl.svn.sourceforge.net/jvcl/?rev=13456&view=rev Author: ahuser Date: 2012-10-06 09:14:10 +0000 (Sat, 06 Oct 2012) Log Message: ----------- Mantis #5992: RadStudio XE2 Designer hangs with JVCL 3.4.7 Modified Paths: -------------- trunk/jvcl/run/JvPanel.pas trunk/jvcl/run/JvSpeedButton.pas Modified: trunk/jvcl/run/JvPanel.pas =================================================================== --- trunk/jvcl/run/JvPanel.pas 2012-10-04 21:19:53 UTC (rev 13455) +++ trunk/jvcl/run/JvPanel.pas 2012-10-06 09:14:10 UTC (rev 13456) @@ -156,8 +156,7 @@ FHotTrackFontOptions: TJvTrackFontOptions; FHotTrackOptions: TJvHotTrackOptions; FLastScreenCursor: TCursor; - FPainting: Boolean; - FRedrawingChildren: Boolean; + FPainting: Integer; function GetArrangeSettings: TJvArrangeSettings; function GetHeight: Integer; procedure SetHeight(Value: Integer); @@ -681,29 +680,25 @@ Exit; end; - // must force child controls to redraw completely, even their non client areas (Mantis 4406) - if Transparent and not FPainting and not FRedrawingChildren then - begin - FRedrawingChildren := True; - try + Inc(FPainting); + try + // must force child controls to redraw completely, even their non client areas (Mantis 4406) + if Transparent and (FPainting = 1) then + begin for ControlIndex := 0 to ControlCount - 1 do begin CurControl := Controls[ControlIndex]; - CurControl.Invalidate; if CurControl is TWinControl then + begin + CurControl.Invalidate; RedrawWindow(TWinControl(CurControl).Handle, nil, 0, RDW_FRAME or RDW_INVALIDATE); - - // Must update here so that the invalidate message is processed immediately - // If not, there is a very strong risk of creating a refresh loop - CurControl.Update; + // Must update here so that the invalidate message is processed immediately + // If not, there is a very strong risk of creating a refresh loop + CurControl.Update; + end; end; - finally - FRedrawingChildren := False; end; - end; - FPainting := True; - try if MouseOver and HotTrack then begin Canvas.Font := Self.HotTrackFont; @@ -795,7 +790,7 @@ end; end; finally - FPainting := False; + Dec(FPainting); end; end; @@ -1015,6 +1010,8 @@ begin if FSizeable <> Value then begin + if FDragging and FSizeable then + MouseCapture := False; FSizeable := Value; Invalidate; end; Modified: trunk/jvcl/run/JvSpeedButton.pas =================================================================== --- trunk/jvcl/run/JvSpeedButton.pas 2012-10-04 21:19:53 UTC (rev 13455) +++ trunk/jvcl/run/JvSpeedButton.pas 2012-10-06 09:14:10 UTC (rev 13456) @@ -1672,7 +1672,6 @@ MemBitmap: HBitmap; SaveBitmap: HBitmap; MemDC: HDC; - Index: Integer; DC: HDC; begin if not DoubleBuffered or ControlInGlassPaint(Self) then @@ -1685,14 +1684,9 @@ SaveBitmap := SelectObject(MemDC, MemBitmap); try DC := Msg.DC; - Index := SaveDC(DC); - try - Msg.DC := MemDC; - inherited; - Msg.DC := DC; - finally - RestoreDC(Msg.DC, Index); - end; + Msg.DC := MemDC; + inherited; + Msg.DC := DC; BitBlt(Msg.DC, 0, 0, Width, Height, MemDC, 0, 0, SRCCOPY); finally SelectObject(MemDC, SaveBitmap); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <jfu...@us...> - 2012-10-04 21:19:59
|
Revision: 13455 http://jvcl.svn.sourceforge.net/jvcl/?rev=13455&view=rev Author: jfudickar Date: 2012-10-04 21:19:53 +0000 (Thu, 04 Oct 2012) Log Message: ----------- Design Time Compatibility with DXE3 Modified Paths: -------------- trunk/jvcl/design/JvDBActnResForm.dfm trunk/jvcl/design/JvDsgnConsts.pas trunk/jvcl/examples/JvDBActions/JvDBActionMainForm.dfm Modified: trunk/jvcl/design/JvDBActnResForm.dfm =================================================================== --- trunk/jvcl/design/JvDBActnResForm.dfm 2012-10-04 21:02:30 UTC (rev 13454) +++ trunk/jvcl/design/JvDBActnResForm.dfm 2012-10-04 21:19:53 UTC (rev 13455) @@ -6,31 +6,31 @@ Left = 72 Top = 8 object JvDatabaseInsertAction1: TJvDatabaseInsertAction - Category = 'JVCL-DB' + Category = 'JVCL DB' Caption = 'Insert Record' end object JvDatabaseCopyAction1: TJvDatabaseCopyAction - Category = 'JVCL-DB' + Category = 'JVCL DB' Caption = 'Copy Record' end object JvDatabaseEditAction1: TJvDatabaseEditAction - Category = 'JVCL-DB' + Category = 'JVCL DB' Caption = 'Edit Record' end object JvDatabaseDeleteAction1: TJvDatabaseDeleteAction - Category = 'JVCL-DB' + Category = 'JVCL DB' Caption = 'Delete Record' end object JvDatabasePostAction1: TJvDatabasePostAction - Category = 'JVCL-DB' + Category = 'JVCL DB' Caption = 'Post Changes' end object JvDatabaseCancelAction1: TJvDatabaseCancelAction - Category = 'JVCL-DB' + Category = 'JVCL DB' Caption = 'Cancel Changes' end object JvDatabaseSingleRecordWindowAction1: TJvDatabaseSingleRecordWindowAction - Category = 'JVCL-DB' + Category = 'JVCL DB' Caption = 'Single Record Window' Options.PostButtonCaption = '&Post' Options.CancelButtonCaption = '&Cancel' @@ -44,62 +44,62 @@ Options.ArrangeSettings.AutoSize = asBoth end object JvDatabaseFirstAction1: TJvDatabaseFirstAction - Category = 'JVCL-DB' + Category = 'JVCL DB' Caption = 'First Record' ImageIndex = 8 end object JvDatabaseLastAction1: TJvDatabaseLastAction - Category = 'JVCL-DB' + Category = 'JVCL DB' Caption = 'Last Record' ImageIndex = 12 end object JvDatabaseNextAction1: TJvDatabaseNextAction - Category = 'JVCL-DB' + Category = 'JVCL DB' Caption = 'Next Record' ImageIndex = 13 end object JvDatabasePriorAction1: TJvDatabasePriorAction - Category = 'JVCL-DB' + Category = 'JVCL DB' Caption = 'Prior Record' ImageIndex = 16 end object JvDatabaseNextBlockAction1: TJvDatabaseNextBlockAction - Category = 'JVCL-DB' + Category = 'JVCL DB' Caption = 'Next Record Block' ImageIndex = 14 end object JvDatabasePriorBlockAction1: TJvDatabasePriorBlockAction - Category = 'JVCL-DB' + Category = 'JVCL DB' Caption = 'Prior Record Block' ImageIndex = 17 end object JvDatabasePositionAction1: TJvDatabasePositionAction - Category = 'JVCL-DB' + Category = 'JVCL DB' Caption = '0/0' end object JvDatabaseRefreshAction1: TJvDatabaseRefreshAction - Category = 'JVCL-DB' + Category = 'JVCL DB' Caption = 'Refresh' ImageIndex = 18 end object JvDatabaseSimpleAction1: TJvDatabaseSimpleAction - Category = 'JVCL-DB' + Category = 'JVCL DB' Caption = 'JvDatabaseSimpleAction1' end object JvDatabaseOpenAction1: TJvDatabaseOpenAction - Category = 'JVCL-DB' + Category = 'JVCL DB' Caption = 'Open' end object JvDatabaseCloseAction1: TJvDatabaseCloseAction - Category = 'JVCL-DB' + Category = 'JVCL DB' Caption = 'Close' end object JvDatabaseModifyAllAction1: TJvDatabaseModifyAllAction - Category = 'JVCL-DB' + Category = 'JVCL DB' Caption = 'Modify All' end object JvDatabaseShowSQLStatementAction1: TJvDatabaseShowSQLStatementAction - Category = 'JVCL-DB' + Category = 'JVCL DB' Caption = 'Show SQL Statement' end end Modified: trunk/jvcl/design/JvDsgnConsts.pas =================================================================== --- trunk/jvcl/design/JvDsgnConsts.pas 2012-10-04 21:02:30 UTC (rev 13454) +++ trunk/jvcl/design/JvDsgnConsts.pas 2012-10-04 21:19:53 UTC (rev 13455) @@ -50,8 +50,8 @@ RsPreviousPage = 'Previous Page'; RsJVCLActionsCategory = 'JVCL'; RsJVCLEditActionsCategory = 'JVCL Edit'; - RsJVCLControlActionsCategory = 'JVCL-Control'; - RsJVCLDBActionsCategory = 'JVCL-DB'; + RsJVCLControlActionsCategory = 'JVCL Control'; + RsJVCLDBActionsCategory = 'JVCL DB'; RsPropertyEditors = '\Property Editors'; RsJvEditorString = 'Click to edit...'; RsSystemColors = 'System colors'; Modified: trunk/jvcl/examples/JvDBActions/JvDBActionMainForm.dfm =================================================================== --- trunk/jvcl/examples/JvDBActions/JvDBActionMainForm.dfm 2012-10-04 21:02:30 UTC (rev 13454) +++ trunk/jvcl/examples/JvDBActions/JvDBActionMainForm.dfm 2012-10-04 21:19:53 UTC (rev 13455) @@ -2,7 +2,7 @@ Left = 349 Top = 48 Caption = 'JvDBActionMainFrm' - ClientHeight = 625 + ClientHeight = 701 ClientWidth = 862 Color = clBtnFace Font.Charset = DEFAULT_CHARSET @@ -14,14 +14,14 @@ OnCreate = FormCreate DesignSize = ( 862 - 625) + 701) PixelsPerInch = 96 TextHeight = 13 object DBGrid1: TDBGrid Left = 3 Top = 30 Width = 785 - Height = 242 + Height = 318 Anchors = [akLeft, akTop, akRight, akBottom] DataSource = DataSource1 Options = [dgEditing, dgTitles, dgIndicator, dgColumnResize, dgColLines, dgRowLines, dgTabs, dgConfirmDelete, dgCancelOnExit, dgMultiSelect] @@ -88,6 +88,8 @@ Height = 25 Action = JvDatabaseFirstAction1 Caption = 'First Record' + DoubleBuffered = True + ParentDoubleBuffered = False TabOrder = 2 end object BitBtn2: TBitBtn @@ -97,6 +99,8 @@ Height = 25 Action = JvDatabasePriorAction1 Caption = 'Prior Record' + DoubleBuffered = True + ParentDoubleBuffered = False TabOrder = 3 end object BitBtn3: TBitBtn @@ -106,6 +110,8 @@ Height = 25 Action = JvDatabaseLastAction1 Caption = 'Last Record' + DoubleBuffered = True + ParentDoubleBuffered = False TabOrder = 4 end object BitBtn4: TBitBtn @@ -115,6 +121,8 @@ Height = 25 Action = JvDatabaseNextAction1 Caption = 'Next Record' + DoubleBuffered = True + ParentDoubleBuffered = False TabOrder = 5 end object BitBtn5: TBitBtn @@ -124,6 +132,8 @@ Height = 25 Action = JvDatabasePositionAction1 Caption = '0/0' + DoubleBuffered = True + ParentDoubleBuffered = False TabOrder = 6 end object BitBtn6: TBitBtn @@ -133,15 +143,17 @@ Height = 25 Action = JvDatabaseSingleRecordWindowAction1 Caption = 'Single Record Window' + DoubleBuffered = True + ParentDoubleBuffered = False TabOrder = 7 end object JvDBGrid1: TJvDBGrid - Left = 10 - Top = 260 - Width = 766 - Height = 261 + Left = 8 + Top = 354 + Width = 590 + Height = 185 DataSource = DataSource1 - Options = [dgEditing, dgTitles, dgIndicator, dgColumnResize, dgColLines, dgRowLines, dgConfirmDelete, dgCancelOnExit, dgMultiSelect] + Options = [dgEditing, dgTitles, dgIndicator, dgColumnResize, dgColLines, dgRowLines, dgConfirmDelete, dgCancelOnExit, dgMultiSelect, dgTitleClick, dgTitleHotTrack] TabOrder = 8 TitleFont.Charset = DEFAULT_CHARSET TitleFont.Color = clWindowText @@ -170,6 +182,8 @@ Height = 25 Action = JvDatabaseOpenAction1 Caption = 'Open' + DoubleBuffered = True + ParentDoubleBuffered = False TabOrder = 9 end object BitBtn8: TBitBtn @@ -179,6 +193,8 @@ Height = 25 Action = JvDatabaseCloseAction1 Caption = 'Close' + DoubleBuffered = True + ParentDoubleBuffered = False TabOrder = 10 end object BitBtn9: TBitBtn @@ -188,6 +204,8 @@ Height = 25 Action = JvDatabaseModifyAllAction1 Caption = 'Modify All' + DoubleBuffered = True + ParentDoubleBuffered = False TabOrder = 11 end object BitBtn10: TBitBtn @@ -197,6 +215,8 @@ Height = 25 Action = JvDatabaseShowSQLStatementAction1 Caption = 'Show SQL' + DoubleBuffered = True + ParentDoubleBuffered = False TabOrder = 15 end object Button1: TButton @@ -214,6 +234,8 @@ Height = 25 Action = JvDatabaseEditAction1 Caption = 'Edit Record' + DoubleBuffered = True + ParentDoubleBuffered = False TabOrder = 14 end object BitBtn12: TBitBtn @@ -223,6 +245,8 @@ Height = 25 Action = JvDatabaseCopyAction1 Caption = 'Copy Record' + DoubleBuffered = True + ParentDoubleBuffered = False TabOrder = 13 end object BitBtn13: TBitBtn @@ -232,8 +256,87 @@ Height = 25 Action = JvDatabaseInsertAction1 Caption = 'Insert Record' + DoubleBuffered = True + ParentDoubleBuffered = False TabOrder = 12 end + object BitBtn14: TBitBtn + Left = 15 + Top = 645 + Width = 100 + Height = 25 + Action = JvControlCollapseAction1 + Caption = 'Collapse' + DoubleBuffered = True + ParentDoubleBuffered = False + TabOrder = 17 + end + object BitBtn15: TBitBtn + Left = 113 + Top = 645 + Width = 100 + Height = 25 + Action = JvControlExpandAction1 + Caption = 'Expand' + DoubleBuffered = True + ParentDoubleBuffered = False + TabOrder = 18 + end + object BitBtn16: TBitBtn + Left = 505 + Top = 645 + Width = 100 + Height = 25 + Action = JvControlCustomizeAction1 + Caption = 'Customize Control' + DoubleBuffered = True + ParentDoubleBuffered = False + TabOrder = 22 + end + object BitBtn17: TBitBtn + Left = 604 + Top = 645 + Width = 100 + Height = 25 + Action = JvControlPrintAction1 + Caption = 'Print' + DoubleBuffered = True + ParentDoubleBuffered = False + TabOrder = 23 + end + object BitBtn18: TBitBtn + Left = 407 + Top = 645 + Width = 100 + Height = 25 + Action = JvControlCustomizeColumnsAction1 + Caption = 'Customize Columns' + DoubleBuffered = True + ParentDoubleBuffered = False + TabOrder = 21 + end + object BitBtn19: TBitBtn + Left = 212 + Top = 645 + Width = 100 + Height = 25 + Action = JvControlExportAction1 + Caption = 'Export Contents' + DoubleBuffered = True + ParentDoubleBuffered = False + TabOrder = 19 + end + object BitBtn20: TBitBtn + Left = 309 + Top = 645 + Width = 100 + Height = 25 + Action = JvControlOptimizeColumnsAction1 + Caption = 'Optimize Columns' + DoubleBuffered = True + ParentDoubleBuffered = False + TabOrder = 20 + end object JvCsvDataSet2: TJvCsvDataSet FieldDefs = < item @@ -466,5 +569,34 @@ OnExecute = JvDatabaseFirstAction1Execute AfterExecute = JvDatabaseFirstAction1AfterExecute end + object JvControlCollapseAction1: TJvControlCollapseAction + Category = 'JVCL-Control' + Caption = 'Collapse' + end + object JvControlExpandAction1: TJvControlExpandAction + Category = 'JVCL-Control' + Caption = 'Expand' + end + object JvControlExportAction1: TJvControlExportAction + Category = 'JVCL-Control' + Caption = 'Export Contents' + end + object JvControlOptimizeColumnsAction1: TJvControlOptimizeColumnsAction + Category = 'JVCL-Control' + Caption = 'Optimize Columns' + end + object JvControlCustomizeColumnsAction1: TJvControlCustomizeColumnsAction + Category = 'JVCL-Control' + Caption = 'Customize Columns' + end + object JvControlPrintAction1: TJvControlPrintAction + Category = 'JVCL-Control' + Caption = 'Print' + end + object JvControlCustomizeAction1: TJvControlCustomizeAction + Category = 'JVCL-Control' + Caption = 'Customize Control' + Hint = 'Customize the current control' + end end end This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <jfu...@us...> - 2012-10-04 21:02:37
|
Revision: 13454 http://jvcl.svn.sourceforge.net/jvcl/?rev=13454&view=rev Author: jfudickar Date: 2012-10-04 21:02:30 +0000 (Thu, 04 Oct 2012) Log Message: ----------- TJvActionEngineBaseAction based Actions now Delphi XE Compatible Modified Paths: -------------- trunk/jvcl/run/JvActionsEngine.pas trunk/jvcl/run/JvDBActions.pas Modified: trunk/jvcl/run/JvActionsEngine.pas =================================================================== --- trunk/jvcl/run/JvActionsEngine.pas 2012-10-04 20:29:35 UTC (rev 13453) +++ trunk/jvcl/run/JvActionsEngine.pas 2012-10-04 21:02:30 UTC (rev 13454) @@ -292,20 +292,32 @@ begin CheckChecked (Value); if Checked <> Value then + {$IFDEF RTL240_UP} + inherited SetChecked (Value); + {$ELSE} Checked := Value; + {$ENDIF RTL240_UP} end; procedure TJvActionEngineBaseAction.SetEnabled(Value: Boolean); begin CheckEnabled (Value); if Enabled <> Value then + {$IFDEF RTL240_UP} + inherited SetEnabled (Value); + {$ELSE} Enabled := Value; + {$ENDIF RTL240_UP} end; procedure TJvActionEngineBaseAction.SetImageIndex(Value: TImageIndex); begin if ImageIndex <> Value then + {$IFDEF RTL240_UP} + inherited SetImageIndex (Value); + {$ELSE} ImageIndex := Value; + {$ENDIF RTL240_UP} end; procedure TJvActionEngineBaseAction.SetParentComponent(AParent: TComponent); @@ -319,7 +331,11 @@ begin CheckVisible(Value); if Visible <> Value then + {$IFDEF RTL240_UP} + inherited SetVisible (Value); + {$ELSE} Visible := Value; + {$ENDIF RTL240_UP} end; procedure TJvActionEngineBaseAction.UpdateTarget(Target: TObject); Modified: trunk/jvcl/run/JvDBActions.pas =================================================================== --- trunk/jvcl/run/JvDBActions.pas 2012-10-04 20:29:35 UTC (rev 13453) +++ trunk/jvcl/run/JvDBActions.pas 2012-10-04 21:02:30 UTC (rev 13454) @@ -1072,7 +1072,11 @@ procedure TJvDatabasePositionAction.SetCaption(Value: string); begin if Value <> Caption then + {$IFDEF RTL240_UP} + inherited SetCaption (Value); + {$ELSE} Caption := Value; + {$ENDIF RTL240_UP} end; procedure TJvDatabasePositionAction.ShowPositionDialog; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <jfu...@us...> - 2012-10-04 20:29:42
|
Revision: 13453 http://jvcl.svn.sourceforge.net/jvcl/?rev=13453&view=rev Author: jfudickar Date: 2012-10-04 20:29:35 +0000 (Thu, 04 Oct 2012) Log Message: ----------- Updated JvDBActions Example Modified Paths: -------------- trunk/jvcl/examples/JvDBActions/JvDBActionMainForm.pas Modified: trunk/jvcl/examples/JvDBActions/JvDBActionMainForm.pas =================================================================== --- trunk/jvcl/examples/JvDBActions/JvDBActionMainForm.pas 2012-10-03 11:03:47 UTC (rev 13452) +++ trunk/jvcl/examples/JvDBActions/JvDBActionMainForm.pas 2012-10-04 20:29:35 UTC (rev 13453) @@ -33,7 +33,7 @@ JvExExtCtrls, JvComponent, JvPanel, ComCtrls, JvExComCtrls, JvDBActions, JvDateTimePicker, JvDBDateTimePicker, StdCtrls, ActnList, Buttons, DBActns, JvExDBGrids, JvDBGrid, ImgList, JvActionsEngine, JvControlActions, - JvDBActionsEngine; + JvDBActionsEngine, JvDBActionsEngineControlCxTreeList,JvControlActionsEngineCxTreeList; type TJvDBActionMainFrm = class(TForm) @@ -86,6 +86,21 @@ JvDatabaseEditAction2: TJvDatabaseEditAction; BitBtn12: TBitBtn; BitBtn13: TBitBtn; + JvControlCollapseAction1: TJvControlCollapseAction; + JvControlExpandAction1: TJvControlExpandAction; + JvControlExportAction1: TJvControlExportAction; + JvControlOptimizeColumnsAction1: TJvControlOptimizeColumnsAction; + JvControlCustomizeColumnsAction1: TJvControlCustomizeColumnsAction; + JvControlPrintAction1: TJvControlPrintAction; + JvControlCustomizeAction1: TJvControlCustomizeAction; + BitBtn14: TBitBtn; + BitBtn15: TBitBtn; + BitBtn16: TBitBtn; + BitBtn17: TBitBtn; + BitBtn18: TBitBtn; + BitBtn19: TBitBtn; + BitBtn20: TBitBtn; + procedure cxDBTreeList1Enter(Sender: TObject); procedure FormCreate(Sender: TObject); procedure DBGrid1Enter(Sender: TObject); procedure JvDatabaseFirstAction1AfterExecute(Sender: TObject; ControlEngine: @@ -117,7 +132,7 @@ JvDynControlEngineDBTools, JvDBActionsEngineControlCxGrid, JvDBActionsEngineDatasetAdo, - JvDBActionsEngineDatasetOdac, + JvDBActionsEngineDatasetDevart, JvDBActionsEngineDatasetdoa, JvDBActionsEngineDatasetDBExpress, JvDBActionsEngineDatasetCSVDataset; @@ -154,6 +169,11 @@ end; end; +procedure TJvDBActionMainFrm.cxDBTreeList1Enter(Sender: TObject); +begin +// JvDatabaseActionList1.DataComponent := cxDBTreeList1; +end; + procedure TJvDBActionMainFrm.JvDatabaseFirstAction1AfterExecute(Sender: TObject; ControlEngine: TJvDatabaseActionBaseControlEngine; DataComponent: TComponent); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ah...@us...> - 2012-10-03 11:03:58
|
Revision: 13452 http://jvcl.svn.sourceforge.net/jvcl/?rev=13452&view=rev Author: ahuser Date: 2012-10-03 11:03:47 +0000 (Wed, 03 Oct 2012) Log Message: ----------- Mantis #6002: TJvCalcEdit button constricts by 2 pixels on each click when VCL Styles enabled Modified Paths: -------------- trunk/jvcl/run/JvToolEdit.pas Modified: trunk/jvcl/run/JvToolEdit.pas =================================================================== --- trunk/jvcl/run/JvToolEdit.pas 2012-10-03 10:09:31 UTC (rev 13451) +++ trunk/jvcl/run/JvToolEdit.pas 2012-10-03 11:03:47 UTC (rev 13452) @@ -3022,9 +3022,9 @@ StyleExtraBorder := 2; if Ctl3D then - BtnRect := Bounds(Width - FButton.Width - 2 - 1, 0 + 1, FButton.Width - StyleExtraBorder, Height - 2 - 2 - StyleExtraBorder) + BtnRect := Bounds(Width - FButton.Width - 2 - 1 - StyleExtraBorder, 0 + 1, FButton.Width, Height - 2 - 2 - StyleExtraBorder) else - BtnRect := Bounds(Width - FButton.Width - 1 - 1, 1 + 1, FButton.Width - StyleExtraBorder, Height - 2 - 2 - StyleExtraBorder); + BtnRect := Bounds(Width - FButton.Width - 1 - 1 - StyleExtraBorder, 1 + 1, FButton.Width, Height - 2 - 2 - StyleExtraBorder); end else BtnRect := Bounds(Width - FButton.Width, 0, FButton.Width, Height); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ah...@us...> - 2012-10-03 10:09:37
|
Revision: 13451 http://jvcl.svn.sourceforge.net/jvcl/?rev=13451&view=rev Author: ahuser Date: 2012-10-03 10:09:31 +0000 (Wed, 03 Oct 2012) Log Message: ----------- Mantis #5998: Border of some edit controls (with buttons) disappears when VCL Styles used. Workaround for Vcl.Styles bug where all edit controls are painted smaller than they are. Modified Paths: -------------- trunk/jvcl/run/JvToolEdit.pas Modified: trunk/jvcl/run/JvToolEdit.pas =================================================================== --- trunk/jvcl/run/JvToolEdit.pas 2012-09-27 07:52:37 UTC (rev 13450) +++ trunk/jvcl/run/JvToolEdit.pas 2012-10-03 10:09:31 UTC (rev 13451) @@ -3007,22 +3007,27 @@ procedure TJvCustomComboEdit.UpdateBtnBounds(var NewLeft, NewTop, NewWidth, NewHeight: Integer); var BtnRect: TRect; + {$IFDEF JVCLThemesEnabled} + StyleExtraBorder: Integer; + {$ENDIF JVCLThemesEnabled} begin {$IFDEF JVCLThemesEnabled} if StyleServices.Enabled then begin if BorderStyle = bsSingle then begin + // Work around the VCL Style engine bug where edit controls are painted smaller than they are (see also WMNCCalcSize) + StyleExtraBorder := 0; + if not StyleServices.IsSystemStyle and Ctl3D then + StyleExtraBorder := 2; + if Ctl3D then - BtnRect := Bounds(Width - FButton.Width - 2 - 1, 0 + 1, - FButton.Width, Height - 2 - 2) + BtnRect := Bounds(Width - FButton.Width - 2 - 1, 0 + 1, FButton.Width - StyleExtraBorder, Height - 2 - 2 - StyleExtraBorder) else - BtnRect := Bounds(Width - FButton.Width - 1 - 1, 1 + 1, - FButton.Width, Height - 2 - 2); + BtnRect := Bounds(Width - FButton.Width - 1 - 1, 1 + 1, FButton.Width - StyleExtraBorder, Height - 2 - 2 - StyleExtraBorder); end else - BtnRect := Bounds(Width - FButton.Width, 0, - FButton.Width, Height); + BtnRect := Bounds(Width - FButton.Width, 0, FButton.Width, Height); end else {$ENDIF JVCLThemesEnabled} @@ -3030,15 +3035,12 @@ if BorderStyle = bsSingle then begin if not Flat then - BtnRect := Bounds(Width - FButton.Width - 4 + 1, 0 + 1, - FButton.Width, Height - 4) + BtnRect := Bounds(Width - FButton.Width - 4 + 1, 0 + 1, FButton.Width, Height - 4) else - BtnRect := Bounds(Width - FButton.Width - 2, 2, - FButton.Width, Height - 4) + BtnRect := Bounds(Width - FButton.Width - 2, 2, FButton.Width, Height - 4) end else - BtnRect := Bounds(Width - FButton.Width, 0, - FButton.Width, Height); + BtnRect := Bounds(Width - FButton.Width, 0, FButton.Width, Height); end; // Mantis 4754: Bevels must be taken into account @@ -3120,11 +3122,11 @@ end; if StyleServices.Enabled then begin - if BorderStyle = bsSingle then - if Ctl3D then - LRight := 1 - else - LRight := -1; + if BorderStyle = bsSingle then + if Ctl3D then + LRight := 1 + else + LRight := -1; end else {$ENDIF JVCLThemesEnabled} @@ -3153,7 +3155,8 @@ {$IFDEF JVCLThemesEnabled} procedure TJvCustomComboEdit.WMNCCalcSize(var Msg: TWMNCCalcSize); begin - if StyleServices.Enabled and Ctl3D and (BorderStyle = bsSingle) then + if StyleServices.Enabled and Ctl3D and (BorderStyle = bsSingle) and + StyleServices.IsSystemStyle then // Work around the VCL Style engine bug where edit controls are painted smaller than they are (see also UpdateBtnBounds) begin with Msg.CalcSize_Params^ do InflateRect(rgrc[0], 1, 1); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ah...@us...> - 2012-09-27 07:52:44
|
Revision: 13450 http://jvcl.svn.sourceforge.net/jvcl/?rev=13450&view=rev Author: ahuser Date: 2012-09-27 07:52:37 +0000 (Thu, 27 Sep 2012) Log Message: ----------- Mantis #5994: Using mouse can't change the width of column Modified Paths: -------------- trunk/jvcl/run/JvDBGrid.pas Modified: trunk/jvcl/run/JvDBGrid.pas =================================================================== --- trunk/jvcl/run/JvDBGrid.pas 2012-09-26 16:51:47 UTC (rev 13449) +++ trunk/jvcl/run/JvDBGrid.pas 2012-09-27 07:52:37 UTC (rev 13450) @@ -3764,8 +3764,8 @@ 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 > FirstVisibleColumn + VisibleColCount then - Index := FirstVisibleColumn + VisibleColCount; + if Index > LeftCol + VisibleColCount then + Index := LeftCol + VisibleColCount; FResizeColumnIndex := Index - 1;// Store the column index to resize. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ah...@us...> - 2012-09-26 16:51:54
|
Revision: 13449 http://jvcl.svn.sourceforge.net/jvcl/?rev=13449&view=rev Author: ahuser Date: 2012-09-26 16:51:47 +0000 (Wed, 26 Sep 2012) Log Message: ----------- Mantis #5917: JvGnugettext TranslateStrings Clear has side effects Modified Paths: -------------- trunk/jvcl/run/JvGnugettext.pas Modified: trunk/jvcl/run/JvGnugettext.pas =================================================================== --- trunk/jvcl/run/JvGnugettext.pas 2012-09-25 08:05:34 UTC (rev 13448) +++ trunk/jvcl/run/JvGnugettext.pas 2012-09-26 16:51:47 UTC (rev 13449) @@ -93,6 +93,10 @@ // Delphi 2009 with Unicode {$DEFINE DELPHI2009OROLDER} {$endif} +{$ifdef VER210} + // Delphi 2010 with Unicode + {$DEFINE DELPHI2010OROLDER} +{$endif} {$ifdef VER220} // Delphi 2011 with Unicode {$DEFINE DELPHI2011OROLDER} @@ -2151,6 +2155,12 @@ end; {$endif} try + // Fix for Mantis #5917. TStringList doesn't release the objects in PutObject, so we + // use this to get sl.Clear to not destroy the objects in classes that inherit from + // TStringList but do a ClearObject in Clear. + if (sl.ClassType <> TStringList) and (sl is TStringList) then + for I := 0 to sl.Count do + sl.Objects[I] := nil; // same here, we don't want to modify the properties of the orignal string list sl.Clear; sl.AddStrings(s); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ah...@us...> - 2012-09-25 08:05:44
|
Revision: 13448 http://jvcl.svn.sourceforge.net/jvcl/?rev=13448&view=rev Author: ahuser Date: 2012-09-25 08:05:34 +0000 (Tue, 25 Sep 2012) Log Message: ----------- Mantis #5984: TJvInterpreterExpression not support Int64 Modified Paths: -------------- trunk/jvcl/run/JvInterpreter.pas Modified: trunk/jvcl/run/JvInterpreter.pas =================================================================== --- trunk/jvcl/run/JvInterpreter.pas 2012-09-24 20:16:12 UTC (rev 13447) +++ trunk/jvcl/run/JvInterpreter.pas 2012-09-25 08:05:34 UTC (rev 13448) @@ -5149,6 +5149,7 @@ {$ENDIF DELPHI7_UP} Dob: Extended; Int: Integer; + ValueInt64: Int64; Stub: Integer; begin FTokenStr := FParser.Token; @@ -5157,7 +5158,15 @@ ttInteger: begin Val(FTokenStr, Int, Stub); - FToken := Int; + if Stub <> 0 then + begin + Val(FTokenStr, ValueInt64, Stub); + FToken := ValueInt64; + if Stub <> 0 then + JvInterpreterError(ieIntegerRequired, FParser.Pos); + end + else + FToken := Int; end; ttDouble: begin This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <jfu...@us...> - 2012-09-24 20:16:19
|
Revision: 13447 http://jvcl.svn.sourceforge.net/jvcl/?rev=13447&view=rev Author: jfudickar Date: 2012-09-24 20:16:12 +0000 (Mon, 24 Sep 2012) Log Message: ----------- Updated Package Names for Thirdparty Components: - DevExpress - DevArt Odac/Unidac - SMImport/SMExport Modified Paths: -------------- trunk/jvcl/packages/xml/JvDB-R.xml Modified: trunk/jvcl/packages/xml/JvDB-R.xml =================================================================== --- trunk/jvcl/packages/xml/JvDB-R.xml 2012-09-24 20:14:15 UTC (rev 13446) +++ trunk/jvcl/packages/xml/JvDB-R.xml 2012-09-24 20:16:12 UTC (rev 13447) @@ -31,6 +31,7 @@ <Package Name="SMExportD2010r" Targets="d14" Condition="USE_3RDPARTY_SMEXPORT"/> <Package Name="SMExportXEr" Targets="d15" Condition="USE_3RDPARTY_SMEXPORT"/> <Package Name="SMExportXE2r" Targets="d16" Condition="USE_3RDPARTY_SMEXPORT"/> + <Package Name="SMExportXE3r" Targets="d17" Condition="USE_3RDPARTY_SMEXPORT"/> <Package Name="SMImportC6" Targets="c6" Condition="USE_3RDPARTY_SMIMPORT"/> <Package Name="SMImportD6" Targets="d6" Condition="USE_3RDPARTY_SMIMPORT"/> <Package Name="SMImportD7" Targets="d7" Condition="USE_3RDPARTY_SMIMPORT"/> @@ -41,6 +42,7 @@ <Package Name="SMImportD2010r" Targets="d14" Condition="USE_3RDPARTY_SMIMPORT"/> <Package Name="SMImportXEr" Targets="d15" Condition="USE_3RDPARTY_SMIMPORT"/> <Package Name="SMImportXE2r" Targets="d16" Condition="USE_3RDPARTY_SMIMPORT"/> + <Package Name="SMImportXE3r" Targets="d17" Condition="USE_3RDPARTY_SMIMPORT"/> <Package Name="DOA41C6" Targets="c6" Condition="USE_3RDPARTY_DOA"/> <Package Name="DOA41D6" Targets="d6" Condition="USE_3RDPARTY_DOA"/> <Package Name="DOA41D7" Targets="d7" Condition="USE_3RDPARTY_DOA"/> @@ -58,6 +60,7 @@ <Package Name="ODAC140" Targets="d14" Condition="USE_3RDPARTY_DEVART_ODAC"/> <Package Name="ODAC150" Targets="d15" Condition="USE_3RDPARTY_DEVART_ODAC"/> <Package Name="ODAC160" Targets="d16" Condition="USE_3RDPARTY_DEVART_ODAC"/> + <Package Name="ODAC170" Targets="d17" Condition="USE_3RDPARTY_DEVART_ODAC"/> <Package Name="ODACVCL60" Targets="d6,c6" Condition="USE_3RDPARTY_DEVART_ODAC"/> <Package Name="ODACVCL70" Targets="d7" Condition="USE_3RDPARTY_DEVART_ODAC"/> <Package Name="ODACVCL90" Targets="d9" Condition="USE_3RDPARTY_DEVART_ODAC"/> @@ -67,6 +70,7 @@ <Package Name="ODACVCL140" Targets="d14" Condition="USE_3RDPARTY_DEVART_ODAC"/> <Package Name="ODACVCL150" Targets="d15" Condition="USE_3RDPARTY_DEVART_ODAC"/> <Package Name="ODACVCL160" Targets="d16" Condition="USE_3RDPARTY_DEVART_ODAC"/> + <Package Name="ODACVCL170" Targets="d17" Condition="USE_3RDPARTY_DEVART_ODAC"/> <Package Name="UNIDAC70" Targets="d7" Condition="USE_3RDPARTY_DEVART_UNIDAC"/> <Package Name="UNIDAC90" Targets="d9" Condition="USE_3RDPARTY_DEVART_UNIDAC"/> <Package Name="UNIDAC100" Targets="d10" Condition="USE_3RDPARTY_DEVART_UNIDAC"/> @@ -75,6 +79,7 @@ <Package Name="UNIDAC140" Targets="d14" Condition="USE_3RDPARTY_DEVART_UNIDAC"/> <Package Name="UNIDAC150" Targets="d15" Condition="USE_3RDPARTY_DEVART_UNIDAC"/> <Package Name="UNIDAC160" Targets="d16" Condition="USE_3RDPARTY_DEVART_UNIDAC"/> + <Package Name="UNIDAC170" Targets="d17" Condition="USE_3RDPARTY_DEVART_UNIDAC"/> <Package Name="UNIDACVCL70" Targets="d7" Condition="USE_3RDPARTY_DEVART_UNIDAC"/> <Package Name="UNIDACVCL90" Targets="d9" Condition="USE_3RDPARTY_DEVART_UNIDAC"/> <Package Name="UNIDACVCL100" Targets="d10" Condition="USE_3RDPARTY_DEVART_UNIDAC"/> @@ -83,6 +88,7 @@ <Package Name="UNIDACVCL140" Targets="d14" Condition="USE_3RDPARTY_DEVART_UNIDAC"/> <Package Name="UNIDACVCL150" Targets="d15" Condition="USE_3RDPARTY_DEVART_UNIDAC"/> <Package Name="UNIDACVCL160" Targets="d16" Condition="USE_3RDPARTY_DEVART_UNIDAC"/> + <Package Name="UNIDACVCL170" Targets="d17" Condition="USE_3RDPARTY_DEVART_UNIDAC"/> <Package Name="vclimg" Targets="allv12up" Condition=""/> <Package Name="cxEditorsVCLC6" Targets="c6" Condition="USE_3RDPARTY_DEVEXPRESS_CXEDITOR_NON_SHARED"/> <Package Name="cxDataVCLC6" Targets="c6" Condition="USE_3RDPARTY_DEVEXPRESS_CXVERTICALGRID_NON_SHARED || USE_3RDPARTY_DEVEXPRESS_CXGRID_NON_SHARED || USE_3RDPARTY_DEVEXPRESS_CXPIVOTGRID_NON_SHARED || USE_3RDPARTY_DEVEXPRESS_CXTREELIST_NON_SHARED"/> @@ -128,6 +134,11 @@ <Package Name="cxGridd16" Targets="d16" Condition="USE_3RDPARTY_DEVEXPRESS_CXGRID_NON_SHARED"/> <Package Name="cxTreeListd16" Targets="d16" Condition="USE_3RDPARTY_DEVEXPRESS_CXTREELIST_NON_SHARED"/> <Package Name="cxPivotGridd16" Targets="d16" Condition="USE_3RDPARTY_DEVEXPRESS_CXPIVOTGRID_NON_SHARED"/> + <Package Name="cxEditorsd17" Targets="d17" Condition="USE_3RDPARTY_DEVEXPRESS_CXEDITOR_NON_SHARED"/> + <Package Name="cxDatad17" Targets="d17" Condition="USE_3RDPARTY_DEVEXPRESS_CXVERTICALGRID_NON_SHARED || USE_3RDPARTY_DEVEXPRESS_CXGRID_NON_SHARED || USE_3RDPARTY_DEVEXPRESS_CXPIVOTGRID_NON_SHARED || USE_3RDPARTY_DEVEXPRESS_CXTREELIST_NON_SHARED"/> + <Package Name="cxGridd17" Targets="d17" Condition="USE_3RDPARTY_DEVEXPRESS_CXGRID_NON_SHARED"/> + <Package Name="cxTreeListd17" Targets="d17" Condition="USE_3RDPARTY_DEVEXPRESS_CXTREELIST_NON_SHARED"/> + <Package Name="cxPivotGridd17" Targets="d17" Condition="USE_3RDPARTY_DEVEXPRESS_CXPIVOTGRID_NON_SHARED"/> <Package Name="cxEditorsVCLC6" Targets="c6" Condition="USE_3RDPARTY_DEVEXPRESS_CXEDITOR_SHARED"/> <Package Name="cxDataVCLC6" Targets="c6" Condition="USE_3RDPARTY_DEVEXPRESS_CXVERTICALGRID_SHARED || USE_3RDPARTY_DEVEXPRESS_CXGRID_SHARED || USE_3RDPARTY_DEVEXPRESS_CXPIVOTGRID_SHARED || USE_3RDPARTY_DEVEXPRESS_CXTREELIST_SHARED"/> <Package Name="cxGridVCLC6" Targets="c6" Condition="USE_3RDPARTY_DEVEXPRESS_CXGRID_SHARED"/> @@ -172,6 +183,11 @@ <Package Name="cxGridRS16" Targets="d16" Condition="USE_3RDPARTY_DEVEXPRESS_CXGRID_SHARED"/> <Package Name="cxTreeListRS16" Targets="d16" Condition="USE_3RDPARTY_DEVEXPRESS_CXTREELIST_SHARED"/> <Package Name="cxPivotGridRS16" Targets="d16" Condition="USE_3RDPARTY_DEVEXPRESS_CXPIVOTGRID_SHARED"/> + <Package Name="cxEditorsRS17" Targets="d17" Condition="USE_3RDPARTY_DEVEXPRESS_CXEDITOR_SHARED"/> + <Package Name="cxDataRS17" Targets="d17" Condition="USE_3RDPARTY_DEVEXPRESS_CXVERTICALGRID_SHARED || USE_3RDPARTY_DEVEXPRESS_CXGRID_SHARED || USE_3RDPARTY_DEVEXPRESS_CXPIVOTGRID_SHARED || USE_3RDPARTY_DEVEXPRESS_CXTREELIST_SHARED"/> + <Package Name="cxGridRS17" Targets="d17" Condition="USE_3RDPARTY_DEVEXPRESS_CXGRID_SHARED"/> + <Package Name="cxTreeListRS17" Targets="d17" Condition="USE_3RDPARTY_DEVEXPRESS_CXTREELIST_SHARED"/> + <Package Name="cxPivotGridRS17" Targets="d17" Condition="USE_3RDPARTY_DEVEXPRESS_CXPIVOTGRID_SHARED"/> </Requires> <Contains> <File Name="..\..\run\JvAppStoragePropertyEngineDB.pas" Targets="DB,help" Formname="" Condition=""/> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <jfu...@us...> - 2012-09-24 20:14:23
|
Revision: 13446 http://jvcl.svn.sourceforge.net/jvcl/?rev=13446&view=rev Author: jfudickar Date: 2012-09-24 20:14:15 +0000 (Mon, 24 Sep 2012) Log Message: ----------- Recreated using the current jvclbase.inc Modified Paths: -------------- trunk/jvcl/common/jvcld17.inc trunk/jvcl/common/jvcld17_x64.inc Modified: trunk/jvcl/common/jvcld17.inc =================================================================== --- trunk/jvcl/common/jvcld17.inc 2012-09-24 20:13:15 UTC (rev 13445) +++ trunk/jvcl/common/jvcld17.inc 2012-09-24 20:14:15 UTC (rev 13446) @@ -29,7 +29,7 @@ {%hidden%} { The installer enables this define if you compile JVCL for Delphi and C++ Builder. It disables the class constructor/destructor support that is not supported by C++Builder. } -{$DEFINE JVCL_GENERATE_CPP_PACKAGE_FILES} +{.$DEFINE JVCL_GENERATE_CPP_PACKAGE_FILES} { Enable this define if you have the dxgettext (http://dxgettext.sourceforge.net) translation tool installed and want to use it with the JVCL. } @@ -104,25 +104,36 @@ {.$DEFINE USE_3RDPARTY_SMIMPORT} { Activates Support for the DevExpress cxEditor-Controls -For further informations have a look at http://www.devexpress.com } -{.$DEFINE USE_3RDPARTY_DEVEXPRESS_CXEDITOR} +For further informations have a look at http://www.devexpress.com +You have to choose between shared and non shared packages} +{.$DEFINE USE_3RDPARTY_DEVEXPRESS_CXEDITOR_SHARED} +{.$DEFINE USE_3RDPARTY_DEVEXPRESS_CXEDITOR_NON_SHARED} { Activates Support for the DevExpress cxGrid-Controls -For further informations have a look at http://www.devexpress.com } -{.$DEFINE USE_3RDPARTY_DEVEXPRESS_CXGRID} +For further informations have a look at http://www.devexpress.com +You have to choose between shared and non shared packages} +{.$DEFINE USE_3RDPARTY_DEVEXPRESS_CXGRID_SHARED} +{.$DEFINE USE_3RDPARTY_DEVEXPRESS_CXGRID_NON_SHARED} { Activates Support for the DevExpress cxVerticalGrid-Controls -For further informations have a look at http://www.devexpress.com } -{.$DEFINE USE_3RDPARTY_DEVEXPRESS_CXVERTICALGRID} +For further informations have a look at http://www.devexpress.com +You have to choose between shared and non shared packages} +{.$DEFINE USE_3RDPARTY_DEVEXPRESS_CXVERTICALGRID_SHARED} +{.$DEFINE USE_3RDPARTY_DEVEXPRESS_CXVERTICALGRID_NON_SHARED} { Activates Support for the DevExpress cxPivotGrid-Controls -For further informations have a look at http://www.devexpress.com } -{.$DEFINE USE_3RDPARTY_DEVEXPRESS_CXPIVOTGRID} +For further informations have a look at http://www.devexpress.com +You have to choose between shared and non shared packages} +{.$DEFINE USE_3RDPARTY_DEVEXPRESS_CXPIVOTGRID_SHARED} +{.$DEFINE USE_3RDPARTY_DEVEXPRESS_CXPIVOTGRID_NON_SHARED} { Activates Support for the DevExpress cxTreeList-Controls -For further informations have a look at http://www.devexpress.com } -{.$DEFINE USE_3RDPARTY_DEVEXPRESS_CXTREELIST} +For further informations have a look at http://www.devexpress.com +You have to choose between shared and non shared packages} +{.$DEFINE USE_3RDPARTY_DEVEXPRESS_CXTREELIST_SHARED} +{.$DEFINE USE_3RDPARTY_DEVEXPRESS_CXTREELIST_NON_SHARED} + { Activates the Internet Direct (Indy)-Components For further informations have a look at http://www.indyproject.org } {.$DEFINE USE_3RDPARTY_INDY} @@ -143,10 +154,13 @@ For further informations have a look at http://www.allroundautomations.com } {.$DEFINE USE_3RDPARTY_DOA} -{ Activates Support for the CoreLabs VCL Oracle Data Access Components -For further informations have a look at http://www.crlab.com } -{.$DEFINE USE_3RDPARTY_CORELAB_ODAC} +{ Activates Support for the DevArt VCL Oracle Data Access Components +For further informations have a look at http://www.devart.com } +{.$DEFINE USE_3RDPARTY_DEVART_ODAC} { Activates Support for the DevArt VCL Universal Data Access Components For further informations have a look at http://www.devart.com } {.$DEFINE USE_3RDPARTY_DEVART_UNIDAC} + + + Modified: trunk/jvcl/common/jvcld17_x64.inc =================================================================== --- trunk/jvcl/common/jvcld17_x64.inc 2012-09-24 20:13:15 UTC (rev 13445) +++ trunk/jvcl/common/jvcld17_x64.inc 2012-09-24 20:14:15 UTC (rev 13446) @@ -29,7 +29,7 @@ {%hidden%} { The installer enables this define if you compile JVCL for Delphi and C++ Builder. It disables the class constructor/destructor support that is not supported by C++Builder. } -{$DEFINE JVCL_GENERATE_CPP_PACKAGE_FILES} +{.$DEFINE JVCL_GENERATE_CPP_PACKAGE_FILES} { Enable this define if you have the dxgettext (http://dxgettext.sourceforge.net) translation tool installed and want to use it with the JVCL. } @@ -104,25 +104,36 @@ {.$DEFINE USE_3RDPARTY_SMIMPORT} { Activates Support for the DevExpress cxEditor-Controls -For further informations have a look at http://www.devexpress.com } -{.$DEFINE USE_3RDPARTY_DEVEXPRESS_CXEDITOR} +For further informations have a look at http://www.devexpress.com +You have to choose between shared and non shared packages} +{.$DEFINE USE_3RDPARTY_DEVEXPRESS_CXEDITOR_SHARED} +{.$DEFINE USE_3RDPARTY_DEVEXPRESS_CXEDITOR_NON_SHARED} { Activates Support for the DevExpress cxGrid-Controls -For further informations have a look at http://www.devexpress.com } -{.$DEFINE USE_3RDPARTY_DEVEXPRESS_CXGRID} +For further informations have a look at http://www.devexpress.com +You have to choose between shared and non shared packages} +{.$DEFINE USE_3RDPARTY_DEVEXPRESS_CXGRID_SHARED} +{.$DEFINE USE_3RDPARTY_DEVEXPRESS_CXGRID_NON_SHARED} { Activates Support for the DevExpress cxVerticalGrid-Controls -For further informations have a look at http://www.devexpress.com } -{.$DEFINE USE_3RDPARTY_DEVEXPRESS_CXVERTICALGRID} +For further informations have a look at http://www.devexpress.com +You have to choose between shared and non shared packages} +{.$DEFINE USE_3RDPARTY_DEVEXPRESS_CXVERTICALGRID_SHARED} +{.$DEFINE USE_3RDPARTY_DEVEXPRESS_CXVERTICALGRID_NON_SHARED} { Activates Support for the DevExpress cxPivotGrid-Controls -For further informations have a look at http://www.devexpress.com } -{.$DEFINE USE_3RDPARTY_DEVEXPRESS_CXPIVOTGRID} +For further informations have a look at http://www.devexpress.com +You have to choose between shared and non shared packages} +{.$DEFINE USE_3RDPARTY_DEVEXPRESS_CXPIVOTGRID_SHARED} +{.$DEFINE USE_3RDPARTY_DEVEXPRESS_CXPIVOTGRID_NON_SHARED} { Activates Support for the DevExpress cxTreeList-Controls -For further informations have a look at http://www.devexpress.com } -{.$DEFINE USE_3RDPARTY_DEVEXPRESS_CXTREELIST} +For further informations have a look at http://www.devexpress.com +You have to choose between shared and non shared packages} +{.$DEFINE USE_3RDPARTY_DEVEXPRESS_CXTREELIST_SHARED} +{.$DEFINE USE_3RDPARTY_DEVEXPRESS_CXTREELIST_NON_SHARED} + { Activates the Internet Direct (Indy)-Components For further informations have a look at http://www.indyproject.org } {.$DEFINE USE_3RDPARTY_INDY} @@ -143,10 +154,13 @@ For further informations have a look at http://www.allroundautomations.com } {.$DEFINE USE_3RDPARTY_DOA} -{ Activates Support for the CoreLabs VCL Oracle Data Access Components -For further informations have a look at http://www.crlab.com } -{.$DEFINE USE_3RDPARTY_CORELAB_ODAC} +{ Activates Support for the DevArt VCL Oracle Data Access Components +For further informations have a look at http://www.devart.com } +{.$DEFINE USE_3RDPARTY_DEVART_ODAC} { Activates Support for the DevArt VCL Universal Data Access Components For further informations have a look at http://www.devart.com } {.$DEFINE USE_3RDPARTY_DEVART_UNIDAC} + + + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <jfu...@us...> - 2012-09-24 20:13:21
|
Revision: 13445 http://jvcl.svn.sourceforge.net/jvcl/?rev=13445&view=rev Author: jfudickar Date: 2012-09-24 20:13:15 +0000 (Mon, 24 Sep 2012) Log Message: ----------- Updated for D17 Modified Paths: -------------- trunk/jvcl/devtools/bin/RecreateJvclVersionInc.bat Modified: trunk/jvcl/devtools/bin/RecreateJvclVersionInc.bat =================================================================== --- trunk/jvcl/devtools/bin/RecreateJvclVersionInc.bat 2012-09-24 19:10:40 UTC (rev 13444) +++ trunk/jvcl/devtools/bin/RecreateJvclVersionInc.bat 2012-09-24 20:13:15 UTC (rev 13445) @@ -6,6 +6,8 @@ copy ..\..\common\jvclbase.inc ..\..\common\jvcld15.inc copy ..\..\common\jvclbase.inc ..\..\common\jvcld16.inc copy ..\..\common\jvclbase.inc ..\..\common\jvcld16_x64.inc +copy ..\..\common\jvclbase.inc ..\..\common\jvcld17.inc +copy ..\..\common\jvclbase.inc ..\..\common\jvcld17_x64.inc copy ..\..\common\jvclbase.inc ..\..\common\jvcld6.inc copy ..\..\common\jvclbase.inc ..\..\common\jvcld7.inc copy ..\..\common\jvclbase.inc ..\..\common\jvcld9.inc \ No newline at end of file This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ah...@us...> - 2012-09-24 19:10:47
|
Revision: 13444 http://jvcl.svn.sourceforge.net/jvcl/?rev=13444&view=rev Author: ahuser Date: 2012-09-24 19:10:40 +0000 (Mon, 24 Sep 2012) Log Message: ----------- Fixed Delphi 6, 7 and 2007 compilation Modified Paths: -------------- trunk/jvcl/devtools/JvExVCL/src/JvExMask.pas trunk/jvcl/run/JvExMask.pas Modified: trunk/jvcl/devtools/JvExVCL/src/JvExMask.pas =================================================================== --- trunk/jvcl/devtools/JvExVCL/src/JvExMask.pas 2012-09-24 14:13:03 UTC (rev 13443) +++ trunk/jvcl/devtools/JvExVCL/src/JvExMask.pas 2012-09-24 19:10:40 UTC (rev 13444) @@ -106,6 +106,18 @@ implementation +{$IFNDEF COMPILER12_UP} +const + ECM_FIRST = $1500; + EM_SETCUEBANNER = ECM_FIRST + 1; // Set the cue banner with the lParam = LPCWSTR + + CBM_FIRST = $1700; + CB_SETCUEBANNER = CBM_FIRST + 3; + +type + UnicodeString = WideString; +{$ENDIF ~COMPILER12_UP} + BEGIN_EDITCONTROL_CONSTRUCTOR(CustomMaskEdit) FBeepOnError := True; if UserTextHint then Modified: trunk/jvcl/run/JvExMask.pas =================================================================== --- trunk/jvcl/run/JvExMask.pas 2012-09-24 14:13:03 UTC (rev 13443) +++ trunk/jvcl/run/JvExMask.pas 2012-09-24 19:10:40 UTC (rev 13444) @@ -238,6 +238,18 @@ implementation +{$IFNDEF COMPILER12_UP} +const + ECM_FIRST = $1500; + EM_SETCUEBANNER = ECM_FIRST + 1; // Set the cue banner with the lParam = LPCWSTR + + CBM_FIRST = $1700; + CB_SETCUEBANNER = CBM_FIRST + 3; + +type + UnicodeString = WideString; +{$ENDIF ~COMPILER12_UP} + constructor TJvExCustomMaskEdit.Create(AOwner: TComponent); begin inherited Create(AOwner); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ah...@us...> - 2012-09-24 14:13:10
|
Revision: 13443 http://jvcl.svn.sourceforge.net/jvcl/?rev=13443&view=rev Author: ahuser Date: 2012-09-24 14:13:03 +0000 (Mon, 24 Sep 2012) Log Message: ----------- Removed direct uses of "Themes". Always go through JvThemes that is also available in Delphi 6. Modified Paths: -------------- trunk/jvcl/run/JvPanel.pas trunk/jvcl/run/JvToolEdit.pas Modified: trunk/jvcl/run/JvPanel.pas =================================================================== --- trunk/jvcl/run/JvPanel.pas 2012-09-24 14:02:55 UTC (rev 13442) +++ trunk/jvcl/run/JvPanel.pas 2012-09-24 14:13:03 UTC (rev 13443) @@ -47,7 +47,7 @@ {$ENDIF UNITVERSIONING} Windows, Messages, SysUtils, Classes, Graphics, Controls, Forms, ExtCtrls, - JvTypes, JvThemes, JvExtComponent, JvExControls, + JvTypes, JvExtComponent, JvExControls, JvHotTrackPersistent; type @@ -364,8 +364,8 @@ uses {$IFDEF HAS_UNIT_SYSTEM_UITYPES} System.UITypes, - {$ENDIF} - Types, {$IFDEF COMPILER7_UP}Themes,{$ENDIF} + {$ENDIF HAS_UNIT_SYSTEM_UITYPES} + Types, JvThemes, JvJCLUtils, JvJVCLUtils, JvResources; const Modified: trunk/jvcl/run/JvToolEdit.pas =================================================================== --- trunk/jvcl/run/JvToolEdit.pas 2012-09-24 14:02:55 UTC (rev 13442) +++ trunk/jvcl/run/JvToolEdit.pas 2012-09-24 14:13:03 UTC (rev 13443) @@ -1140,7 +1140,7 @@ uses RTLConsts, Math, MaskUtils, MultiMon, - {$IFDEF COMPILER16_UP} + {$IFDEF COMPILER16_UP} // VCL-Styles support Vcl.Themes, {$ENDIF COMPILER16_UP} JclFileUtils, JclStrings, @@ -2722,7 +2722,7 @@ begin FButton.Flat := Value; {$IFDEF JVCLThemesEnabled} - { When XP Themes are enabled, ButtonFlat = False, GlyphKind = gkDropDown then + { If XP Themes are enabled, ButtonFlat = False, GlyphKind = gkDropDown then the glyph is the default themed dropdown button. When ButtonFlat = True, we can't use that default dropdown button, so we have to recreate the glyph in this special case } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ah...@us...> - 2012-09-24 14:03:06
|
Revision: 13442 http://jvcl.svn.sourceforge.net/jvcl/?rev=13442&view=rev Author: ahuser Date: 2012-09-24 14:02:55 +0000 (Mon, 24 Sep 2012) Log Message: ----------- Autogenerating Settings.iss and bugfixes Modified Paths: -------------- trunk/jvcl/install/ISS/BuildSetup.bat trunk/jvcl/install/ISS/CompInstall.dll trunk/jvcl/install/ISS/ComponentInstallerScript.iss trunk/jvcl/install/ISS/Install.iss Added Paths: ----------- trunk/jvcl/install/ISS/GenerateSettings.dpr Removed Paths: ------------- trunk/jvcl/install/ISS/Settings.iss Property Changed: ---------------- trunk/jvcl/install/ISS/ Property changes on: trunk/jvcl/install/ISS ___________________________________________________________________ Modified: svn:ignore - Output setupbuild + Output Settings.iss setupbuild Modified: trunk/jvcl/install/ISS/BuildSetup.bat =================================================================== --- trunk/jvcl/install/ISS/BuildSetup.bat 2012-09-24 13:05:24 UTC (rev 13441) +++ trunk/jvcl/install/ISS/BuildSetup.bat 2012-09-24 14:02:55 UTC (rev 13442) @@ -1,7 +1,9 @@ @echo off SETLOCAL -SET SETUPDIR=%CD% +SET CURDIR=%CD% +SET SETUPDIR=%~dp0 + :: ========================================================== :: rsvars.bat check :: ========================================================== @@ -12,16 +14,30 @@ :RsVarsCalled SET JVCLROOT=%SETUPDIR%\..\.. SET JVCLBUILTDIR=%SETUPDIR%\setupbuild -SET JCLBUILTDIR=%JVCLROOT%\..\JclInnoSetup\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 +:JclRootDirFound + +SET JCLBUILTDIR=%JCLROOT%\..\JclInnoSetup\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 +:JclInnoSetupDirFound + SET InnoSetupDir=%JCLBUILTDIR%\..\InnoSetup :: == Sanity checks == -if not exist "%JVCLROOT%\run\JVCLVer.pas" goto NoRootDirFound if not exist "%SETUPDIR%\Install.iss" goto NoInstallDir if not exist "%InnoSetupDir%\..\Install.iss" goto NoJclInnoSetupDirFound if not exist "%JCLBUILTDIR%\lib\win32\Jcl.dcp" goto NoJclLibDirFound +if not exist "%JVCLROOT%\run\JVCLVer.pas" goto NoRootDirFound - :: ========================================================== :: Compile JVCL :: ========================================================== @@ -33,12 +49,13 @@ md "%JVCLBUILTDIR%\bpl" 2>NUL >NUL :: == Delete all files in the output directories, we always want to rebuild them == +if "-%JVCLBUILTDIR%" == "-" GOTO NoRootDirFound del /Q /S "%JVCLBUILTDIR%\*.*" 2>NUL >NUL :: == Compile the files SET JvclLib=%JVCLBUILTDIR%\lib\win32 -cd %JVCLROOT% +cd /d "%JVCLROOT%" msbuild make.proj "/p:Platform=win32" "/p:HppOutDir=%JVCLBUILTDIR%\hpp" "/p:DcuOutDir=%JVCLBUILTDIR%\lib\win32" "/p:BplOutDir=%JVCLBUILTDIR%\bpl" "/p:JclLibDir=%JCLBUILTDIR%\lib\win32" if ERRORLEVEL 1 goto Failed if not exist "%BDS%\bin\dcc64.exe" goto NoWin64 @@ -47,8 +64,16 @@ :: For 64bit we have to install both win32 and lib\win64 SET JvclLib=%JVCLBUILTDIR%\lib :NoWin64 -cd %SETUPDIR% +cd /d "%SETUPDIR%" +:: Generate Settings.iss file +del Settings.iss >NUL 2>NUL +dcc32 -E. "-U%JVCLBUILTDIR%\lib\win32;%JCLBUILTDIR%\lib\win32;%BDS%\lib\release;%BDS%\lib;%BDS%\lib\win32\release" "-R%JCLBUILTDIR%\lib\win32" GenerateSettings.dpr +if ERRORLEVEL 1 goto Failed +GenerateSettings.exe +del GenerateSettings.exe >NUL + + :: ========================================================== :: Compile Setup :: ========================================================== @@ -79,5 +104,5 @@ pause :Leave -cd %SETUPDIR% -ENDLOCAL \ No newline at end of file +cd /d %CURDIR% +ENDLOCAL Modified: trunk/jvcl/install/ISS/CompInstall.dll =================================================================== (Binary files differ) Modified: trunk/jvcl/install/ISS/ComponentInstallerScript.iss =================================================================== --- trunk/jvcl/install/ISS/ComponentInstallerScript.iss 2012-09-24 13:05:24 UTC (rev 13441) +++ trunk/jvcl/install/ISS/ComponentInstallerScript.iss 2012-09-24 14:02:55 UTC (rev 13442) @@ -4,6 +4,8 @@ [Code] type TIdeKind = (ikUnknown, ikDelphi, ikBCB); +var + LastInstalledIDEVersionNumber: Integer; function MapDesignPackage(IdeKind: TIdeKind; Version: Integer; const PackageName: string): string; forward; // user defined mapping function that maps the component name @PackageName to a full qualified DesignPackage file name @@ -448,11 +450,11 @@ var Version: Integer; begin - compinst_init; // sets the "DELPHIx[|BPL|DCP|RegKey]" and "BCBx[|BPL|DCP|RegKey] environment variables + LastInstalledIDEVersionNumber := compinst_init; // sets the "DELPHIx[|BPL|DCP|RegKey]" and "BCBx[|BPL|DCP|RegKey] environment variables // Check if there is any Delphi IDE installed Result := False; - for Version := 6 to 17 do + for Version := 6 to LastInstalledIDEVersionNumber do if IsDelphiInstalled(Version) then Result := True; @@ -462,7 +464,7 @@ function InitComponentUninstaller(): Boolean; begin - compinst_initUninstall; // sets the "DELPHIx[|BPL|DCP|RegKey]" and "BCBx[|BPL|DCP|RegKey] environment variables + LastInstalledIDEVersionNumber := compinst_initUninstall; // sets the "DELPHIx[|BPL|DCP|RegKey]" and "BCBx[|BPL|DCP|RegKey] environment variables Result := True; end; Added: trunk/jvcl/install/ISS/GenerateSettings.dpr =================================================================== --- trunk/jvcl/install/ISS/GenerateSettings.dpr (rev 0) +++ trunk/jvcl/install/ISS/GenerateSettings.dpr 2012-09-24 14:02:55 UTC (rev 13442) @@ -0,0 +1,23 @@ +program GenerateSettings; + +uses + {$IF CompilerVersion >= 23.0} // XE2+ + System.SysUtils, + {$ELSE} + SysUtils, + {$IFEND} + JclBase, JVCLVer; + +var + f: TextFile; + Version: Integer; +begin + Version := Trunc(CompilerVersion) - 7; + + AssignFile(f, ExtractFilePath(ParamStr(0)) + 'Settings.iss'); + Rewrite(f); + WriteLn(f, '#define Include_Delphi', Version); + WriteLn(f, '#define JclVersionStr "', JclVersionMajor, '.', JclVersionMinor, '.', JclVersionRelease, '.', JclVersionBuild, '"'); + WriteLn(f, '#define JvclVersionStr "', sJVCLVersion, '"'); + CloseFile(f); +end. \ No newline at end of file Modified: trunk/jvcl/install/ISS/Install.iss =================================================================== --- trunk/jvcl/install/ISS/Install.iss 2012-09-24 13:05:24 UTC (rev 13441) +++ trunk/jvcl/install/ISS/Install.iss 2012-09-24 14:02:55 UTC (rev 13442) @@ -468,7 +468,7 @@ Version: Integer; begin { // Uninstall from all IDEs ? - for Version := 6 to 17 do + for Version := 6 to LastInstalledIDEVersionNumber do UninstallDesignPackagesPrefixed(ikDelphi, Version, 'Jv'); for Version := 6 to 6 do UninstallDesignPackagesPrefixed(ikBCB, Version, 'Jv');} @@ -563,7 +563,7 @@ if Result then begin Result := False; - for Version := 6 to 17 do + for Version := 6 to LastInstalledIDEVersionNumber do begin if IsDelphiJclInstalled(Version) then begin Deleted: trunk/jvcl/install/ISS/Settings.iss =================================================================== --- trunk/jvcl/install/ISS/Settings.iss 2012-09-24 13:05:24 UTC (rev 13441) +++ trunk/jvcl/install/ISS/Settings.iss 2012-09-24 14:02:55 UTC (rev 13442) @@ -1,2 +0,0 @@ -#define Include_Delphi17 -#define JvclVersionStr "3.45" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ah...@us...> - 2012-09-24 13:05:37
|
Revision: 13441 http://jvcl.svn.sourceforge.net/jvcl/?rev=13441&view=rev Author: ahuser Date: 2012-09-24 13:05:24 +0000 (Mon, 24 Sep 2012) Log Message: ----------- StyleServices vs ThemeServices clean up Modified Paths: -------------- trunk/jvcl/run/JvArrayButton.pas trunk/jvcl/run/JvArrowButton.pas trunk/jvcl/run/JvBalloonHint.pas trunk/jvcl/run/JvButtons.pas trunk/jvcl/run/JvCaptionButton.pas trunk/jvcl/run/JvCheckedMaskEdit.pas trunk/jvcl/run/JvColorBox.pas trunk/jvcl/run/JvComCtrls.pas trunk/jvcl/run/JvCtrls.pas trunk/jvcl/run/JvCustomItemViewer.pas trunk/jvcl/run/JvDBGrid.pas trunk/jvcl/run/JvDBLookup.pas trunk/jvcl/run/JvDBLookupTreeView.pas trunk/jvcl/run/JvDateTimePicker.pas trunk/jvcl/run/JvDialButton.pas trunk/jvcl/run/JvDockTree.pas trunk/jvcl/run/JvDockVCStyle.pas trunk/jvcl/run/JvDockVIDStyle.pas trunk/jvcl/run/JvDockVIDVCStyle.pas trunk/jvcl/run/JvExplorerBarItems.pas trunk/jvcl/run/JvFullColorCtrls.pas trunk/jvcl/run/JvGrids.pas trunk/jvcl/run/JvGroupBox.pas trunk/jvcl/run/JvImageSquare.pas trunk/jvcl/run/JvInspector.pas trunk/jvcl/run/JvItemsPanel.pas trunk/jvcl/run/JvJVCLUtils.pas trunk/jvcl/run/JvLabel.pas trunk/jvcl/run/JvLookOut.pas trunk/jvcl/run/JvNetscapeSplitter.pas trunk/jvcl/run/JvOfficeColorButton.pas trunk/jvcl/run/JvOutlookBar.pas trunk/jvcl/run/JvPageList.pas trunk/jvcl/run/JvPanel.pas trunk/jvcl/run/JvPickDate.pas trunk/jvcl/run/JvRadioGroup.pas trunk/jvcl/run/JvSpeedButton.pas trunk/jvcl/run/JvSpeedbar.pas trunk/jvcl/run/JvSpin.pas trunk/jvcl/run/JvSplitter.pas trunk/jvcl/run/JvStatusBar.pas trunk/jvcl/run/JvTabBar.pas trunk/jvcl/run/JvTabBarXPPainter.pas trunk/jvcl/run/JvThemes.pas trunk/jvcl/run/JvTimeLine.pas trunk/jvcl/run/JvToolEdit.pas trunk/jvcl/run/JvWizard.pas trunk/jvcl/run/JvXPBar.pas trunk/jvcl/run/JvgProgress.pas trunk/jvcl/run/JvxCheckListBox.pas Modified: trunk/jvcl/run/JvArrayButton.pas =================================================================== --- trunk/jvcl/run/JvArrayButton.pas 2012-09-24 12:39:08 UTC (rev 13440) +++ trunk/jvcl/run/JvArrayButton.pas 2012-09-24 13:05:24 UTC (rev 13441) @@ -282,7 +282,7 @@ procedure DrawUp; begin {$IFDEF JVCLThemesEnabled} - if Themed and ThemeServices.{$IFDEF RTL230_UP}Enabled{$ELSE}ThemesEnabled{$ENDIF RTL230_UP} then + if Themed and StyleServices.Enabled then begin R := DrawThemedButtonFace(Self, Canvas, R, 0, bsAutoDetect, False, False, False, PtInRect(R, ScreenToClient(Mouse.CursorPos))); @@ -301,7 +301,7 @@ procedure DrawDown; begin {$IFDEF JVCLThemesEnabled} - if Themed and ThemeServices.{$IFDEF RTL230_UP}Enabled{$ELSE}ThemesEnabled{$ENDIF RTL230_UP} then + if Themed and StyleServices.Enabled then begin R := DrawThemedButtonFace(Self, Canvas, R, 0, bsAutoDetect, False, True, False, PtInRect(R, ScreenToClient(Mouse.CursorPos))); Modified: trunk/jvcl/run/JvArrowButton.pas =================================================================== --- trunk/jvcl/run/JvArrowButton.pas 2012-09-24 12:39:08 UTC (rev 13440) +++ trunk/jvcl/run/JvArrowButton.pas 2012-09-24 13:05:24 UTC (rev 13441) @@ -939,17 +939,17 @@ (csDesigning in ComponentState) then begin {$IFDEF JVCLThemesEnabled} - if ThemeServices.{$IFDEF RTL230_UP}Enabled{$ELSE}ThemesEnabled{$ENDIF RTL230_UP} then + if StyleServices.Enabled then begin - Details := ThemeServices.GetElementDetails(ttbButtonNormal); + Details := StyleServices.GetElementDetails(ttbButtonNormal); if not Enabled and (csDesigning in ComponentState) then - Details := ThemeServices.GetElementDetails(ttbButtonDisabled) + Details := StyleServices.GetElementDetails(ttbButtonDisabled) else if (FState in [bsDown, bsExclusive]) or (not SplittedButton and FArrowClick) then - Details := ThemeServices.GetElementDetails(ttbButtonPressed) + Details := StyleServices.GetElementDetails(ttbButtonPressed) else if FMouseInControl and (FState <> bsDisabled) or (csDesigning in ComponentState) then - Details := ThemeServices.GetElementDetails(ttbButtonHot); - ThemeServices.DrawElement(Canvas.Handle, Details, PaintRect); - ThemeServices.GetElementContentRect(Canvas.Handle, Details, PaintRect, PaintRect); + Details := StyleServices.GetElementDetails(ttbButtonHot); + StyleServices.DrawElement(Canvas.Handle, Details, PaintRect); + StyleServices.GetElementContentRect(Canvas.Handle, Details, PaintRect, PaintRect); end else {$ENDIF JVCLThemesEnabled} @@ -981,13 +981,13 @@ end; { draw image: } TButtonGlyph(FGlyph).Draw(Canvas, PaintRect, Offset, Caption, Layout, Margin, - Spacing, FState, Flat {$IFDEF JVCLThemesEnabled} or ThemeServices.{$IFDEF RTL230_UP}Enabled{$ELSE}ThemesEnabled{$ENDIF RTL230_UP} {$ENDIF}, + Spacing, FState, Flat {$IFDEF JVCLThemesEnabled} or StyleServices.Enabled {$ENDIF}, Alignment, VerticalAlignment); { calculate were to put arrow part } PaintRect := Rect(Width - ArrowWidth, 0, Width, Height); {$IFDEF JVCLThemesEnabled} - if ThemeServices.{$IFDEF RTL230_UP}Enabled{$ELSE}ThemesEnabled{$ENDIF RTL230_UP} then + if StyleServices.Enabled then Dec(PaintRect.Left); {$ENDIF JVCLThemesEnabled} Push := FArrowClick or (PressBoth and (FState in [bsDown, bsExclusive])); @@ -1019,15 +1019,15 @@ if FMouseInControl and Enabled or (csDesigning in ComponentState) then begin {$IFDEF JVCLThemesEnabled} - if ThemeServices.{$IFDEF RTL230_UP}Enabled{$ELSE}ThemesEnabled{$ENDIF RTL230_UP} then + if StyleServices.Enabled then begin if not Enabled and (csDesigning in ComponentState) then - Details := ThemeServices.GetElementDetails(ttbButtonDisabled) + Details := StyleServices.GetElementDetails(ttbButtonDisabled) else if FState in [bsDown, bsExclusive] then - Details := ThemeServices.GetElementDetails(ttbButtonPressed) + Details := StyleServices.GetElementDetails(ttbButtonPressed) else if FMouseInControl and (FState <> bsDisabled) or (csDesigning in ComponentState) then - Details := ThemeServices.GetElementDetails(ttbButtonHot); - ThemeServices.DrawElement(Canvas.Handle, Details, PaintRect); + Details := StyleServices.GetElementDetails(ttbButtonHot); + StyleServices.DrawElement(Canvas.Handle, Details, PaintRect); end else {$ENDIF JVCLThemesEnabled} @@ -1404,7 +1404,7 @@ FDown := False; FState := bsUp; {$IFDEF JVCLThemesEnabled} - if ThemeServices.{$IFDEF RTL230_UP}Enabled{$ELSE}ThemesEnabled{$ENDIF RTL230_UP} and Enabled and not Flat then + if StyleServices.Enabled and Enabled and not Flat then begin R := BoundsRect; Windows.InvalidateRect(Parent.Handle, {$IFNDEF COMPILER12_UP}@{$ENDIF ~COMPILER12_UP}R, True); @@ -1468,7 +1468,7 @@ Repaint; end; {$IFDEF JVCLThemesEnabled} - if ThemeServices.{$IFDEF RTL230_UP}Enabled{$ELSE}ThemesEnabled{$ENDIF RTL230_UP} and Enabled and not Flat then + if StyleServices.Enabled and Enabled and not Flat then begin R := BoundsRect; Windows.InvalidateRect(Parent.Handle, {$IFNDEF COMPILER12_UP}@{$ENDIF ~COMPILER12_UP}R, True); @@ -1489,7 +1489,7 @@ Invalidate; end; {$IFDEF JVCLThemesEnabled} - if ThemeServices.{$IFDEF RTL230_UP}Enabled{$ELSE}ThemesEnabled{$ENDIF RTL230_UP} and Enabled and not Flat then + if StyleServices.Enabled and Enabled and not Flat then begin R := BoundsRect; Windows.InvalidateRect(Parent.Handle, {$IFNDEF COMPILER12_UP}@{$ENDIF ~COMPILER12_UP}R, True); Modified: trunk/jvcl/run/JvBalloonHint.pas =================================================================== --- trunk/jvcl/run/JvBalloonHint.pas 2012-09-24 12:39:08 UTC (rev 13440) +++ trunk/jvcl/run/JvBalloonHint.pas 2012-09-24 13:05:24 UTC (rev 13441) @@ -441,14 +441,14 @@ {$ENDIF JVCLThemesEnabled} begin {$IFDEF JVCLThemesEnabled} - if IsWinVista_UP and ThemeServices.{$IFDEF RTL230_UP}Enabled{$ELSE}ThemesEnabled{$ENDIF RTL230_UP} then + if IsWinVista_UP and StyleServices.Enabled then begin - Result := GetThemeEnumValue(ThemeServices.Theme[teToolTip], TTP_BALLOONTITLE, 0, + Result := GetThemeEnumValue(StyleServices.Theme[teToolTip], TTP_BALLOONTITLE, 0, TMT_TEXTCOLOR, AThemedTextColor) = S_OK; if Result then begin // GetThemeFont is defined wrong; so cast it - Result := GetThemeFont(ThemeServices.Theme[teToolTip], 0, TTP_BALLOONTITLE, 0, + Result := GetThemeFont(StyleServices.Theme[teToolTip], 0, TTP_BALLOONTITLE, 0, TMT_FONT, {$IFDEF COMPILER12_UP}PLogFontW{$ELSE}PLogFontA{$ENDIF COMPILER12_UP}(@LogFontW)^) = S_OK; if Result then @@ -727,7 +727,7 @@ if IsWinVista_UP then begin {$IFDEF JVCLThemesEnabled} - if ThemeServices.{$IFDEF RTL230_UP}Enabled{$ELSE}ThemesEnabled{$ENDIF RTL230_UP} then + if StyleServices.Enabled then OffsetRect(FMsgRect, 12, Max(9, FHeaderRect.Bottom)) else {$ENDIF JVCLThemesEnabled} @@ -764,9 +764,9 @@ end; {$IFDEF JVCLThemesEnabled} - if IsWinVista_UP and ThemeServices.{$IFDEF RTL230_UP}Enabled{$ELSE}ThemesEnabled{$ENDIF RTL230_UP} and FIsMultiLineMsg then + if IsWinVista_UP and StyleServices.Enabled and FIsMultiLineMsg then begin - GetThemePartSize(ThemeServices.Theme[teToolTip], 0, TTP_BALLOONSTEM, cBalloonStemState[FCurrentPosition], + GetThemePartSize(StyleServices.Theme[teToolTip], 0, TTP_BALLOONSTEM, cBalloonStemState[FCurrentPosition], nil, TS_TRUE, ASize); FStemRect := Rect(0, 0, ASize.cx, ASize.cy); FTipHeight := ASize.cy; @@ -793,8 +793,8 @@ if FShowCloseBtn then begin {$IFDEF JVCLThemesEnabled} - if IsWinXP_UP and ThemeServices.{$IFDEF RTL230_UP}Enabled{$ELSE}ThemesEnabled{$ENDIF RTL230_UP} then - GetThemePartSize(ThemeServices.Theme[teToolTip], 0, TTP_CLOSE, TTCS_NORMAL, + if IsWinXP_UP and StyleServices.Enabled then + GetThemePartSize(StyleServices.Theme[teToolTip], 0, TTP_CLOSE, TTCS_NORMAL, nil, TS_DRAW, ASize) else {$ENDIF JVCLThemesEnabled} @@ -976,7 +976,7 @@ begin WindowClass.Style := WindowClass.Style or CS_DROPSHADOW; {$IFDEF JVCLThemesEnabled} - if not IsWinSeven_UP and IsWinVista_UP and ThemeServices.{$IFDEF RTL230_UP}Enabled{$ELSE}ThemesEnabled{$ENDIF RTL230_UP} then + if not IsWinSeven_UP and IsWinVista_UP and StyleServices.Enabled then ExStyle := ExStyle or WS_EX_LAYERED; {$ENDIF JVCLThemesEnabled} end @@ -1060,10 +1060,10 @@ RegionRound, RegionTip: HRGN; begin Result := CreateRectRgn(0, 0, 1, 1); - if GetThemeBackgroundRegion(ThemeServices.Theme[teToolTip], 0, + if GetThemeBackgroundRegion(StyleServices.Theme[teToolTip], 0, TTP_BALLOON, 0, FRoundRect, RegionRound) = S_OK then begin - if GetThemeBackgroundRegion(ThemeServices.Theme[teToolTip], 0, + if GetThemeBackgroundRegion(StyleServices.Theme[teToolTip], 0, TTP_BALLOONSTEM, cBalloonStemState[FCurrentPosition], FStemRect, RegionTip) = S_OK then begin CombineRgn(Result, RegionTip, RegionRound, RGN_OR); @@ -1210,7 +1210,7 @@ Exit; {$IFDEF JVCLThemesEnabled} - if IsWinVista_UP and ThemeServices.{$IFDEF RTL230_UP}Enabled{$ELSE}ThemesEnabled{$ENDIF RTL230_UP} and FIsMultiLineMsg then + if IsWinVista_UP and StyleServices.Enabled and FIsMultiLineMsg then Region := CreateThemedRegion else {$ENDIF JVCLThemesEnabled} @@ -1235,19 +1235,19 @@ {$ENDIF JVCLThemesEnabled} begin {$IFDEF JVCLThemesEnabled} - if IsWinVista_UP and ThemeServices.{$IFDEF RTL230_UP}Enabled{$ELSE}ThemesEnabled{$ENDIF RTL230_UP} then + if IsWinVista_UP and StyleServices.Enabled then begin if FIsMultiLineMsg then begin - DrawThemeBackground(ThemeServices.Theme[teToolTip], Msg.DC, + DrawThemeBackground(StyleServices.Theme[teToolTip], Msg.DC, TTP_BALLOON, 0, FRoundRect, @FRoundRect); - DrawThemeBackground(ThemeServices.Theme[teToolTip], Msg.DC, + DrawThemeBackground(StyleServices.Theme[teToolTip], Msg.DC, TTP_BALLOONSTEM, cBalloonStemState[FCurrentPosition], FStemRect, @FStemRect); end else begin R := ClientRect; - DrawThemeBackground(ThemeServices.Theme[teToolTip], Msg.DC, + DrawThemeBackground(StyleServices.Theme[teToolTip], Msg.DC, TTP_BALLOON, 0, R, @R); // draw black border BrushBlack := CreateSolidBrush(0); @@ -2212,7 +2212,7 @@ if FShowCloseBtn then begin {$IFDEF JVCLThemesEnabled} - if ThemeServices.{$IFDEF RTL230_UP}Enabled{$ELSE}ThemesEnabled{$ENDIF RTL230_UP} then + if StyleServices.Enabled then begin if (FCloseState and DFCS_PUSHED > 0) and (FCloseState and DFCS_HOT = 0) then Button := tttCloseNormal @@ -2225,8 +2225,8 @@ else Button := tttCloseNormal; - Details := ThemeServices.GetElementDetails(Button); - ThemeServices.DrawElement(Canvas.Handle, Details, FCloseBtnRect); + Details := StyleServices.GetElementDetails(Button); + StyleServices.DrawElement(Canvas.Handle, Details, FCloseBtnRect); end else {$ENDIF JVCLThemesEnabled} Modified: trunk/jvcl/run/JvButtons.pas =================================================================== --- trunk/jvcl/run/JvButtons.pas 2012-09-24 12:39:08 UTC (rev 13440) +++ trunk/jvcl/run/JvButtons.pas 2012-09-24 13:05:24 UTC (rev 13441) @@ -1543,7 +1543,7 @@ Flags := Flags or DFCS_INACTIVE; {$IFDEF JVCLThemesEnabled} - if ThemeServices.{$IFDEF RTL230_UP}Enabled{$ELSE}ThemesEnabled{$ENDIF RTL230_UP} then + if StyleServices.Enabled then begin if IsFocused or IsDefault then Flags := Flags or DFCS_MONO; // mis-used @@ -1601,7 +1601,7 @@ Spacing, State, False {True}); {$IFDEF JVCLThemesEnabled} - if not ThemeServices.{$IFDEF RTL230_UP}Enabled{$ELSE}ThemesEnabled{$ENDIF RTL230_UP} then + if not StyleServices.Enabled then {$ENDIF JVCLThemesEnabled} if IsFocused and IsDefault then begin Modified: trunk/jvcl/run/JvCaptionButton.pas =================================================================== --- trunk/jvcl/run/JvCaptionButton.pas 2012-09-24 12:39:08 UTC (rev 13440) +++ trunk/jvcl/run/JvCaptionButton.pas 2012-09-24 13:05:24 UTC (rev 13441) @@ -673,15 +673,15 @@ if not Result then Exit; - Details := ThemeServices.GetElementDetails(twMinButtonNormal); + Details := StyleServices.GetElementDetails(twMinButtonNormal); with Details do - Result := GetThemeFilename(ThemeServices.Theme[Element], Part, State, + Result := GetThemeFilename(StyleServices.Theme[Element], Part, State, TMT_IMAGEFILE, BitmapFileNameW, MAX_PATH) = S_OK; if not Result then Exit; with Details do - Result := GetThemeInt(ThemeServices.Theme[Element], Part, State, + Result := GetThemeInt(StyleServices.Theme[Element], Part, State, TMT_IMAGECOUNT, BitmapCount) = S_OK; if not Result then Exit; @@ -691,7 +691,7 @@ Exit; with Details do - if GetThemeMargins(ThemeServices.Theme[Element], 0, Part, State, + if GetThemeMargins(StyleServices.Theme[Element], 0, Part, State, TMT_SIZINGMARGINS, nil, Margins) <> S_OK then FillChar(Margins, SizeOf(Margins), 0); ABitmap.Margins := Margins; @@ -1138,15 +1138,15 @@ State := (State - 1) mod 4; { 1a. Draw the outer bit as a caption button } - Details := ThemeServices.GetElementDetails(cCaptionButton[State]); - ThemeServices.DrawElement(ACanvas.Handle, Details, DrawRect); + Details := StyleServices.GetElementDetails(cCaptionButton[State]); + StyleServices.DrawElement(ACanvas.Handle, Details, DrawRect); { 1b. Draw the inner bit as a normal button } DrawRgn := CreateRectRgn(DrawRect.Left + 1, DrawRect.Top + 1, DrawRect.Right - 1, DrawRect.Bottom - 1); try - Details := ThemeServices.GetElementDetails(cNormalButton[State]); + Details := StyleServices.GetElementDetails(cNormalButton[State]); SelectClipRgn(ACanvas.Handle, DrawRgn); - ThemeServices.DrawElement(ACanvas.Handle, Details, DrawRect); + StyleServices.DrawElement(ACanvas.Handle, Details, DrawRect); SelectClipRgn(ACanvas.Handle, 0); finally DeleteObject(DrawRgn); @@ -1618,8 +1618,8 @@ OffsetRect(CaptionRect, -FButtonRect.Left, -FButtonRect.Top); ClipRect := Rect(0, 0, FButtonRect.Right - FButtonRect.Left, FButtonRect.Bottom - FButtonRect.Top); - Details := ThemeServices.GetElementDetails(CCaption[FHasSmallCaption, FCaptionActive]); - ThemeServices.DrawElement(ACanvas.Handle, Details, CaptionRect, @ClipRect); + Details := StyleServices.GetElementDetails(CCaption[FHasSmallCaption, FCaptionActive]); + StyleServices.DrawElement(ACanvas.Handle, Details, CaptionRect, @ClipRect); end; {$ENDIF JVCLThemesEnabled} @@ -1786,11 +1786,11 @@ if FMouseInControl then Inc(CaptionButton); - Details := ThemeServices.GetElementDetails(CaptionButton); + Details := StyleServices.GetElementDetails(CaptionButton); { Special state for buttons drawn on a not active caption } if not FCaptionActive and (Details.State = 1) then Details.State := 5; - ThemeServices.DrawElement(ACanvas.Handle, Details, DrawRect) + StyleServices.DrawElement(ACanvas.Handle, Details, DrawRect) end else {$ENDIF JVCLThemesEnabled} @@ -2630,7 +2630,7 @@ * Switching from 'windows classic' style to 'windows XP' style ( delphi 7 bug) } - ThemeServices.UpdateThemes; + StyleServices.UpdateThemes; GlobalXPData.Update; {$ENDIF JVCLThemesEnabled} end; @@ -2642,7 +2642,7 @@ * Non-themed application and switching system font size } if not StyleServices.Enabled then - ThemeServices.UpdateThemes; + StyleServices.UpdateThemes; {$ENDIF JVCLThemesEnabled} end; WM_SETTEXT: Modified: trunk/jvcl/run/JvCheckedMaskEdit.pas =================================================================== --- trunk/jvcl/run/JvCheckedMaskEdit.pas 2012-09-24 12:39:08 UTC (rev 13440) +++ trunk/jvcl/run/JvCheckedMaskEdit.pas 2012-09-24 13:05:24 UTC (rev 13441) @@ -287,7 +287,7 @@ ALeft := FCheck.Left + FCheck.Width; // ensure the text starts 2 points from the checkbox edge {$IFDEF JVCLThemesEnabled} - if ThemeServices.{$IFDEF RTL230_UP}Enabled{$ELSE}ThemesEnabled{$ENDIF RTL230_UP} then + if StyleServices.Enabled then ALeft := ALeft + 1; {$ENDIF JVCLThemesEnabled} if BorderStyle = bsNone then Modified: trunk/jvcl/run/JvColorBox.pas =================================================================== --- trunk/jvcl/run/JvColorBox.pas 2012-09-24 12:39:08 UTC (rev 13440) +++ trunk/jvcl/run/JvColorBox.pas 2012-09-24 13:05:24 UTC (rev 13441) @@ -404,7 +404,7 @@ begin inherited MouseEnter(Control); {$IFDEF JVCLThemesEnabled} - if ThemeServices.{$IFDEF RTL230_UP}Enabled{$ELSE}ThemesEnabled{$ENDIF RTL230_UP} and Enabled and not (csDesigning in ComponentState) then + if StyleServices.Enabled and Enabled and not (csDesigning in ComponentState) then Invalidate; {$ENDIF JVCLThemesEnabled} end; @@ -413,7 +413,7 @@ begin inherited MouseLeave(Control); {$IFDEF JVCLThemesEnabled} - if ThemeServices.{$IFDEF RTL230_UP}Enabled{$ELSE}ThemesEnabled{$ENDIF RTL230_UP} and Enabled and not (csDesigning in ComponentState) then + if StyleServices.Enabled and Enabled and not (csDesigning in ComponentState) then Invalidate; {$ENDIF JVCLThemesEnabled} end; Modified: trunk/jvcl/run/JvComCtrls.pas =================================================================== --- trunk/jvcl/run/JvComCtrls.pas 2012-09-24 12:39:08 UTC (rev 13440) +++ trunk/jvcl/run/JvComCtrls.pas 2012-09-24 13:05:24 UTC (rev 13441) @@ -918,7 +918,7 @@ else begin {$IFDEF JVCLThemesEnabled} - if not FIPAddress.Enabled and ThemeServices.{$IFDEF RTL230_UP}Enabled{$ELSE}ThemesEnabled{$ENDIF RTL230_UP} then + if not FIPAddress.Enabled and StyleServices.Enabled then begin EnableWindow(Handle, True); Exit; Modified: trunk/jvcl/run/JvCtrls.pas =================================================================== --- trunk/jvcl/run/JvCtrls.pas 2012-09-24 12:39:08 UTC (rev 13440) +++ trunk/jvcl/run/JvCtrls.pas 2012-09-24 13:05:24 UTC (rev 13441) @@ -434,7 +434,7 @@ FMouseInControl := True; inherited MouseEnter(Control); {$IFDEF JVCLThemesEnabled} - if ThemeServices.{$IFDEF RTL230_UP}Enabled{$ELSE}ThemesEnabled{$ENDIF RTL230_UP} then + if StyleServices.Enabled then Repaint else {$ENDIF JVCLThemesEnabled} @@ -452,7 +452,7 @@ FMouseInControl := False; inherited MouseLeave(Control); {$IFDEF JVCLThemesEnabled} - if ThemeServices.{$IFDEF RTL230_UP}Enabled{$ELSE}ThemesEnabled{$ENDIF RTL230_UP} then + if StyleServices.Enabled then Repaint else {$ENDIF JVCLThemesEnabled} @@ -522,7 +522,7 @@ end; {$IFDEF JVCLThemesEnabled} - if ThemeServices.{$IFDEF RTL230_UP}Enabled{$ELSE}ThemesEnabled{$ENDIF RTL230_UP} then + if StyleServices.Enabled then begin if not IsEnabled then Button := tbPushButtonDisabled @@ -538,14 +538,14 @@ else Button := tbPushButtonNormal; - Details := ThemeServices.GetElementDetails(Button); + Details := StyleServices.GetElementDetails(Button); // Parent background. - ThemeServices.DrawParentBackground(Handle, DrawItemStruct.hDC, @Details, True); + StyleServices.DrawParentBackground(Handle, DrawItemStruct.hDC, @Details, True); // Button shape. if FMustDrawButtonFrame then - ThemeServices.DrawElement(DrawItemStruct.hDC, Details, DrawItemStruct.rcItem); + StyleServices.DrawElement(DrawItemStruct.hDC, Details, DrawItemStruct.rcItem); // Return content rect - ThemeServices.GetElementContentRect(FCanvas.Handle, Details, DrawItemStruct.rcItem, RectContent); + StyleServices.GetElementContentRect(FCanvas.Handle, Details, DrawItemStruct.rcItem, RectContent); end else {$ENDIF JVCLThemesEnabled} @@ -667,7 +667,7 @@ if not FDisableDrawDown and (DrawItemStruct.itemState and ODS_SELECTED <> 0) and Enabled then begin {$IFDEF JVCLThemesEnabled} - if ThemeServices.{$IFDEF RTL230_UP}Enabled{$ELSE}ThemesEnabled{$ENDIF RTL230_UP} then + if StyleServices.Enabled then OffsetRect(R, 1, 0) else {$ENDIF JVCLThemesEnabled} Modified: trunk/jvcl/run/JvCustomItemViewer.pas =================================================================== --- trunk/jvcl/run/JvCustomItemViewer.pas 2012-09-24 12:39:08 UTC (rev 13440) +++ trunk/jvcl/run/JvCustomItemViewer.pas 2012-09-24 13:05:24 UTC (rev 13441) @@ -1915,8 +1915,8 @@ begin inherited; {$IFDEF JVCLThemesEnabled} - if ThemeServices.{$IFDEF RTL230_UP}Enabled{$ELSE}ThemesEnabled{$ENDIF RTL230_UP} then - ThemeServices.PaintBorder(TWinControl(Self), False) + if StyleServices.Enabled then + StyleServices.PaintBorder(TWinControl(Self), False) {$ENDIF JVCLThemesEnabled} end; Modified: trunk/jvcl/run/JvDBGrid.pas =================================================================== --- trunk/jvcl/run/JvDBGrid.pas 2012-09-24 12:39:08 UTC (rev 13440) +++ trunk/jvcl/run/JvDBGrid.pas 2012-09-24 13:05:24 UTC (rev 13441) @@ -1837,7 +1837,7 @@ FOnBeforePaint(Self); {$IFNDEF COMPILER14_UP} {$IFDEF JVCLThemesEnabled} - if UseXPThemes and ThemeServices.ThemesEnabled then + if UseXPThemes and StyleServices.Enabled then begin // reset the inherited options but remove the goFixedVertLine and goFixedHorzLine values // as that causes the titles and indicator panels to have a black border @@ -2367,7 +2367,7 @@ { XP Theming } {$IFNDEF COMPILER14_UP} {$IFDEF JVCLThemesEnabled} - if not (csDesigning in ComponentState) and UseXPThemes and ThemeServices.ThemesEnabled then + if not (csDesigning in ComponentState) and UseXPThemes and StyleServices.Enabled then begin FPaintInfo.ColSizing := Sizing(X, Y); if not FPaintInfo.ColSizing then @@ -2589,7 +2589,7 @@ { XP Theming } {$IFNDEF COMPILER14_UP} {$IFDEF JVCLThemesEnabled} - if not (csDesigning in ComponentState) and UseXPThemes and ThemeServices.ThemesEnabled then + if not (csDesigning in ComponentState) and UseXPThemes and StyleServices.Enabled then begin if not FPaintInfo.ColSizing and not FPaintInfo.ColMoving then begin @@ -2683,7 +2683,7 @@ { XP Theming } {$IFNDEF COMPILER14_UP} {$IFDEF JVCLThemesEnabled} - if UseXPThemes and ThemeServices.ThemesEnabled then + if UseXPThemes and StyleServices.Enabled then begin FPaintInfo.ColSizing := False; FPaintInfo.ColMoving := False; @@ -2975,7 +2975,7 @@ if WordWrap then DrawOptions := DrawOptions or DT_WORDBREAK; {$IFDEF JVCLThemesEnabled} - if not FixCell or not (UseXPThemes and ThemeServices.{$IFDEF RTL230_UP}Enabled{$ELSE}ThemesEnabled{$ENDIF RTL230_UP}) then + if not FixCell or not (UseXPThemes and StyleServices.Enabled) then {$ENDIF JVCLThemesEnabled} {$IFDEF COMPILER14_UP} if not FixCell or (DrawingStyle in [gdsClassic, gdsThemed]) then @@ -2993,7 +2993,7 @@ begin if ReduceFlicker {$IFDEF COMPILER14_UP} and not FixCell {$ENDIF} - {$IFDEF JVCLThemesEnabled} and not (UseXPThemes and ThemeServices.{$IFDEF RTL230_UP}Enabled{$ELSE}ThemesEnabled{$ENDIF RTL230_UP}) {$ENDIF} then + {$IFDEF JVCLThemesEnabled} and not (UseXPThemes and StyleServices.Enabled) {$ENDIF} then begin // Use offscreen bitmap to eliminate flicker and // brush origin tics in painting / scrolling. @@ -3055,49 +3055,49 @@ begin {$IFNDEF COMPILER14_UP} {$IFDEF JVCLThemesEnabled} - if UseXPThemes and ThemeServices.ThemesEnabled then + if UseXPThemes and StyleServices.Enabled then begin lCellRect := ARect; - if ThemeServices.ThemesEnabled and (ARow = 0) and (ACol - ColumnOffset >= 0) and (dgTitles in Options) then + if StyleServices.Enabled and (ARow = 0) and (ACol - ColumnOffset >= 0) and (dgTitles in Options) then begin lCaptionRect := ARect; if not FPaintInfo.ColPressed or (FPaintInfo.ColPressedIdx <> ACol) then begin if (FPaintInfo.MouseInCol = -1) or (FPaintInfo.MouseInCol <> ACol) or (csDesigning in ComponentState) then - Details := ThemeServices.GetElementDetails(thHeaderItemNormal) + Details := StyleServices.GetElementDetails(thHeaderItemNormal) else - Details := ThemeServices.GetElementDetails(thHeaderItemHot); + Details := StyleServices.GetElementDetails(thHeaderItemHot); lCellRect.Right := lCellRect.Right + 1; lCellRect.Bottom := lCellRect.Bottom + 2; end else if AllowTitleClick then begin - Details := ThemeServices.GetElementDetails(thHeaderItemPressed); + Details := StyleServices.GetElementDetails(thHeaderItemPressed); InflateRect(lCaptionRect, -1, 1); end else begin if FPaintInfo.MouseInCol = ACol then - Details := ThemeServices.GetElementDetails(thHeaderItemHot) + Details := StyleServices.GetElementDetails(thHeaderItemHot) else - Details := ThemeServices.GetElementDetails(thHeaderItemNormal); + Details := StyleServices.GetElementDetails(thHeaderItemNormal); end; - ThemeServices.DrawElement(Canvas.Handle, Details, lCellRect); + StyleServices.DrawElement(Canvas.Handle, Details, lCellRect); { The column title isn't painted by DrawCell if the DataLink is not active. } if (DataLink = nil) or not DataLink.Active then if (ACol - ColumnOffset >= 0) and (ACol - ColumnOffset < Columns.Count) then DrawTitleCaption(Canvas, lCaptionRect, Columns[ACol - ColumnOffset]); end - else if (ACol = 0) and (dgIndicator in Options) and ThemeServices.ThemesEnabled then + else if (ACol = 0) and (dgIndicator in Options) and StyleServices.Enabled then begin // indicator column if ARow < TitleOffset then - Details := ThemeServices.GetElementDetails(thHeaderItemNormal) + Details := StyleServices.GetElementDetails(thHeaderItemNormal) else - Details := ThemeServices.GetElementDetails(thHeaderRoot); + Details := StyleServices.GetElementDetails(thHeaderRoot); lCellRect.Right := lCellRect.Right + 1; lCellRect.Bottom := lCellRect.Bottom + 2; - ThemeServices.DrawElement(Canvas.Handle, Details, lCellRect); + StyleServices.DrawElement(Canvas.Handle, Details, lCellRect); // draw the indicator if (Datalink.Active) and (ARow - TitleOffset = Datalink.ActiveRecord) then begin @@ -3392,7 +3392,7 @@ if FTitleButtons or ([dgRowLines, dgColLines] * Options = [dgRowLines, dgColLines]) then begin {$IFDEF JVCLThemesEnabled} - if not (UseXPThemes and ThemeServices.{$IFDEF RTL230_UP}Enabled{$ELSE}ThemesEnabled{$ENDIF RTL230_UP}) then + if not (UseXPThemes and StyleServices.Enabled) then {$ENDIF JVCLThemesEnabled} begin DrawEdge(Canvas.Handle, TitleRect, EdgeFlag[Down], BF_BOTTOMRIGHT); @@ -3433,7 +3433,7 @@ DrawCellBackground(TitleRect, FixedColor, AState, ACol, ARow - TitleOffset); {$ELSE} {$IFDEF JVCLThemesEnabled} - if not (UseXPThemes and ThemeServices.ThemesEnabled) then + if not (UseXPThemes and StyleServices.Enabled) then {$ENDIF JVCLThemesEnabled} Canvas.FillRect(TitleRect); {$ENDIF COMPILER14_UP} @@ -3445,7 +3445,7 @@ DrawCellBackground(TitleRect, FixedColor, AState, ACol, ARow - TitleOffset); {$ELSE} // {$IFDEF JVCLThemesEnabled} -// if not (UseXPThemes and ThemeServices.ThemesEnabled) then +// if not (UseXPThemes and StyleServices.Enabled) then // {$ENDIF JVCLThemesEnabled} // Canvas.FillRect(TitleRect); {$ENDIF COMPILER14_UP} @@ -3485,7 +3485,7 @@ DrawCellBackground(Rect(TextRect.Right, TitleRect.Top, TitleRect.Right, TitleRect.Bottom), FixedColor, AState, ACol, ARow - TitleOffset); {$ELSE} {$IFDEF JVCLThemesEnabled} - if not (UseXPThemes and ThemeServices.ThemesEnabled) then + if not (UseXPThemes and StyleServices.Enabled) then {$ENDIF JVCLThemesEnabled} Canvas.FillRect(Rect(TextRect.Right, TitleRect.Top, TitleRect.Right, TitleRect.Bottom)); {$ENDIF COMPILER14_UP} @@ -3499,7 +3499,7 @@ WriteCellText(ARect, MinOffs, MinOffs, '', taLeftJustify, False, IsRightToLeft); {$IFDEF COMPILER14_UP} if ([dgRowLines, dgColLines] * Options = [dgRowLines, dgColLines]) and - ((DrawingStyle = gdsClassic) or ((DrawingStyle = gdsThemed) and not ThemeServices.{$IFDEF RTL230_UP}Enabled{$ELSE}ThemesEnabled{$ENDIF RTL230_UP})) and + ((DrawingStyle = gdsClassic) or ((DrawingStyle = gdsThemed) and not StyleServices.Enabled)) and not (gdPressed in AState) then begin InflateRect(TitleRect, 1, 1); @@ -4438,7 +4438,7 @@ FPaintInfo.ColPressedIdx := -1; {$IFNDEF COMPILER14_UP} {$IFDEF JVCLThemesEnabled} - if UseXPThemes and ThemeServices.ThemesEnabled then + if UseXPThemes and StyleServices.Enabled then if ValidCell(FCell) then InvalidateCell(FCell.X, FCell.Y); {$ENDIF JVCLThemesEnabled} @@ -5044,7 +5044,7 @@ {$IFDEF JVCLThemesEnabled} lPt := Point(Mouse.CursorPos.X, Mouse.CursorPos.Y); Cell := MouseCoord(lPt.X, lPt.Y); - if UseXPThemes and ThemeServices.ThemesEnabled then + if UseXPThemes and StyleServices.Enabled then if (dgTitles in Options) and (Cell.Y = 0) then InvalidateCell(Cell.X, Cell.Y); {$ENDIF JVCLThemesEnabled} @@ -5056,7 +5056,7 @@ inherited; {$IFNDEF COMPILER14_UP} {$IFDEF JVCLThemesEnabled} - if UseXPThemes and ThemeServices.ThemesEnabled then + if UseXPThemes and StyleServices.Enabled then if ValidCell(FCell) then InvalidateCell(FCell.X, FCell.Y); {$ENDIF JVCLThemesEnabled} @@ -5073,7 +5073,7 @@ FPaintInfo.MouseInCol := -1; {$IFNDEF COMPILER14_UP} {$IFDEF JVCLThemesEnabled} - if UseXPThemes and ThemeServices.ThemesEnabled then + if UseXPThemes and StyleServices.Enabled then if ValidCell(FCell) then InvalidateCell(FCell.X, FCell.Y); {$ENDIF JVCLThemesEnabled} @@ -5091,7 +5091,7 @@ FPaintInfo.ColMoving := False; {$IFNDEF COMPILER14_UP} {$IFDEF JVCLThemesEnabled} - if UseXPThemes and ThemeServices.ThemesEnabled then + if UseXPThemes and StyleServices.Enabled then Invalidate; {$ENDIF JVCLThemesEnabled} {$ENDIF ~COMPILER14_UP} Modified: trunk/jvcl/run/JvDBLookup.pas =================================================================== --- trunk/jvcl/run/JvDBLookup.pas 2012-09-24 12:39:08 UTC (rev 13440) +++ trunk/jvcl/run/JvDBLookup.pas 2012-09-24 13:05:24 UTC (rev 13441) @@ -3332,7 +3332,7 @@ R.Right := FButtonWidth; end; {$IFDEF JVCLThemesEnabled} - if ThemeServices.{$IFDEF RTL230_UP}Enabled{$ELSE}ThemesEnabled{$ENDIF RTL230_UP} then + if StyleServices.Enabled then begin if not FListActive or not Enabled or ReadOnly then State := tcDropDownButtonDisabled @@ -3344,8 +3344,8 @@ State := tcDropDownButtonHot else State := tcDropDownButtonNormal; - Details := ThemeServices.GetElementDetails(State); - ThemeServices.DrawElement(Canvas.Handle, Details, R); + Details := StyleServices.GetElementDetails(State); + StyleServices.DrawElement(Canvas.Handle, Details, R); end else {$ENDIF JVCLThemesEnabled} @@ -3451,7 +3451,7 @@ if csDesigning in ComponentState then Exit; {Windows XP themes use hot track states, hence we have to update the drop down button.} - if ThemeServices.{$IFDEF RTL230_UP}Enabled{$ELSE}ThemesEnabled{$ENDIF RTL230_UP} and not MouseOver then + if StyleServices.Enabled and not MouseOver then begin inherited MouseEnter(Control); Invalidate; Modified: trunk/jvcl/run/JvDBLookupTreeView.pas =================================================================== --- trunk/jvcl/run/JvDBLookupTreeView.pas 2012-09-24 12:39:08 UTC (rev 13440) +++ trunk/jvcl/run/JvDBLookupTreeView.pas 2012-09-24 13:05:24 UTC (rev 13441) @@ -952,7 +952,7 @@ SetRect(R, W, 0, ClientWidth, ClientHeight); {added by zelen} {$IFDEF JVCLThemesEnabled} - if ThemeServices.{$IFDEF RTL230_UP}Enabled{$ELSE}ThemesEnabled{$ENDIF RTL230_UP} then + if StyleServices.Enabled then begin if (not FListActive) or (not Enabled) or ReadOnly then State := tcDropDownButtonDisabled @@ -964,8 +964,8 @@ State := tcDropDownButtonHot else State := tcDropDownButtonNormal; - Details := ThemeServices.GetElementDetails(State); - ThemeServices.DrawElement(Canvas.Handle, Details, R); + Details := StyleServices.GetElementDetails(State); + StyleServices.DrawElement(Canvas.Handle, Details, R); @@ -1753,7 +1753,7 @@ Exit; inherited MouseEnter(Control); {Windows XP themes use hot track states, hence we have to update the drop down button.} - if ThemeServices.{$IFDEF RTL230_UP}Enabled{$ELSE}ThemesEnabled{$ENDIF RTL230_UP} and not MouseOver and not (csDesigning in ComponentState) then + if StyleServices.Enabled and not MouseOver and not (csDesigning in ComponentState) then Invalidate; end; @@ -1761,7 +1761,7 @@ begin if csDesigning in ComponentState then Exit; - if ThemeServices.{$IFDEF RTL230_UP}Enabled{$ELSE}ThemesEnabled{$ENDIF RTL230_UP} and MouseOver then + if StyleServices.Enabled and MouseOver then Invalidate; inherited MouseLeave(Control); end; Modified: trunk/jvcl/run/JvDateTimePicker.pas =================================================================== --- trunk/jvcl/run/JvDateTimePicker.pas 2012-09-24 12:39:08 UTC (rev 13440) +++ trunk/jvcl/run/JvDateTimePicker.pas 2012-09-24 13:05:24 UTC (rev 13441) @@ -276,7 +276,7 @@ SizeHandle := GetParent(CalHandle); // The dropdown window uses a 'border' of.. {$IFDEF JVCLThemesEnabled} - if ThemeServices.{$IFDEF RTL230_UP}Enabled{$ELSE}ThemesEnabled{$ENDIF RTL230_UP} then + if StyleServices.Enabled then begin // .. 3 pixels when themed Inc(MinWidth, 3*2); Modified: trunk/jvcl/run/JvDialButton.pas =================================================================== --- trunk/jvcl/run/JvDialButton.pas 2012-09-24 12:39:08 UTC (rev 13440) +++ trunk/jvcl/run/JvDialButton.pas 2012-09-24 13:05:24 UTC (rev 13441) @@ -876,7 +876,7 @@ FBitmapInvalid := True; end; {$IFDEF JVCLThemesEnabled} - if FBitmapInvalid or ThemeServices.{$IFDEF RTL230_UP}Enabled{$ELSE}ThemesEnabled{$ENDIF RTL230_UP} then + if FBitmapInvalid or StyleServices.Enabled then {$ELSE} if FBitmapInvalid then {$ENDIF JVCLThemesEnabled} @@ -889,7 +889,7 @@ end; {$IFDEF JVCLThemesEnabled} - if ThemeServices.{$IFDEF RTL230_UP}Enabled{$ELSE}ThemesEnabled{$ENDIF RTL230_UP} then + if StyleServices.Enabled then FBitmap.Canvas.CopyRect(FBitmapRect, Canvas, FBitmapRect); {$ENDIF JVCLThemesEnabled} @@ -931,7 +931,7 @@ Canvas.Brush.Color := Parent.Brush.Color; Canvas.Brush.Style := bsSolid; {$IFDEF JVCLThemesEnabled} - if not ThemeServices.{$IFDEF RTL230_UP}Enabled{$ELSE}ThemesEnabled{$ENDIF RTL230_UP} then + if not StyleServices.Enabled then {$ENDIF JVCLThemesEnabled} Canvas.FillRect(FBitmapRect); SetViewportOrgEx(Canvas.Handle, FSize div 2 - FRadius, FSize div 2 - FRadius, @@ -994,7 +994,7 @@ InflateRect(ARect, -1, -1); Canvas.Brush.Style := bsClear; {$IFDEF JVCLThemesEnabled} - if ThemeServices.{$IFDEF RTL230_UP}Enabled{$ELSE}ThemesEnabled{$ENDIF RTL230_UP} then + if StyleServices.Enabled then begin BitmapNeeded; Canvas.Pen.Color := FBitmap.Canvas.Pixels[0, 0] Modified: trunk/jvcl/run/JvDockTree.pas =================================================================== --- trunk/jvcl/run/JvDockTree.pas 2012-09-24 12:39:08 UTC (rev 13440) +++ trunk/jvcl/run/JvDockTree.pas 2012-09-24 13:05:24 UTC (rev 13441) @@ -3921,14 +3921,14 @@ Exit; // MF {$IFDEF JVCLThemesEnabled} - if ThemeServices.{$IFDEF RTL230_UP}Available{$ELSE}ThemesAvailable{$ENDIF RTL230_UP} and ThemeServices.{$IFDEF RTL230_UP}Enabled{$ELSE}ThemesEnabled{$ENDIF RTL230_UP} then + if StyleServices.Available and StyleServices.Enabled then begin if GrabberSize < 14 then CurrentThemeType := twSmallCloseButtonNormal else CurrentThemeType := twCloseButtonNormal; - Details := ThemeServices.GetElementDetails(CurrentThemeType); - ThemeServices.DrawElement(Canvas.Handle, Details, Rect(Left, Top, + Details := StyleServices.GetElementDetails(CurrentThemeType); + StyleServices.DrawElement(Canvas.Handle, Details, Rect(Left, Top, Left + GrabberSize - 2, Top + GrabberSize - 2)); end else Modified: trunk/jvcl/run/JvDockVCStyle.pas =================================================================== --- trunk/jvcl/run/JvDockVCStyle.pas 2012-09-24 12:39:08 UTC (rev 13440) +++ trunk/jvcl/run/JvDockVCStyle.pas 2012-09-24 13:05:24 UTC (rev 13441) @@ -948,13 +948,13 @@ if (ADockClient <> nil) and not ADockClient.EnableCloseButton then Exit; {$IFDEF JVCLThemesEnabled} - if ThemeServices.{$IFDEF RTL230_UP}Available{$ELSE}ThemesAvailable{$ENDIF RTL230_UP} and ThemeServices.{$IFDEF RTL230_UP}Enabled{$ELSE}ThemesEnabled{$ENDIF RTL230_UP} then + if StyleServices.Available and StyleServices.Enabled then begin CurrentThemeTypeBtn := twSmallCloseButtonNormal; if VCDockZone.CloseBtnDown then CurrentThemeTypeBtn := twSmallCloseButtonPushed; - Details := ThemeServices.GetElementDetails(CurrentThemeTypeBtn); - ThemeServices.DrawElement(Canvas.Handle, Details, Classes.Rect(Left, Top, + Details := StyleServices.GetElementDetails(CurrentThemeTypeBtn); + StyleServices.DrawElement(Canvas.Handle, Details, Classes.Rect(Left, Top, Left + ButtonWidth, Top + ButtonHeight)); end else @@ -985,15 +985,15 @@ (VCDockZone.ParentZone.VisibleChildCount >= 2)); IsMaximum := VCDockZone.ZoneSizeStyle in [zssMaximum]; {$IFDEF JVCLThemesEnabled} - if ThemeServices.{$IFDEF RTL230_UP}Available{$ELSE}ThemesAvailable{$ENDIF RTL230_UP} and ThemeServices.{$IFDEF RTL230_UP}Enabled{$ELSE}ThemesEnabled{$ENDIF RTL230_UP} then + if StyleServices.Available and StyleServices.Enabled then begin CurrentThemeTypeSB := ArrowOrientTheme[CurrArrow[IsMaximum, DockSiteOrientation]]; if VCDockZone.ExpandButtonDown then CurrentThemeTypeSB := TThemedScrollBar(Ord(CurrentThemeTypeSB) + 2); if InActive then CurrentThemeTypeSB := TThemedScrollBar(Ord(CurrentThemeTypeSB) + 3); - Details := ThemeServices.GetElementDetails(CurrentThemeTypeSB); - ThemeServices.DrawElement(Canvas.Handle, Details, Classes.Rect(Left, Top, Left + ButtonWidth, Top + ButtonHeight)); + Details := StyleServices.GetElementDetails(CurrentThemeTypeSB); + StyleServices.DrawElement(Canvas.Handle, Details, Classes.Rect(Left, Top, Left + ButtonWidth, Top + ButtonHeight)); end else {$ENDIF JVCLThemesEnabled} Modified: trunk/jvcl/run/JvDockVIDStyle.pas =================================================================== --- trunk/jvcl/run/JvDockVIDStyle.pas 2012-09-24 12:39:08 UTC (rev 13440) +++ trunk/jvcl/run/JvDockVIDStyle.pas 2012-09-24 13:05:24 UTC (rev 13441) @@ -2281,7 +2281,7 @@ if (ADockClient <> nil) and not ADockClient.EnableCloseButton then Exit; {$IFDEF JVCLThemesEnabled} - if ThemeServices.{$IFDEF RTL230_UP}Available{$ELSE}ThemesAvailable{$ENDIF RTL230_UP} and ThemeServices.{$IFDEF RTL230_UP}Enabled{$ELSE}ThemesEnabled{$ENDIF RTL230_UP} then + if StyleServices.Available and StyleServices.Enabled then begin if GrabberSize <= 18 then begin @@ -2295,8 +2295,8 @@ if AZone.CloseBtnDown then CurrentThemeType := twCloseButtonPushed; end; - Details := ThemeServices.GetElementDetails(CurrentThemeType); - ThemeServices.DrawElement(Canvas.Handle, Details, Rect(Left, Top, Left + ButtonWidth, Top + ButtonHeight)); + Details := StyleServices.GetElementDetails(CurrentThemeType); + StyleServices.DrawElement(Canvas.Handle, Details, Rect(Left, Top, Left + ButtonWidth, Top + ButtonHeight)); end else {$ENDIF JVCLThemesEnabled} Modified: trunk/jvcl/run/JvDockVIDVCStyle.pas =================================================================== --- trunk/jvcl/run/JvDockVIDVCStyle.pas 2012-09-24 12:39:08 UTC (rev 13440) +++ trunk/jvcl/run/JvDockVIDVCStyle.pas 2012-09-24 13:05:24 UTC (rev 13441) @@ -2301,7 +2301,7 @@ if (ADockClient <> nil) and not ADockClient.EnableCloseButton then Exit; {$IFDEF JVCLThemesEnabled} - if ThemeServices.{$IFDEF RTL230_UP}Available{$ELSE}ThemesAvailable{$ENDIF RTL230_UP} and ThemeServices.{$IFDEF RTL230_UP}Enabled{$ELSE}ThemesEnabled{$ENDIF RTL230_UP} then + if StyleServices.Available and StyleServices.Enabled then begin if GrabberSize < 14 then begin @@ -2315,8 +2315,8 @@ if AZone.CloseBtnDown then CurrentThemeType := twCloseButtonPushed; end; - Details := ThemeServices.GetElementDetails(CurrentThemeType); - ThemeServices.DrawElement(Canvas.Handle, Details, Classes.Rect(Left, Top, Left + ButtonWidth, Top + ButtonHeight)); + Details := StyleServices.GetElementDetails(CurrentThemeType); + StyleServices.DrawElement(Canvas.Handle, Details, Classes.Rect(Left, Top, Left + ButtonWidth, Top + ButtonHeight)); end else {$ENDIF JVCLThemesEnabled} Modified: trunk/jvcl/run/JvExplorerBarItems.pas =================================================================== --- trunk/jvcl/run/JvExplorerBarItems.pas 2012-09-24 12:39:08 UTC (rev 13440) +++ trunk/jvcl/run/JvExplorerBarItems.pas 2012-09-24 13:05:24 UTC (rev 13441) @@ -651,19 +651,19 @@ DrawRect.Bottom := DrawRect.Top + Item.Height; {$IFDEF JVCLThemesEnabled} - if {$IFDEF RTL230_UP}StyleServices.Enabled{$ELSE}ThemeServices.ThemesEnabled{$ENDIF RTL230_UP} then + if StyleServices.Enabled then begin case AState of cbChecked: - Element := {$IFDEF RTL230_UP}StyleServices{$ELSE}ThemeServices{$ENDIF RTL230_UP}.GetElementDetails(tbCheckBoxCheckedNormal); + Element := StyleServices.GetElementDetails(tbCheckBoxCheckedNormal); cbUnchecked: - Element := {$IFDEF RTL230_UP}StyleServices{$ELSE}ThemeServices{$ENDIF RTL230_UP}.GetElementDetails(tbCheckBoxUncheckedNormal); + Element := StyleServices.GetElementDetails(tbCheckBoxUncheckedNormal); else - Element := {$IFDEF RTL230_UP}StyleServices{$ELSE}ThemeServices{$ENDIF RTL230_UP}.GetElementDetails(tbCheckBoxUncheckedNormal); + Element := StyleServices.GetElementDetails(tbCheckBoxUncheckedNormal); end; if not AEnabled then - Element := {$IFDEF RTL230_UP}StyleServices{$ELSE}ThemeServices{$ENDIF RTL230_UP}.GetElementDetails(tbCheckBoxUncheckedDisabled); - {$IFDEF RTL230_UP}StyleServices{$ELSE}ThemeServices{$ENDIF RTL230_UP}.DrawElement(Canvas.Handle, Element, R); + Element := StyleServices.GetElementDetails(tbCheckBoxUncheckedDisabled); + StyleServices.DrawElement(Canvas.Handle, Element, R); end else {$ENDIF JVCLThemesEnabled} @@ -726,17 +726,17 @@ DrawRect.Bottom := R.Bottom; {$IFDEF JVCLThemesEnabled} - if {$IFDEF RTL230_UP}StyleServices.Enabled{$ELSE}ThemeServices.ThemesEnabled{$ENDIF RTL230_UP} then + if StyleServices.Enabled then begin if not AEnabled then - element := {$IFDEF RTL230_UP}StyleServices{$ELSE}ThemeServices{$ENDIF RTL230_UP}.GetElementDetails(tbPushButtonDisabled) + element := StyleServices.GetElementDetails(tbPushButtonDisabled) else if aPushed then - element := {$IFDEF RTL230_UP}StyleServices{$ELSE}ThemeServices{$ENDIF RTL230_UP}.GetElementDetails(tbPushButtonPressed) + element := StyleServices.GetElementDetails(tbPushButtonPressed) else if aHot then - element := {$IFDEF RTL230_UP}StyleServices{$ELSE}ThemeServices{$ENDIF RTL230_UP}.GetElementDetails(tbPushButtonHot) + element := StyleServices.GetElementDetails(tbPushButtonHot) else - element := {$IFDEF RTL230_UP}StyleServices{$ELSE}ThemeServices{$ENDIF RTL230_UP}.GetElementDetails(tbPushButtonNormal); - {$IFDEF RTL230_UP}StyleServices{$ELSE}ThemeServices{$ENDIF RTL230_UP}.DrawElement(Canvas.Handle, element, DrawRect); + element := StyleServices.GetElementDetails(tbPushButtonNormal); + StyleServices.DrawElement(Canvas.Handle, element, DrawRect); end else {$ENDIF JVCLThemesEnabled} @@ -1002,16 +1002,16 @@ R := Rect(X + JvExplorerConstXOffset, Y, X + Width - JvExplorerConstXOffset, Y + Item.Height); {$IFDEF JVCLThemesEnabled} - if {$IFDEF RTL230_UP}StyleServices.Enabled{$ELSE}ThemeServices.ThemesEnabled{$ENDIF RTL230_UP} then + if StyleServices.Enabled then begin - element := {$IFDEF RTL230_UP}StyleServices{$ELSE}ThemeServices{$ENDIF RTL230_UP}.GetElementDetails(tpBar); - {$IFDEF RTL230_UP}StyleServices{$ELSE}ThemeServices{$ENDIF RTL230_UP}.DrawElement(Handle, element, R); + element := StyleServices.GetElementDetails(tpBar); + StyleServices.DrawElement(Handle, element, R); if (aItem.Position > 0) and (aItem.Max > 0) then R := Rect(X + JvExplorerConstXOffset + 2, Y + 2, X + JvExplorerConstXOffset + 2 + Round((Width - 2 * JvExplorerConstXOffset - 4) * (aItem.Position - aItem.Min) / (aItem.Max - aItem.Min)), Y + Item.Height - 2); - element := {$IFDEF RTL230_UP}StyleServices{$ELSE}ThemeServices{$ENDIF RTL230_UP}.GetElementDetails(tpChunk); - {$IFDEF RTL230_UP}StyleServices{$ELSE}ThemeServices{$ENDIF RTL230_UP}.DrawElement(Handle, element, R); + element := StyleServices.GetElementDetails(tpChunk); + StyleServices.DrawElement(Handle, element, R); end else {$ENDIF JVCLThemesEnabled} @@ -1355,19 +1355,19 @@ DrawRect.Bottom := DrawRect.Top + Item.Height; {$IFDEF JVCLThemesEnabled} - if {$IFDEF RTL230_UP}StyleServices.Enabled{$ELSE}ThemeServices.ThemesEnabled{$ENDIF RTL230_UP} then + if StyleServices.Enabled then begin case AState of cbChecked: - Element := {$IFDEF RTL230_UP}StyleServices{$ELSE}ThemeServices{$ENDIF RTL230_UP}.GetElementDetails(tbRadioButtonCheckedNormal); + Element := StyleServices.GetElementDetails(tbRadioButtonCheckedNormal); cbUnchecked: - Element := {$IFDEF RTL230_UP}StyleServices{$ELSE}ThemeServices{$ENDIF RTL230_UP}.GetElementDetails(tbRadioButtonUncheckedNormal); + Element := StyleServices.GetElementDetails(tbRadioButtonUncheckedNormal); else - Element := {$IFDEF RTL230_UP}StyleServices{$ELSE}ThemeServices{$ENDIF RTL230_UP}.GetElementDetails(tbRadioButtonUncheckedNormal); + Element := StyleServices.GetElementDetails(tbRadioButtonUncheckedNormal); end; if not AEnabled then - Element := {$IFDEF RTL230_UP}StyleServices{$ELSE}ThemeServices{$ENDIF RTL230_UP}.GetElementDetails(tbRadioButtonUncheckedDisabled); - {$IFDEF RTL230_UP}StyleServices{$ELSE}ThemeServices{$ENDIF RTL230_UP}.DrawElement(Canvas.Handle, Element, R); + Element := StyleServices.GetElementDetails(tbRadioButtonUncheckedDisabled); + StyleServices.DrawElement(Canvas.Handle, Element, R); end else {$ENDIF JVCLThemesEnabled} Modified: trunk/jvcl/run/JvFullColorCtrls.pas =================================================================== --- trunk/jvcl/run/JvFullColorCtrls.pas 2012-09-24 12:39:08 UTC (rev 13440) +++ trunk/jvcl/run/JvFullColorCtrls.pas 2012-09-24 13:05:24 UTC (rev 13441) @@ -589,7 +589,7 @@ property OnStartDrag; end; - TJvFullColorArray = array [0..{$IFDEF RTL230_UP}Maxint div 16{$ELSE}MaxListSize{$ENDIF RTL230_UP} - 1] of TJvFullColor; + TJvFullColorArray = array [0..{$IFDEF RTL230_UP}MaxInt div 16{$ELSE}MaxListSize{$ENDIF RTL230_UP} - 1] of TJvFullColor; PJvFullColorArray = ^TJvFullColorArray; TJvFullColorListOperation = (foAllChanged, foDeleted, foAdded, foChanged); Modified: trunk/jvcl/run/JvGrids.pas =================================================================== --- trunk/jvcl/run/JvGrids.pas 2012-09-24 12:39:08 UTC (rev 13440) +++ trunk/jvcl/run/JvGrids.pas 2012-09-24 13:05:24 UTC (rev 13441) @@ -207,7 +207,7 @@ JvJCLUtils, JvJVCLUtils; const - MaxCustomExtents = {$IFDEF RTL230_UP}Maxint div 16{$ELSE}MaxListSize{$ENDIF RTL230_UP}; + MaxCustomExtents = {$IFDEF RTL230_UP}MaxInt div 16{$ELSE}MaxListSize{$ENDIF RTL230_UP}; MaxShortInt = High(ShortInt); type Modified: trunk/jvcl/run/JvGroupBox.pas =================================================================== --- trunk/jvcl/run/JvGroupBox.pas 2012-09-24 12:39:08 UTC (rev 13440) +++ trunk/jvcl/run/JvGroupBox.pas 2012-09-24 13:05:24 UTC (rev 13441) @@ -119,25 +119,25 @@ LastBkMode: Integer; begin {$IFDEF JVCLThemesEnabled} - if ThemeServices.{$IFDEF RTL230_UP}Enabled{$ELSE}ThemesEnabled{$ENDIF RTL230_UP} then + if StyleServices.Enabled then begin {$IFDEF COMPILER7_UP} inherited Paint; {$ELSE} if Enabled then - Details := ThemeServices.GetElementDetails(tbGroupBoxNormal) + Details := StyleServices.GetElementDetails(tbGroupBoxNormal) else - Details := ThemeServices.GetElementDetails(tbGroupBoxDisabled); + Details := StyleServices.GetElementDetails(tbGroupBoxDisabled); R := ClientRect; Inc(R.Top, Canvas.TextHeight('0') div 2); - ThemeServices.DrawElement(Canvas.Handle, Details, R); + StyleServices.DrawElement(Canvas.Handle, Details, R); CaptionRect := Rect(8, 0, Min(Canvas.TextWidth(Caption) + 8, ClientWidth - 8), Canvas.TextHeight(Caption)); Canvas.Brush.Color := Self.Color; DrawThemedBackground(Self, Canvas, CaptionRect); - ThemeServices.DrawText(Canvas.Handle, Details, Caption, CaptionRect, DT_LEFT, 0); + StyleServices.DrawText(Canvas.Handle, Details, Caption, CaptionRect, DT_LEFT, 0); {$ENDIF COMPILER7_UP} Exit; end; Modified: trunk/jvcl/run/JvImageSquare.pas =================================================================== --- trunk/jvcl/run/JvImageSquare.pas 2012-09-24 12:39:08 UTC (rev 13440) +++ trunk/jvcl/run/JvImageSquare.pas 2012-09-24 13:05:24 UTC (rev 13441) @@ -168,7 +168,7 @@ end else {$IFDEF JVCLThemesEnabled} - if (FBorderStyle = bsSingle) and ThemeServices.{$IFDEF RTL230_UP}Enabled{$ELSE}ThemesEnabled{$ENDIF RTL230_UP} then + if (FBorderStyle = bsSingle) and StyleServices.Enabled then DrawThemedBorder(Self) else {$ENDIF JVCLThemesEnabled} Modified: trunk/jvcl/run/JvInspector.pas =================================================================== --- trunk/jvcl/run/JvInspector.pas 2012-09-24 12:39:08 UTC (rev 13440) +++ trunk/jvcl/run/JvInspector.pas 2012-09-24 13:05:24 UTC (rev 13441) @@ -6844,7 +6844,7 @@ if Pressed then BFlags := BF_FLAT; {$IFDEF JVCLThemesEnabled} - if ThemeServices.{$IFDEF RTL230_UP}Enabled{$ELSE}ThemesEnabled{$ENDIF RTL230_UP} then + if StyleServices.Enabled then DrawThemedButtonFace(Inspector, ACanvas, R, 0, bsNew, False, Pressed, False, False) else {$ENDIF JVCLThemesEnabled} Modified: trunk/jvcl/run/JvItemsPanel.pas =================================================================== --- trunk/jvcl/run/JvItemsPanel.pas 2012-09-24 12:39:08 UTC (rev 13440) +++ trunk/jvcl/run/JvItemsPanel.pas 2012-09-24 13:05:24 UTC (rev 13441) @@ -257,7 +257,7 @@ if FHotTrack and HighLight then Canvas.Font.Color := FHotTrackColor; {$IFDEF JVCLThemesEnabled} - if ThemeServices.{$IFDEF RTL230_UP}Enabled{$ELSE}ThemesEnabled{$ENDIF RTL230_UP} then + if StyleServices.Enabled then SetBkMode(Canvas.Handle, TRANSPARENT); {$ENDIF JVCLThemesEnabled} DrawText(Canvas, Items[Index], -1, R, Flags); Modified: trunk/jvcl/run/JvJVCLUtils.pas =================================================================== --- trunk/jvcl/run/JvJVCLUtils.pas 2012-09-24 12:39:08 UTC (rev 13440) +++ trunk/jvcl/run/JvJVCLUtils.pas 2012-09-24 13:05:24 UTC (rev 13441) @@ -4144,7 +4144,7 @@ TQColorArray = array [0..MAX_COLORS - 1] of TQColor; PQColorList = ^TQColorList; - TQColorList = array [0..{$IFDEF RTL230_UP}Maxint div 16{$ELSE}MaxListSize{$ENDIF RTL230_UP} - 1] of PQColor; + TQColorList = array [0..{$IFDEF RTL230_UP}MaxInt div 16{$ELSE}MaxListSize{$ENDIF RTL230_UP} - 1] of PQColor; PNewColor = ^TNewColor; TNewColor = record Modified: trunk/jvcl/run/JvLabel.pas =================================================================== --- trunk/jvcl/run/JvLabel.pas 2012-09-24 12:39:08 UTC (rev 13440) +++ trunk/jvcl/run/JvLabel.pas 2012-09-24 13:05:24 UTC (rev 13441) @@ -501,7 +501,7 @@ FChangeLink.OnChange := DoImagesChange; ControlStyle := ControlStyle + [csOpaque, csReplicatable]; {$IFDEF JVCLThemesEnabled} - if ThemeServices.Enabled then + if StyleServices.Enabled then ControlStyle := ControlStyle - [csOpaque]; {$ENDIF JVCLThemesEnabled} @@ -1068,7 +1068,7 @@ if Transparent <> Value then begin {$IFDEF JVCLThemesEnabled} - if ThemeServices.Enabled then + if StyleServices.Enabled then Value := True; // themes aware Labels are always transparent {$ENDIF JVCLThemesEnabled} if Value then @@ -1201,7 +1201,7 @@ NeedRepaint := not Transparent and ( {$IFDEF JVCLThemesEnabled} - ThemeServices.Enabled or + StyleServices.Enabled or {$ENDIF JVCLThemesEnabled} (FHotTrack and not (FDragging or OtherDragging))); @@ -1228,7 +1228,7 @@ NeedRepaint := not Transparent and ( {$IFDEF JVCLThemesEnabled} - ThemeServices.Enabled or + StyleServices.Enabled or {$ENDIF JVCLThemesEnabled} (FHotTrack and (FDragging or not OtherDragging))); Modified: trunk/jvcl/run/JvLookOut.pas =================================================================== --- trunk/jvcl/run/JvLookOut.pas 2012-09-24 12:39:08 UTC (rev 13440) +++ trunk/jvcl/run/JvLookOut.pas 2012-09-24 13:05:24 UTC (rev 13441) @@ -682,7 +682,7 @@ if not MouseOver then begin inherited MouseEnter(Control); - if FFlat {$IFDEF JVCLThemesEnabled} or ThemeServices.{$IFDEF RTL230_UP}Enabled{$ELSE}ThemesEnabled{$ENDIF RTL230_UP} {$ENDIF} then + if FFlat {$IFDEF JVCLThemesEnabled} or StyleServices.Enabled {$ENDIF} then Invalidate; end; end; @@ -693,7 +693,7 @@ begin inherited MouseLeave(Control); // FDown := False; - if FFlat {$IFDEF JVCLThemesEnabled} or ThemeServices.{$IFDEF RTL230_UP}Enabled{$ELSE}ThemesEnabled{$ENDIF RTL230_UP} {$ENDIF} then + if FFlat {$IFDEF JVCLThemesEnabled} or StyleServices.Enabled {$ENDIF} then Invalidate; end; end; @@ -2719,7 +2719,7 @@ if FBorderStyle = bsSingle then begin {$IFDEF JVCLThemesEnabled} - if ThemeServices.{$IFDEF RTL230_UP}Enabled{$ELSE}ThemesEnabled{$ENDIF RTL230_UP} then + if StyleServices.Enabled then DrawThemedBorder(Self) else {$ENDIF JVCLThemesEnabled} @@ -2925,7 +2925,7 @@ if FBorderStyle = bsSingle then begin {$IFDEF JVCLThemesEnabled} - if ThemeServices.{$IFDEF RTL230_UP}Enabled{$ELSE}ThemesEnabled{$ENDIF RTL230_UP} then + if StyleServices.Enabled then DrawThemedBorder(Self) else {$ENDIF JVCLThemesEnabled} Modified: trunk/jvcl/run/JvNetscapeSplitter.pas =================================================================== --- trunk/jvcl/run/JvNetscapeSplitter.pas 2012-09-24 12:39:08 UTC (rev 13440) +++ trunk/jvcl/run/JvNetscapeSplitter.pas 2012-09-24 13:05:24 UTC (rev 13441) @@ -312,7 +312,7 @@ try // Exclude button rect from update region here for less flicker. {$IFDEF JVCLThemesEnabled} - if ThemeServices.{$IFDEF RTL230_UP}Enabled{$ELSE}ThemesEnabled{$ENDIF RTL230_UP} then + if StyleServices.Enabled then begin // DrawThemedBackground(Self, Canvas, ClientRect, Parent.Brush.Color); DC := Canvas.Handle; Modified: trunk/jvcl/run/JvOfficeColorButton.pas =================================================================== --- trunk/jvcl/run/JvOfficeColorButton.pas 2012-09-24 12:39:08 UTC (rev 13440) +++ trunk/jvcl/run/JvOfficeColorButton.pas 2012-09-24 13:05:24 UTC (rev 13441) @@ -399,7 +399,7 @@ { calculate were to put arrow part } PaintRect := Rect(3, 0, Width - 3, Height); {$IFDEF JVCLThemesEnabled} - if ThemeServices.{$IFDEF RTL230_UP}Enabled{$ELSE}ThemesEnabled{$ENDIF RTL230_UP} then + if StyleServices.Enabled then Dec(PaintRect.Left); {$ENDIF JVCLThemesEnabled} Modified: trunk/jvcl/run/JvOutlookBar.pas =================================================================== --- trunk/jvcl/run/JvOutlookBar.pas 2012-09-24 12:39:08 UTC (rev 13440) +++ trunk/jvcl/run/JvOutlookBar.pas 2012-09-24 13:05:24 UTC (rev 13441) @@ -1367,7 +1367,7 @@ begin if csDestroying in ComponentState then Exit; - if {Themed}ThemeServices.{$IFDEF RTL230_UP}Enabled{$ELSE}ThemesEnabled{$ENDIF RTL230_UP} and (not Flat) then + if {Themed}StyleServices.Enabled and (not Flat) then begin if not Enabled then Button := tsArrowBtnUpDisabled @@ -1383,9 +1383,9 @@ if not FIsUpBtn then Button := TThemedScrollBar(Ord(tsArrowBtnDownNormal) + Ord(Button) - Ord(tsArrowBtnUpNormal)); - Details := ThemeServices.GetElementDetails(Button); + Details := StyleServices.GetElementDetails(Button); - ThemeServices.DrawElement(Canvas.Handle, Details, ClientRect, nil); //@ClipRect); + StyleServices.DrawElement(Canvas.Handle, Details, ClientRect, nil); //@ClipRect); end else inherited Paint; @@ -1409,7 +1409,7 @@ FPageBtnProps := TJvPageBtnProps.Create(self); DoubleBuffered := True; {$IFDEF JVCLThemesEnabled} - ... [truncated message content] |
From: <ah...@us...> - 2012-09-24 12:39:19
|
Revision: 13440 http://jvcl.svn.sourceforge.net/jvcl/?rev=13440&view=rev Author: ahuser Date: 2012-09-24 12:39:08 +0000 (Mon, 24 Sep 2012) Log Message: ----------- StyleServices vs ThemeServices clean up Modified Paths: -------------- trunk/jvcl/run/JvExplorerBarItems.pas trunk/jvcl/run/JvStatusBar.pas Modified: trunk/jvcl/run/JvExplorerBarItems.pas =================================================================== --- trunk/jvcl/run/JvExplorerBarItems.pas 2012-09-24 12:24:22 UTC (rev 13439) +++ trunk/jvcl/run/JvExplorerBarItems.pas 2012-09-24 12:39:08 UTC (rev 13440) @@ -396,9 +396,6 @@ uses {$IFDEF JVCLThemesEnabled} JvThemes, - {$IFDEF RTL230_UP} // XE2+ - Themes, - {$ENDIF RTL230_UP} {$ENDIF JVCLThemesEnabled} Math, DateUtils; Modified: trunk/jvcl/run/JvStatusBar.pas =================================================================== --- trunk/jvcl/run/JvStatusBar.pas 2012-09-24 12:24:22 UTC (rev 13439) +++ trunk/jvcl/run/JvStatusBar.pas 2012-09-24 12:39:08 UTC (rev 13440) @@ -74,9 +74,9 @@ procedure MovePanelControls; function GetPanelClass: TStatusPanelClass; override; procedure SBSetParts(var msg: TMessage); message SB_SETPARTS; - {$IFDEF COMPILER16_UP} + {$IFDEF COMPILER16} procedure WndProc(var Msg: TMessage); override; - {$ENDIF COMPILER16_UP} + {$ENDIF COMPILER16} public constructor Create(AOwner: TComponent); override; function ExecuteAction(Action: TBasicAction): Boolean; override; @@ -249,7 +249,7 @@ MovePanelControls; end; -{$IFDEF COMPILER16_UP} +{$IFDEF COMPILER16} procedure TJvStatusBar.WndProc(var Msg: TMessage); var DC, PaintDC: HDC; @@ -259,7 +259,7 @@ // TStatusBarStyleHook.Paint catches all WM_PAINT but doesn't call Control.PaintControls() // what causes TGraphicControls to not be painted. With this code we call the PaintControls // function in that case. - // TODO: When this bug gets fixed in a later Delphi version, the IFDEFs must be adjusted. + // This bug was fixed with XE3 if (Msg.Msg = WM_PAINT) and StyleServices.Enabled and not StyleServices.IsSystemStyle then begin DC := HDC(Msg.WParam); @@ -302,7 +302,7 @@ else inherited WndProc(Msg); end; -{$ENDIF COMPILER16_UP} +{$ENDIF COMPILER16} //=== { TJvStatusPanel } ===================================================== This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ah...@us...> - 2012-09-24 12:24:28
|
Revision: 13439 http://jvcl.svn.sourceforge.net/jvcl/?rev=13439&view=rev Author: ahuser Date: 2012-09-24 12:24:22 +0000 (Mon, 24 Sep 2012) Log Message: ----------- Mantis #5986: Dropping a TJvAppCommand on a data module raises an access violation Modified Paths: -------------- trunk/jvcl/run/JvAppCommand.pas Modified: trunk/jvcl/run/JvAppCommand.pas =================================================================== --- trunk/jvcl/run/JvAppCommand.pas 2012-09-24 11:54:30 UTC (rev 13438) +++ trunk/jvcl/run/JvAppCommand.pas 2012-09-24 12:24:22 UTC (rev 13439) @@ -149,7 +149,7 @@ implementation uses - JvWndProcHook; + JvWndProcHook, JvResources; const // from JwaWinUser.pas @@ -178,7 +178,11 @@ constructor TJvAppCommand.Create(AOwner: TComponent); begin inherited Create(AOwner); - FForm := GetParentForm(TControl(AOwner)); + FForm := nil; + if AOwner is TControl then + FForm := GetParentForm(AOwner as TControl); + if FForm = nil then + raise Exception.CreateResFmt(@RsEOwnerMustBeForm, [ClassName]); Active := True; end; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ah...@us...> - 2012-09-24 11:54:41
|
Revision: 13438 http://jvcl.svn.sourceforge.net/jvcl/?rev=13438&view=rev Author: ahuser Date: 2012-09-24 11:54:30 +0000 (Mon, 24 Sep 2012) Log Message: ----------- Mantis #5989: TJvCheckedMaskEdit lacks ShowButton property Modified Paths: -------------- trunk/jvcl/run/JvCheckedMaskEdit.pas trunk/jvcl/run/JvDBControls.pas Modified: trunk/jvcl/run/JvCheckedMaskEdit.pas =================================================================== --- trunk/jvcl/run/JvCheckedMaskEdit.pas 2012-09-24 11:46:58 UTC (rev 13437) +++ trunk/jvcl/run/JvCheckedMaskEdit.pas 2012-09-24 11:54:30 UTC (rev 13438) @@ -139,8 +139,9 @@ property ParentShowHint; property PopupMenu; property ReadOnly; + property ShowButton; + property ShowCheckBox; property ShowHint; - property ShowCheckBox; property Text; property TabOrder; {property TabStop;} { (rb) Why disabled?} Modified: trunk/jvcl/run/JvDBControls.pas =================================================================== --- trunk/jvcl/run/JvDBControls.pas 2012-09-24 11:46:58 UTC (rev 13437) +++ trunk/jvcl/run/JvDBControls.pas 2012-09-24 11:54:30 UTC (rev 13438) @@ -148,6 +148,7 @@ property PasswordChar; property PopupMenu; property ReadOnly: Boolean read GetReadOnly write SetReadOnly default False; + property ShowButton; property ShowHint; property TabOrder; property TabStop; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ah...@us...> - 2012-09-24 11:47:11
|
Revision: 13437 http://jvcl.svn.sourceforge.net/jvcl/?rev=13437&view=rev Author: ahuser Date: 2012-09-24 11:46:58 +0000 (Mon, 24 Sep 2012) Log Message: ----------- * Mantis #5937: TJvComboEdit unpublished properties NumbersOnly and TexhHint * Implemented TextHint for older Delphi versions, for non-themed applications and for Windows 2000. Modified Paths: -------------- trunk/jvcl/HooksAndHacks.txt trunk/jvcl/devtools/JvExVCL/src/JvExControls.macros trunk/jvcl/devtools/JvExVCL/src/JvExGrids.pas trunk/jvcl/devtools/JvExVCL/src/JvExMask.pas trunk/jvcl/devtools/JvExVCL/src/JvExStdCtrls.pas trunk/jvcl/run/JvBaseEdits.pas trunk/jvcl/run/JvCombobox.pas trunk/jvcl/run/JvDBControls.pas trunk/jvcl/run/JvDBLookup.pas trunk/jvcl/run/JvDBSearchEdit.pas trunk/jvcl/run/JvEdit.pas trunk/jvcl/run/JvExButtons.pas trunk/jvcl/run/JvExCheckLst.pas trunk/jvcl/run/JvExComCtrls.pas trunk/jvcl/run/JvExControls.pas trunk/jvcl/run/JvExDBGrids.pas trunk/jvcl/run/JvExExtCtrls.pas trunk/jvcl/run/JvExForms.pas trunk/jvcl/run/JvExGrids.pas trunk/jvcl/run/JvExMask.pas trunk/jvcl/run/JvExStdCtrls.pas trunk/jvcl/run/JvMaskEdit.pas trunk/jvcl/run/JvStringGrid.pas trunk/jvcl/run/JvToolEdit.pas trunk/jvcl/run/JvValidateEdit.pas Modified: trunk/jvcl/HooksAndHacks.txt =================================================================== --- trunk/jvcl/HooksAndHacks.txt 2012-09-19 14:21:04 UTC (rev 13436) +++ trunk/jvcl/HooksAndHacks.txt 2012-09-24 11:46:58 UTC (rev 13437) @@ -18,3 +18,6 @@ JvPageSetup: * THackCommonDialog, hard typecast to get access to private fields + +JvToolEdit: + * TJvCustomComboEdit uses TCustomMaskEditAccessPrivate to get access to private field FSettingCursor Modified: trunk/jvcl/devtools/JvExVCL/src/JvExControls.macros =================================================================== --- trunk/jvcl/devtools/JvExVCL/src/JvExControls.macros 2012-09-19 14:21:04 UTC (rev 13436) +++ trunk/jvcl/devtools/JvExVCL/src/JvExControls.macros 2012-09-24 11:46:58 UTC (rev 13437) @@ -5,7 +5,7 @@ * WARNING: Do not edit this file. * This file is autogenerated from the source in devtools/JvExVCL/src. * If you do it despite this warning your changes will be discarded by the next - * update of this file. Do your changes in the template files. + * update of this file. Make your changes in the template files. ****************************************************************************} {$D-} // do not step into this unit *) Modified: trunk/jvcl/devtools/JvExVCL/src/JvExGrids.pas =================================================================== --- trunk/jvcl/devtools/JvExVCL/src/JvExGrids.pas 2012-09-19 14:21:04 UTC (rev 13436) +++ trunk/jvcl/devtools/JvExVCL/src/JvExGrids.pas 2012-09-24 11:46:58 UTC (rev 13437) @@ -59,6 +59,8 @@ TJvExStringGrid = class(TStringGrid, IJvExControl) WINCONTROL_DECL + protected + property GridState: TGridState read FGridState; end; {$IFDEF UNITVERSIONING} Modified: trunk/jvcl/devtools/JvExVCL/src/JvExMask.pas =================================================================== --- trunk/jvcl/devtools/JvExVCL/src/JvExMask.pas 2012-09-19 14:21:04 UTC (rev 13436) +++ trunk/jvcl/devtools/JvExVCL/src/JvExMask.pas 2012-09-24 11:46:58 UTC (rev 13437) @@ -45,19 +45,52 @@ EDITCONTROL_DECL private FBeepOnError: Boolean; + {$IFNDEF COMPILER12_UP} + FTextHint: string; + procedure SetTextHint(const Value: string); + {$ENDIF ~COMPILER12_UP} + function UserTextHint: Boolean; protected procedure DoBeepOnError; dynamic; procedure SetBeepOnError(Value: Boolean); virtual; property BeepOnError: Boolean read FBeepOnError write SetBeepOnError default True; + + procedure DoSetTextHint(const Value: string); {$IFDEF COMPILER12_UP}override;{$ELSE}virtual;{$ENDIF} + procedure PaintWindow(DC: HDC); override; + procedure WMSetFocus(var Msg: TWMSetFocus); message WM_SETFOCUS; + procedure WMKillFocus(var Msg: TWMKillFocus); message WM_KILLFOCUS; + + {$IFNDEF COMPILER12_UP} + procedure CreateWnd; override; + property TextHint: string read FTextHint write SetTextHint; + {$ENDIF ~COMPILER12_UP} end; TJvExMaskEdit = class(TMaskEdit, IJvExControl) EDITCONTROL_DECL private FBeepOnError: Boolean; + {$IFNDEF COMPILER12_UP} + FTextHint: string; + procedure SetTextHint(const Value: string); + {$ENDIF ~COMPILER12_UP} + function UserTextHint: Boolean; protected procedure DoBeepOnError; dynamic; procedure SetBeepOnError(Value: Boolean); virtual; + + procedure DoSetTextHint(const Value: string); {$IFDEF COMPILER12_UP}override;{$ELSE}virtual;{$ENDIF} + procedure PaintWindow(DC: HDC); override; + procedure WMSetFocus(var Msg: TWMSetFocus); message WM_SETFOCUS; + procedure WMKillFocus(var Msg: TWMKillFocus); message WM_KILLFOCUS; + + {$IFNDEF COMPILER12_UP} + procedure CreateWnd; override; + {$ENDIF ~COMPILER12_UP} + published + {$IFNDEF COMPILER12_UP} + property TextHint: string read FTextHint write SetTextHint; + {$ENDIF ~COMPILER12_UP} property BeepOnError: Boolean read FBeepOnError write SetBeepOnError default True; end; @@ -75,6 +108,8 @@ BEGIN_EDITCONTROL_CONSTRUCTOR(CustomMaskEdit) FBeepOnError := True; + if UserTextHint then + ControlState := ControlState + [csCustomPaint]; // needed for PaintWindow END_CONSTRUCTOR EDITCONTROL_IMPL(CustomMaskEdit) @@ -92,8 +127,88 @@ FBeepOnError := Value; end; +{$IFNDEF COMPILER12_UP} +procedure TJvExCustomMaskEdit.SetTextHint(const Value: string); +begin + if FTextHint <> Value then + begin + FTextHint := Value; + if not (csLoading in ComponentState) then + DoSetTextHint(FTextHint); + end; +end; + +procedure TJvExCustomMaskEdit.CreateWnd; +begin + inherited CreateWnd; + DoSetTextHint(FTextHint); +end; +{$ENDIF ~COMPILER12_UP} + +function TJvExCustomMaskEdit.UserTextHint: Boolean; +begin + {$IFDEF JVCLThemesEnabled} + Result := not (CheckWin32Version(5, 1) and StyleServices.Enabled); + {$ELSE} + Result := True; + {$ENDIF JVCLThemesEnabled} +end; + +procedure TJvExCustomMaskEdit.DoSetTextHint(const Value: string); +begin + {$IFDEF COMPILER12_UP} + inherited DoSetTextHint(Value); + {$ELSE} + {$IFDEF JVCLThemesEnabled} + if CheckWin32Version(5, 1) and StyleServices.Enabled and HandleAllocated then + SendMessage(Handle, EM_SETCUEBANNER, WPARAM(0), LPARAM(PWideChar(UnicodeString(Value)))); + {$ENDIF JVCLThemesEnabled} + {$ENDIF COMPILER12_UP} + if UserTextHint and HandleAllocated and + not Focused and Enabled and not ReadOnly and (Text = '') then + Invalidate; +end; + +procedure TJvExCustomMaskEdit.PaintWindow(DC: HDC); +var + R: TRect; + OldFont: HFONT; + OldTextColor: TColorRef; +begin + inherited PaintWindow(DC); + + if UserTextHint and (TextHint <> '') and + Enabled and not ReadOnly and not Focused and (Text = '') then + begin + SendMessage(Handle, EM_GETRECT, 0, LPARAM(@R)); + + OldFont := SelectObject(DC, Font.Handle); + OldTextColor := SetTextColor(DC, ColorToRGB(clGrayText)); + DrawText(DC, PChar(TextHint), Length(TextHint), R, DT_LEFT or DT_VCENTER or DT_SINGLELINE or DT_NOPREFIX); + + SetTextColor(DC, OldTextColor); + SelectObject(DC, OldFont); + end; +end; + +procedure TJvExCustomMaskEdit.WMKillFocus(var Msg: TWMKillFocus); +begin + inherited; + if UserTextHint and (TextHint <> '') then + Invalidate; +end; + +procedure TJvExCustomMaskEdit.WMSetFocus(var Msg: TWMSetFocus); +begin + if UserTextHint and (TextHint <> '') then + Invalidate; + inherited; +end; + BEGIN_EDITCONTROL_CONSTRUCTOR(MaskEdit) FBeepOnError := True; + if UserTextHint then + ControlState := ControlState + [csCustomPaint]; // needed for PaintWindow END_CONSTRUCTOR EDITCONTROL_IMPL(MaskEdit) @@ -111,6 +226,84 @@ FBeepOnError := Value; end; +{$IFNDEF COMPILER12_UP} +procedure TJvExMaskEdit.SetTextHint(const Value: string); +begin + if FTextHint <> Value then + begin + FTextHint := Value; + if not (csLoading in ComponentState) then + DoSetTextHint(FTextHint); + end; +end; + +procedure TJvExMaskEdit.CreateWnd; +begin + inherited CreateWnd; + DoSetTextHint(FTextHint); +end; +{$ENDIF ~COMPILER12_UP} + +function TJvExMaskEdit.UserTextHint: Boolean; +begin + {$IFDEF JVCLThemesEnabled} + Result := not (CheckWin32Version(5, 1) and StyleServices.Enabled); + {$ELSE} + Result := True; + {$ENDIF JVCLThemesEnabled} +end; + +procedure TJvExMaskEdit.DoSetTextHint(const Value: string); +begin + {$IFDEF COMPILER12_UP} + inherited DoSetTextHint(Value); + {$ELSE} + {$IFDEF JVCLThemesEnabled} + if CheckWin32Version(5, 1) and StyleServices.Enabled and HandleAllocated then + SendMessage(Handle, EM_SETCUEBANNER, WPARAM(0), LPARAM(PWideChar(UnicodeString(Value)))); + {$ENDIF JVCLThemesEnabled} + {$ENDIF COMPILER12_UP} + if UserTextHint and HandleAllocated and + not Focused and Enabled and not ReadOnly and (Text = '') then + Invalidate; +end; + +procedure TJvExMaskEdit.PaintWindow(DC: HDC); +var + R: TRect; + OldFont: HFONT; + OldTextColor: TColorRef; +begin + inherited PaintWindow(DC); + + if UserTextHint and (TextHint <> '') and + Enabled and not ReadOnly and not Focused and (Text = '') then + begin + SendMessage(Handle, EM_GETRECT, 0, LPARAM(@R)); + + OldFont := SelectObject(DC, Font.Handle); + OldTextColor := SetTextColor(DC, ColorToRGB(clGrayText)); + DrawText(DC, PChar(TextHint), Length(TextHint), R, DT_LEFT or DT_VCENTER or DT_SINGLELINE or DT_NOPREFIX); + + SetTextColor(DC, OldTextColor); + SelectObject(DC, OldFont); + end; +end; + +procedure TJvExMaskEdit.WMKillFocus(var Msg: TWMKillFocus); +begin + inherited; + if UserTextHint and (TextHint <> '') then + Invalidate; +end; + +procedure TJvExMaskEdit.WMSetFocus(var Msg: TWMSetFocus); +begin + if UserTextHint and (TextHint <> '') then + Invalidate; + inherited; +end; + {$IFDEF UNITVERSIONING} initialization RegisterUnitVersion(HInstance, UnitVersioning); Modified: trunk/jvcl/devtools/JvExVCL/src/JvExStdCtrls.pas =================================================================== --- trunk/jvcl/devtools/JvExVCL/src/JvExStdCtrls.pas 2012-09-19 14:21:04 UTC (rev 13436) +++ trunk/jvcl/devtools/JvExVCL/src/JvExStdCtrls.pas 2012-09-24 11:46:58 UTC (rev 13437) @@ -51,14 +51,49 @@ {$UNDEF HASAUTOSIZE} - EDITCONTROL_DECL_DEFAULT(CustomEdit) + TJvExCustomEdit = class(TCustomEdit, IJvExControl) + EDITCONTROL_DECL + private + {$IFNDEF COMPILER12_UP} + FTextHint: string; + procedure SetTextHint(const Value: string); + {$ENDIF ~COMPILER12_UP} + function UserTextHint: Boolean; + protected + procedure DoSetTextHint(const Value: string); {$IFDEF COMPILER12_UP}override;{$ELSE}virtual;{$ENDIF} + procedure PaintWindow(DC: HDC); override; + procedure WMSetFocus(var Msg: TWMSetFocus); message WM_SETFOCUS; + procedure WMKillFocus(var Msg: TWMKillFocus); message WM_KILLFOCUS; + {$IFNDEF COMPILER12_UP} + procedure CreateWnd; override; + property TextHint: string read FTextHint write SetTextHint; + {$ENDIF ~COMPILER12_UP} + end; + EDITCONTROL_DECL_DEFAULT(CustomMemo) WINCONTROL_DECL_DEFAULT(CustomCombo) - WINCONTROL_DECL_DEFAULT(CustomComboBox) + TJvExCustomComboBox = class(TCustomComboBox, IJvExControl) + WINCONTROL_DECL + private + {$IFNDEF COMPILER12_UP} + FTextHint: string; + procedure SetTextHint(const Value: string); + {$ENDIF ~COMPILER12_UP} + function UserTextHint: Boolean; + function IsEditReadOnly: Boolean; + protected + procedure DoSetTextHint; {$IFDEF COMPILER12_UP}override;{$ELSE}virtual;{$ENDIF} + procedure ComboWndProc(var Message: TMessage; ComboWnd: HWND; ComboProc: Pointer); override; + {$IFNDEF COMPILER12_UP} + procedure CreateWnd; override; + property TextHint: string read FTextHint write SetTextHint; + {$ENDIF ~COMPILER12_UP} + end; + WINCONTROL_DECL_DEFAULT(ButtonControl) WINCONTROL_DECL_DEFAULT(Button) @@ -91,6 +126,18 @@ implementation +{$IFNDEF COMPILER12_UP} +const + ECM_FIRST = $1500; + EM_SETCUEBANNER = ECM_FIRST + 1; // Set the cue banner with the lParam = LPCWSTR + + CBM_FIRST = $1700; + CB_SETCUEBANNER = CBM_FIRST + 3; + +type + UnicodeString = WideString; +{$ENDIF ~COMPILER12_UP} + WINCONTROL_IMPL_DEFAULT(CustomGroupBox) {$DEFINE HASAUTOSIZE} @@ -101,14 +148,220 @@ {$UNDEF HASAUTOSIZE} -EDITCONTROL_IMPL_DEFAULT(CustomEdit) +BEGIN_EDITCONTROL_CONSTRUCTOR(CustomEdit) + if UserTextHint then + ControlState := ControlState + [csCustomPaint]; // needed for PaintWindow +END_CONSTRUCTOR +EDITCONTROL_IMPL(CustomEdit) + +EDITCONTROL_WNDPROC(CustomEdit) + +{$IFNDEF COMPILER12_UP} +procedure TJvExCustomEdit.SetTextHint(const Value: string); +begin + if FTextHint <> Value then + begin + FTextHint := Value; + if not (csLoading in ComponentState) then + DoSetTextHint(FTextHint); + end; +end; + +procedure TJvExCustomEdit.CreateWnd; +begin + inherited CreateWnd; + DoSetTextHint(FTextHint); +end; +{$ENDIF ~COMPILER12_UP} + +function TJvExCustomEdit.UserTextHint: Boolean; +begin + {$IFDEF JVCLThemesEnabled} + Result := not (CheckWin32Version(5, 1) and StyleServices.Enabled); + {$ELSE} + Result := True; + {$ENDIF JVCLThemesEnabled} +end; + +procedure TJvExCustomEdit.DoSetTextHint(const Value: string); +begin + {$IFDEF COMPILER12_UP} + inherited DoSetTextHint(Value); + {$ELSE} + {$IFDEF JVCLThemesEnabled} + if CheckWin32Version(5, 1) and StyleServices.Enabled and HandleAllocated then + SendMessage(Handle, EM_SETCUEBANNER, WPARAM(0), LPARAM(PWideChar(UnicodeString(Value)))); + {$ENDIF JVCLThemesEnabled} + {$ENDIF COMPILER12_UP} + if UserTextHint and HandleAllocated and + not Focused and Enabled and not ReadOnly and (Text = '') then + Invalidate; +end; + +procedure TJvExCustomEdit.PaintWindow(DC: HDC); +var + R: TRect; + OldFont: HFONT; + OldTextColor: TColorRef; +begin + inherited PaintWindow(DC); + + if UserTextHint and (TextHint <> '') and + Enabled and not ReadOnly and not Focused and (Text = '') then + begin + SendMessage(Handle, EM_GETRECT, 0, LPARAM(@R)); + + OldFont := SelectObject(DC, Font.Handle); + OldTextColor := SetTextColor(DC, ColorToRGB(clGrayText)); + DrawText(DC, PChar(TextHint), Length(TextHint), R, DT_LEFT or DT_VCENTER or DT_SINGLELINE or DT_NOPREFIX); + + SetTextColor(DC, OldTextColor); + SelectObject(DC, OldFont); + end; +end; + +procedure TJvExCustomEdit.WMKillFocus(var Msg: TWMKillFocus); +begin + inherited; + if UserTextHint and (TextHint <> '') then + Invalidate; +end; + +procedure TJvExCustomEdit.WMSetFocus(var Msg: TWMSetFocus); +begin + if UserTextHint and (TextHint <> '') then + Invalidate; + inherited; +end; + EDITCONTROL_IMPL_DEFAULT(CustomMemo) WINCONTROL_IMPL_DEFAULT(CustomCombo) -WINCONTROL_IMPL_DEFAULT(CustomComboBox) +BEGIN_WINCONTROL_CONSTRUCTOR(CustomComboBox) + if UserTextHint then + ControlState := ControlState + [csCustomPaint]; // needed for PaintWindow +END_CONSTRUCTOR +WINCONTROL_IMPL(CustomComboBox) + +WINCONTROL_WNDPROC(CustomComboBox) + +{$IFNDEF COMPILER12_UP} +procedure TJvExCustomComboBox.SetTextHint(const Value: string); +begin + if FTextHint <> Value then + begin + FTextHint := Value; + if not (csLoading in ComponentState) then + DoSetTextHint; + end; +end; + +procedure TJvExCustomComboBox.CreateWnd; +begin + inherited CreateWnd; + DoSetTextHint; +end; +{$ENDIF ~COMPILER12_UP} + +function TJvExCustomComboBox.UserTextHint: Boolean; +begin + {$IFDEF JVCLThemesEnabled} + Result := not (CheckWin32Version(5, 1) and StyleServices.Enabled); + {$ELSE} + Result := True; + {$ENDIF JVCLThemesEnabled} +end; + +function TJvExCustomComboBox.IsEditReadOnly: Boolean; +begin + Result := HandleAllocated and (GetWindowLong(FEditHandle, GWL_STYLE) and ES_READONLY <> 0); +end; + +procedure TJvExCustomComboBox.DoSetTextHint; +begin + {$IFDEF COMPILER12_UP} + inherited DoSetTextHint; + {$ELSE} + {$IFDEF JVCLThemesEnabled} + if StyleServices.Enabled and HandleAllocated then + begin + if CheckWin32Version(6) then + SendMessage(Handle, CB_SETCUEBANNER, WPARAM(0), LPARAM(PWideChar(UnicodeString(FTextHint)))) + else if CheckWin32Version(5, 1) then + SendMessage(FEditHandle, EM_SETCUEBANNER, WPARAM(0), LPARAM(PWideChar(UnicodeString(FTextHint)))); + end; + {$ENDIF JVCLThemesEnabled} + {$ENDIF COMPILER12_UP} + if UserTextHint and HandleAllocated and + not Focused and Enabled and not IsEditReadOnly and (Text = '') then + Invalidate; +end; + +procedure TJvExCustomComboBox.ComboWndProc(var Message: TMessage; ComboWnd: HWND; ComboProc: Pointer); + + procedure EditPaintWindow(DC: HDC); + var + R: TRect; + OldFont: HFONT; + OldTextColor: TColorRef; + begin + if UserTextHint and (TextHint <> '') and + Enabled and not IsEditReadOnly and not Focused and (Text = '') then + begin + SendMessage(FEditHandle, EM_GETRECT, 0, LPARAM(@R)); + + OldFont := SelectObject(DC, Font.Handle); + OldTextColor := SetTextColor(DC, ColorToRGB(clGrayText)); + DrawText(DC, PChar(TextHint), Length(TextHint), R, DT_LEFT or DT_VCENTER or DT_SINGLELINE or DT_NOPREFIX); + + SetTextColor(DC, OldTextColor); + SelectObject(DC, OldFont); + end; + end; + +var + DC: HDC; + PaintStruct: TPaintStruct; +begin + DC := 0; + try + if (ComboWnd = FEditHandle) and UserTextHint and (Message.Msg = WM_PAINT) then + begin + if TWMPaint(Message).DC = 0 then + begin + DC := BeginPaint(ComboWnd, PaintStruct); + TWMPaint(Message).DC := DC; + end; + end; + + inherited ComboWndProc(Message, ComboWnd, ComboProc); + + if ComboWnd = FEditHandle then + begin + case Message.Msg of + WM_PAINT: + EditPaintWindow(DC); + + WM_PRINTCLIENT: + EditPaintWindow(HDC(Message.WParam)); + + WM_KILLFOCUS, WM_SETFOCUS: + if UserTextHint and (TextHint <> '') then + Invalidate; + end; + end; + finally + if DC <> 0 then + begin + EndPaint(ComboWnd, PaintStruct); + TWMPaint(Message).DC := 0; + end; + end; +end; + WINCONTROL_IMPL_DEFAULT(ButtonControl) WINCONTROL_IMPL_DEFAULT(Button) Modified: trunk/jvcl/run/JvBaseEdits.pas =================================================================== --- trunk/jvcl/run/JvBaseEdits.pas 2012-09-19 14:21:04 UTC (rev 13436) +++ trunk/jvcl/run/JvBaseEdits.pas 2012-09-24 11:46:58 UTC (rev 13437) @@ -203,6 +203,11 @@ property OnMouseMove; property OnMouseUp; property OnStartDrag; + + {$IFDEF COMPILER14_UP} + property Touch; + {$ENDIF COMPILER14_UP} + property TextHint; end; TJvCustomCalcEdit = class(TJvCustomNumEdit) @@ -281,12 +286,10 @@ property Value; property Visible; property ZeroEmpty; - (* ++ RDB ++ *) property ClipboardCommands; property DisabledTextColor; property DisabledColor; - (* -- RDB -- *) - property DecimalPlacesAlwaysShown; {WAP Added.} + property DecimalPlacesAlwaysShown; property OnButtonClick; property OnChange; property OnClick; @@ -306,6 +309,11 @@ property OnStartDrag; property OnPopupHidden; property OnPopupShown; + + {$IFDEF COMPILER14_UP} + property Touch; + {$ENDIF COMPILER14_UP} + property TextHint; end; {$IFDEF UNITVERSIONING} Modified: trunk/jvcl/run/JvCombobox.pas =================================================================== --- trunk/jvcl/run/JvCombobox.pas 2012-09-19 14:21:04 UTC (rev 13436) +++ trunk/jvcl/run/JvCombobox.pas 2012-09-24 11:46:58 UTC (rev 13437) @@ -396,6 +396,11 @@ property OnMouseEnter; property OnMouseLeave; property OnParentColorChange; + + {$IFDEF COMPILER14_UP} + property Touch; + {$ENDIF COMPILER14_UP} + property TextHint; end; {$IFDEF UNITVERSIONING} Modified: trunk/jvcl/run/JvDBControls.pas =================================================================== --- trunk/jvcl/run/JvDBControls.pas 2012-09-19 14:21:04 UTC (rev 13436) +++ trunk/jvcl/run/JvDBControls.pas 2012-09-24 11:46:58 UTC (rev 13437) @@ -297,11 +297,14 @@ property OnContextPopup; property OnEndDock; property OnStartDock; - (* ++ RDB ++ *) property ClipboardCommands; property DisabledTextColor; property DisabledColor; - (* -- RDB -- *) + + {$IFDEF COMPILER14_UP} + property Touch; + {$ENDIF COMPILER14_UP} + property TextHint; end; {$IFDEF RTL230_UP} Modified: trunk/jvcl/run/JvDBLookup.pas =================================================================== --- trunk/jvcl/run/JvDBLookup.pas 2012-09-19 14:21:04 UTC (rev 13436) +++ trunk/jvcl/run/JvDBLookup.pas 2012-09-24 11:46:58 UTC (rev 13437) @@ -667,6 +667,11 @@ property OnContextPopup; property OnEndDock; property OnStartDock; + + {$IFDEF COMPILER14_UP} + property Touch; + {$ENDIF COMPILER14_UP} + property TextHint; end; Modified: trunk/jvcl/run/JvDBSearchEdit.pas =================================================================== --- trunk/jvcl/run/JvDBSearchEdit.pas 2012-09-19 14:21:04 UTC (rev 13436) +++ trunk/jvcl/run/JvDBSearchEdit.pas 2012-09-24 11:46:58 UTC (rev 13437) @@ -136,6 +136,11 @@ property OnMouseEnter; property OnMouseLeave; property OnParentColorChange; + + {$IFDEF COMPILER12_UP} + property NumbersOnly; + {$ENDIF} + property TextHint; end; {$IFDEF UNITVERSIONING} Modified: trunk/jvcl/run/JvEdit.pas =================================================================== --- trunk/jvcl/run/JvEdit.pas 2012-09-19 14:21:04 UTC (rev 13436) +++ trunk/jvcl/run/JvEdit.pas 2012-09-24 11:46:58 UTC (rev 13437) @@ -262,6 +262,14 @@ property OnStartDrag; property DataConnector; + + {$IFDEF COMPILER12_UP} + property NumbersOnly; + {$ENDIF} + {$IFDEF COMPILER14_UP} + property Touch; + {$ENDIF COMPILER14_UP} + property TextHint; end; {$IFDEF UNITVERSIONING} Modified: trunk/jvcl/run/JvExButtons.pas =================================================================== --- trunk/jvcl/run/JvExButtons.pas 2012-09-19 14:21:04 UTC (rev 13436) +++ trunk/jvcl/run/JvExButtons.pas 2012-09-24 11:46:58 UTC (rev 13437) @@ -32,7 +32,7 @@ * WARNING: Do not edit this file. * This file is autogenerated from the source in devtools/JvExVCL/src. * If you do it despite this warning your changes will be discarded by the next - * update of this file. Do your changes in the template files. + * update of this file. Make your changes in the template files. ****************************************************************************} {$D-} // do not step into this unit Modified: trunk/jvcl/run/JvExCheckLst.pas =================================================================== --- trunk/jvcl/run/JvExCheckLst.pas 2012-09-19 14:21:04 UTC (rev 13436) +++ trunk/jvcl/run/JvExCheckLst.pas 2012-09-24 11:46:58 UTC (rev 13437) @@ -32,7 +32,7 @@ * WARNING: Do not edit this file. * This file is autogenerated from the source in devtools/JvExVCL/src. * If you do it despite this warning your changes will be discarded by the next - * update of this file. Do your changes in the template files. + * update of this file. Make your changes in the template files. ****************************************************************************} {$D-} // do not step into this unit Modified: trunk/jvcl/run/JvExComCtrls.pas =================================================================== --- trunk/jvcl/run/JvExComCtrls.pas 2012-09-19 14:21:04 UTC (rev 13436) +++ trunk/jvcl/run/JvExComCtrls.pas 2012-09-24 11:46:58 UTC (rev 13437) @@ -32,7 +32,7 @@ * WARNING: Do not edit this file. * This file is autogenerated from the source in devtools/JvExVCL/src. * If you do it despite this warning your changes will be discarded by the next - * update of this file. Do your changes in the template files. + * update of this file. Make your changes in the template files. ****************************************************************************} {$D-} // do not step into this unit Modified: trunk/jvcl/run/JvExControls.pas =================================================================== --- trunk/jvcl/run/JvExControls.pas 2012-09-19 14:21:04 UTC (rev 13436) +++ trunk/jvcl/run/JvExControls.pas 2012-09-24 11:46:58 UTC (rev 13437) @@ -32,7 +32,7 @@ * WARNING: Do not edit this file. * This file is autogenerated from the source in devtools/JvExVCL/src. * If you do it despite this warning your changes will be discarded by the next - * update of this file. Do your changes in the template files. + * update of this file. Make your changes in the template files. ****************************************************************************} {$D-} // do not step into this unit Modified: trunk/jvcl/run/JvExDBGrids.pas =================================================================== --- trunk/jvcl/run/JvExDBGrids.pas 2012-09-19 14:21:04 UTC (rev 13436) +++ trunk/jvcl/run/JvExDBGrids.pas 2012-09-24 11:46:58 UTC (rev 13437) @@ -32,7 +32,7 @@ * WARNING: Do not edit this file. * This file is autogenerated from the source in devtools/JvExVCL/src. * If you do it despite this warning your changes will be discarded by the next - * update of this file. Do your changes in the template files. + * update of this file. Make your changes in the template files. ****************************************************************************} {$D-} // do not step into this unit Modified: trunk/jvcl/run/JvExExtCtrls.pas =================================================================== --- trunk/jvcl/run/JvExExtCtrls.pas 2012-09-19 14:21:04 UTC (rev 13436) +++ trunk/jvcl/run/JvExExtCtrls.pas 2012-09-24 11:46:58 UTC (rev 13437) @@ -32,7 +32,7 @@ * WARNING: Do not edit this file. * This file is autogenerated from the source in devtools/JvExVCL/src. * If you do it despite this warning your changes will be discarded by the next - * update of this file. Do your changes in the template files. + * update of this file. Make your changes in the template files. ****************************************************************************} {$D-} // do not step into this unit Modified: trunk/jvcl/run/JvExForms.pas =================================================================== --- trunk/jvcl/run/JvExForms.pas 2012-09-19 14:21:04 UTC (rev 13436) +++ trunk/jvcl/run/JvExForms.pas 2012-09-24 11:46:58 UTC (rev 13437) @@ -32,7 +32,7 @@ * WARNING: Do not edit this file. * This file is autogenerated from the source in devtools/JvExVCL/src. * If you do it despite this warning your changes will be discarded by the next - * update of this file. Do your changes in the template files. + * update of this file. Make your changes in the template files. ****************************************************************************} {$D-} // do not step into this unit Modified: trunk/jvcl/run/JvExGrids.pas =================================================================== --- trunk/jvcl/run/JvExGrids.pas 2012-09-19 14:21:04 UTC (rev 13436) +++ trunk/jvcl/run/JvExGrids.pas 2012-09-24 11:46:58 UTC (rev 13437) @@ -32,7 +32,7 @@ * WARNING: Do not edit this file. * This file is autogenerated from the source in devtools/JvExVCL/src. * If you do it despite this warning your changes will be discarded by the next - * update of this file. Do your changes in the template files. + * update of this file. Make your changes in the template files. ****************************************************************************} {$D-} // do not step into this unit @@ -398,7 +398,6 @@ procedure MouseLeave(AControl: TControl); reintroduce; dynamic; property MouseOver: Boolean read FMouseOver write FMouseOver; property HintColor: TColor read FHintColor write FHintColor default clDefault; - property GridState: TGridState read FGridState; property OnMouseEnter: TNotifyEvent read FOnMouseEnter write FOnMouseEnter; property OnMouseLeave: TNotifyEvent read FOnMouseLeave write FOnMouseLeave; property OnParentColorChange: TNotifyEvent read FOnParentColorChanged write FOnParentColorChanged; @@ -429,6 +428,8 @@ {$ENDIF JVCLThemesEnabledD6} published property DotNetHighlighting: Boolean read FDotNetHighlighting write FDotNetHighlighting default False; + protected + property GridState: TGridState read FGridState; end; {$IFDEF UNITVERSIONING} Modified: trunk/jvcl/run/JvExMask.pas =================================================================== --- trunk/jvcl/run/JvExMask.pas 2012-09-19 14:21:04 UTC (rev 13436) +++ trunk/jvcl/run/JvExMask.pas 2012-09-24 11:46:58 UTC (rev 13437) @@ -32,7 +32,7 @@ * WARNING: Do not edit this file. * This file is autogenerated from the source in devtools/JvExVCL/src. * If you do it despite this warning your changes will be discarded by the next - * update of this file. Do your changes in the template files. + * update of this file. Make your changes in the template files. ****************************************************************************} {$D-} // do not step into this unit @@ -114,10 +114,25 @@ property ClipboardCommands: TJvClipboardCommands read FClipboardCommands write SetClipboardCommands default [caCopy..caUndo]; private FBeepOnError: Boolean; + {$IFNDEF COMPILER12_UP} + FTextHint: string; + procedure SetTextHint(const Value: string); + {$ENDIF ~COMPILER12_UP} + function UserTextHint: Boolean; protected procedure DoBeepOnError; dynamic; procedure SetBeepOnError(Value: Boolean); virtual; property BeepOnError: Boolean read FBeepOnError write SetBeepOnError default True; + + procedure DoSetTextHint(const Value: string); {$IFDEF COMPILER12_UP}override;{$ELSE}virtual;{$ENDIF} + procedure PaintWindow(DC: HDC); override; + procedure WMSetFocus(var Msg: TWMSetFocus); message WM_SETFOCUS; + procedure WMKillFocus(var Msg: TWMKillFocus); message WM_KILLFOCUS; + + {$IFNDEF COMPILER12_UP} + procedure CreateWnd; override; + property TextHint: string read FTextHint write SetTextHint; + {$ENDIF ~COMPILER12_UP} end; TJvExMaskEdit = class(TMaskEdit, IJvExControl) @@ -187,9 +202,27 @@ property ClipboardCommands: TJvClipboardCommands read FClipboardCommands write SetClipboardCommands default [caCopy..caUndo]; private FBeepOnError: Boolean; + {$IFNDEF COMPILER12_UP} + FTextHint: string; + procedure SetTextHint(const Value: string); + {$ENDIF ~COMPILER12_UP} + function UserTextHint: Boolean; protected procedure DoBeepOnError; dynamic; procedure SetBeepOnError(Value: Boolean); virtual; + + procedure DoSetTextHint(const Value: string); {$IFDEF COMPILER12_UP}override;{$ELSE}virtual;{$ENDIF} + procedure PaintWindow(DC: HDC); override; + procedure WMSetFocus(var Msg: TWMSetFocus); message WM_SETFOCUS; + procedure WMKillFocus(var Msg: TWMKillFocus); message WM_KILLFOCUS; + + {$IFNDEF COMPILER12_UP} + procedure CreateWnd; override; + {$ENDIF ~COMPILER12_UP} + published + {$IFNDEF COMPILER12_UP} + property TextHint: string read FTextHint write SetTextHint; + {$ENDIF ~COMPILER12_UP} property BeepOnError: Boolean read FBeepOnError write SetBeepOnError default True; end; @@ -211,6 +244,8 @@ FHintColor := clDefault; FClipboardCommands := [caCopy..caUndo]; FBeepOnError := True; + if UserTextHint then + ControlState := ControlState + [csCustomPaint]; // needed for PaintWindow end; function TJvExCustomMaskEdit.BaseWndProc(Msg: Cardinal; WParam: WPARAM = 0; LParam: LPARAM = 0): LRESULT; @@ -535,12 +570,92 @@ FBeepOnError := Value; end; +{$IFNDEF COMPILER12_UP} +procedure TJvExCustomMaskEdit.SetTextHint(const Value: string); +begin + if FTextHint <> Value then + begin + FTextHint := Value; + if not (csLoading in ComponentState) then + DoSetTextHint(FTextHint); + end; +end; + +procedure TJvExCustomMaskEdit.CreateWnd; +begin + inherited CreateWnd; + DoSetTextHint(FTextHint); +end; +{$ENDIF ~COMPILER12_UP} + +function TJvExCustomMaskEdit.UserTextHint: Boolean; +begin + {$IFDEF JVCLThemesEnabled} + Result := not (CheckWin32Version(5, 1) and StyleServices.Enabled); + {$ELSE} + Result := True; + {$ENDIF JVCLThemesEnabled} +end; + +procedure TJvExCustomMaskEdit.DoSetTextHint(const Value: string); +begin + {$IFDEF COMPILER12_UP} + inherited DoSetTextHint(Value); + {$ELSE} + {$IFDEF JVCLThemesEnabled} + if CheckWin32Version(5, 1) and StyleServices.Enabled and HandleAllocated then + SendMessage(Handle, EM_SETCUEBANNER, WPARAM(0), LPARAM(PWideChar(UnicodeString(Value)))); + {$ENDIF JVCLThemesEnabled} + {$ENDIF COMPILER12_UP} + if UserTextHint and HandleAllocated and + not Focused and Enabled and not ReadOnly and (Text = '') then + Invalidate; +end; + +procedure TJvExCustomMaskEdit.PaintWindow(DC: HDC); +var + R: TRect; + OldFont: HFONT; + OldTextColor: TColorRef; +begin + inherited PaintWindow(DC); + + if UserTextHint and (TextHint <> '') and + Enabled and not ReadOnly and not Focused and (Text = '') then + begin + SendMessage(Handle, EM_GETRECT, 0, LPARAM(@R)); + + OldFont := SelectObject(DC, Font.Handle); + OldTextColor := SetTextColor(DC, ColorToRGB(clGrayText)); + DrawText(DC, PChar(TextHint), Length(TextHint), R, DT_LEFT or DT_VCENTER or DT_SINGLELINE or DT_NOPREFIX); + + SetTextColor(DC, OldTextColor); + SelectObject(DC, OldFont); + end; +end; + +procedure TJvExCustomMaskEdit.WMKillFocus(var Msg: TWMKillFocus); +begin + inherited; + if UserTextHint and (TextHint <> '') then + Invalidate; +end; + +procedure TJvExCustomMaskEdit.WMSetFocus(var Msg: TWMSetFocus); +begin + if UserTextHint and (TextHint <> '') then + Invalidate; + inherited; +end; + constructor TJvExMaskEdit.Create(AOwner: TComponent); begin inherited Create(AOwner); FHintColor := clDefault; FClipboardCommands := [caCopy..caUndo]; FBeepOnError := True; + if UserTextHint then + ControlState := ControlState + [csCustomPaint]; // needed for PaintWindow end; function TJvExMaskEdit.BaseWndProc(Msg: Cardinal; WParam: WPARAM = 0; LParam: LPARAM = 0): LRESULT; @@ -865,6 +980,84 @@ FBeepOnError := Value; end; +{$IFNDEF COMPILER12_UP} +procedure TJvExMaskEdit.SetTextHint(const Value: string); +begin + if FTextHint <> Value then + begin + FTextHint := Value; + if not (csLoading in ComponentState) then + DoSetTextHint(FTextHint); + end; +end; + +procedure TJvExMaskEdit.CreateWnd; +begin + inherited CreateWnd; + DoSetTextHint(FTextHint); +end; +{$ENDIF ~COMPILER12_UP} + +function TJvExMaskEdit.UserTextHint: Boolean; +begin + {$IFDEF JVCLThemesEnabled} + Result := not (CheckWin32Version(5, 1) and StyleServices.Enabled); + {$ELSE} + Result := True; + {$ENDIF JVCLThemesEnabled} +end; + +procedure TJvExMaskEdit.DoSetTextHint(const Value: string); +begin + {$IFDEF COMPILER12_UP} + inherited DoSetTextHint(Value); + {$ELSE} + {$IFDEF JVCLThemesEnabled} + if CheckWin32Version(5, 1) and StyleServices.Enabled and HandleAllocated then + SendMessage(Handle, EM_SETCUEBANNER, WPARAM(0), LPARAM(PWideChar(UnicodeString(Value)))); + {$ENDIF JVCLThemesEnabled} + {$ENDIF COMPILER12_UP} + if UserTextHint and HandleAllocated and + not Focused and Enabled and not ReadOnly and (Text = '') then + Invalidate; +end; + +procedure TJvExMaskEdit.PaintWindow(DC: HDC); +var + R: TRect; + OldFont: HFONT; + OldTextColor: TColorRef; +begin + inherited PaintWindow(DC); + + if UserTextHint and (TextHint <> '') and + Enabled and not ReadOnly and not Focused and (Text = '') then + begin + SendMessage(Handle, EM_GETRECT, 0, LPARAM(@R)); + + OldFont := SelectObject(DC, Font.Handle); + OldTextColor := SetTextColor(DC, ColorToRGB(clGrayText)); + DrawText(DC, PChar(TextHint), Length(TextHint), R, DT_LEFT or DT_VCENTER or DT_SINGLELINE or DT_NOPREFIX); + + SetTextColor(DC, OldTextColor); + SelectObject(DC, OldFont); + end; +end; + +procedure TJvExMaskEdit.WMKillFocus(var Msg: TWMKillFocus); +begin + inherited; + if UserTextHint and (TextHint <> '') then + Invalidate; +end; + +procedure TJvExMaskEdit.WMSetFocus(var Msg: TWMSetFocus); +begin + if UserTextHint and (TextHint <> '') then + Invalidate; + inherited; +end; + {$IFDEF UNITVERSIONING} initialization RegisterUnitVersion(HInstance, UnitVersioning); Modified: trunk/jvcl/run/JvExStdCtrls.pas =================================================================== --- trunk/jvcl/run/JvExStdCtrls.pas 2012-09-19 14:21:04 UTC (rev 13436) +++ trunk/jvcl/run/JvExStdCtrls.pas 2012-09-24 11:46:58 UTC (rev 13437) @@ -32,7 +32,7 @@ * WARNING: Do not edit this file. * This file is autogenerated from the source in devtools/JvExVCL/src. * If you do it despite this warning your changes will be discarded by the next - * update of this file. Do your changes in the template files. + * update of this file. Make your changes in the template files. ****************************************************************************} {$D-} // do not step into this unit @@ -258,6 +258,22 @@ protected procedure SetClipboardCommands(const Value: TJvClipboardCommands); virtual; property ClipboardCommands: TJvClipboardCommands read FClipboardCommands write SetClipboardCommands default [caCopy..caUndo]; + private + {$IFNDEF COMPILER12_UP} + FTextHint: string; + procedure SetTextHint(const Value: string); + {$ENDIF ~COMPILER12_UP} + function UserTextHint: Boolean; + protected + procedure DoSetTextHint(const Value: string); {$IFDEF COMPILER12_UP}override;{$ELSE}virtual;{$ENDIF} + procedure PaintWindow(DC: HDC); override; + procedure WMSetFocus(var Msg: TWMSetFocus); message WM_SETFOCUS; + procedure WMKillFocus(var Msg: TWMKillFocus); message WM_KILLFOCUS; + + {$IFNDEF COMPILER12_UP} + procedure CreateWnd; override; + property TextHint: string read FTextHint write SetTextHint; + {$ENDIF ~COMPILER12_UP} end; TJvExCustomMemo = class(TCustomMemo, IJvExControl) @@ -449,6 +465,21 @@ {$ENDIF JVCLThemesEnabledD6} published property DotNetHighlighting: Boolean read FDotNetHighlighting write FDotNetHighlighting default False; + private + {$IFNDEF COMPILER12_UP} + FTextHint: string; + procedure SetTextHint(const Value: string); + {$ENDIF ~COMPILER12_UP} + function UserTextHint: Boolean; + function IsEditReadOnly: Boolean; + protected + procedure DoSetTextHint; {$IFDEF COMPILER12_UP}override;{$ELSE}virtual;{$ENDIF} + procedure ComboWndProc(var Message: TMessage; ComboWnd: HWND; ComboProc: Pointer); override; + + {$IFNDEF COMPILER12_UP} + procedure CreateWnd; override; + property TextHint: string read FTextHint write SetTextHint; + {$ENDIF ~COMPILER12_UP} end; TJvExButtonControl = class(TButtonControl, IJvExControl) @@ -1083,6 +1114,18 @@ implementation +{$IFNDEF COMPILER12_UP} +const + ECM_FIRST = $1500; + EM_SETCUEBANNER = ECM_FIRST + 1; // Set the cue banner with the lParam = LPCWSTR + + CBM_FIRST = $1700; + CB_SETCUEBANNER = CBM_FIRST + 3; + +type + UnicodeString = WideString; +{$ENDIF ~COMPILER12_UP} + constructor TJvExCustomGroupBox.Create(AOwner: TComponent); begin inherited Create(AOwner); @@ -1681,6 +1724,8 @@ inherited Create(AOwner); FHintColor := clDefault; FClipboardCommands := [caCopy..caUndo]; + if UserTextHint then + ControlState := ControlState + [csCustomPaint]; // needed for PaintWindow end; function TJvExCustomEdit.BaseWndProc(Msg: Cardinal; WParam: WPARAM = 0; LParam: LPARAM = 0): LRESULT; @@ -1994,8 +2039,84 @@ end; end; -//============================================================================ +{$IFNDEF COMPILER12_UP} +procedure TJvExCustomEdit.SetTextHint(const Value: string); +begin + if FTextHint <> Value then + begin + FTextHint := Value; + if not (csLoading in ComponentState) then + DoSetTextHint(FTextHint); + end; +end; +procedure TJvExCustomEdit.CreateWnd; +begin + inherited CreateWnd; + DoSetTextHint(FTextHint); +end; +{$ENDIF ~COMPILER12_UP} + +function TJvExCustomEdit.UserTextHint: Boolean; +begin + {$IFDEF JVCLThemesEnabled} + Result := not (CheckWin32Version(5, 1) and StyleServices.Enabled); + {$ELSE} + Result := True; + {$ENDIF JVCLThemesEnabled} +end; + +procedure TJvExCustomEdit.DoSetTextHint(const Value: string); +begin + {$IFDEF COMPILER12_UP} + inherited DoSetTextHint(Value); + {$ELSE} + {$IFDEF JVCLThemesEnabled} + if CheckWin32Version(5, 1) and StyleServices.Enabled and HandleAllocated then + SendMessage(Handle, EM_SETCUEBANNER, WPARAM(0), LPARAM(PWideChar(UnicodeString(Value)))); + {$ENDIF JVCLThemesEnabled} + {$ENDIF COMPILER12_UP} + if UserTextHint and HandleAllocated and + not Focused and Enabled and not ReadOnly and (Text = '') then + Invalidate; +end; + +procedure TJvExCustomEdit.PaintWindow(DC: HDC); +var + R: TRect; + OldFont: HFONT; + OldTextColor: TColorRef; +begin + inherited PaintWindow(DC); + + if UserTextHint and (TextHint <> '') and + Enabled and not ReadOnly and not Focused and (Text = '') then + begin + SendMessage(Handle, EM_GETRECT, 0, LPARAM(@R)); + + OldFont := SelectObject(DC, Font.Handle); + OldTextColor := SetTextColor(DC, ColorToRGB(clGrayText)); + DrawText(DC, PChar(TextHint), Length(TextHint), R, DT_LEFT or DT_VCENTER or DT_SINGLELINE or DT_NOPREFIX); + + SetTextColor(DC, OldTextColor); + SelectObject(DC, OldFont); + end; +end; + +procedure TJvExCustomEdit.WMKillFocus(var Msg: TWMKillFocus); +begin + inherited; + if UserTextHint and (TextHint <> '') then + Invalidate; +end; + +procedure TJvExCustomEdit.WMSetFocus(var Msg: TWMSetFocus); +begin + if UserTextHint and (TextHint <> '') then + Invalidate; + inherited; +end; + constructor TJvExCustomMemo.Create(AOwner: TComponent); begin inherited Create(AOwner); @@ -2609,6 +2730,8 @@ begin inherited Create(AOwner); FHintColor := clDefault; + if UserTextHint then + ControlState := ControlState + [csCustomPaint]; // needed for PaintWindow end; function TJvExCustomComboBox.BaseWndProc(Msg: Cardinal; WParam: WPARAM = 0; LParam: LPARAM = 0): LRESULT; @@ -2892,8 +3015,120 @@ end; end; -//============================================================================ +{$IFNDEF COMPILER12_UP} +procedure TJvExCustomComboBox.SetTextHint(const Value: string); +begin + if FTextHint <> Value then + begin + FTextHint := Value; + if not (csLoading in ComponentState) then + DoSetTextHint; + end; +end; +procedure TJvExCustomComboBox.CreateWnd; +begin + inherited CreateWnd; + DoSetTextHint; +end; +{$ENDIF ~COMPILER12_UP} + +function TJvExCustomComboBox.UserTextHint: Boolean; +begin + {$IFDEF JVCLThemesEnabled} + Result := not (CheckWin32Version(5, 1) and StyleServices.Enabled); + {$ELSE} + Result := True; + {$ENDIF JVCLThemesEnabled} +end; + +function TJvExCustomComboBox.IsEditReadOnly: Boolean; +begin + Result := HandleAllocated and (GetWindowLong(FEditHandle, GWL_STYLE) and ES_READONLY <> 0); +end; + +procedure TJvExCustomComboBox.DoSetTextHint; +begin + {$IFDEF COMPILER12_UP} + inherited DoSetTextHint; + {$ELSE} + {$IFDEF JVCLThemesEnabled} + if StyleServices.Enabled and HandleAllocated then + begin + if CheckWin32Version(6) then + SendMessage(Handle, CB_SETCUEBANNER, WPARAM(0), LPARAM(PWideChar(UnicodeString(FTextHint)))) + else if CheckWin32Version(5, 1) then + SendMessage(FEditHandle, EM_SETCUEBANNER, WPARAM(0), LPARAM(PWideChar(UnicodeString(FTextHint)))); + end; + {$ENDIF JVCLThemesEnabled} + {$ENDIF COMPILER12_UP} + if UserTextHint and HandleAllocated and + not Focused and Enabled and not IsEditReadOnly and (Text = '') then + Invalidate; +end; + +procedure TJvExCustomComboBox.ComboWndProc(var Message: TMessage; ComboWnd: HWND; ComboProc: Pointer); + + procedure EditPaintWindow(DC: HDC); + var + R: TRect; + OldFont: HFONT; + OldTextColor: TColorRef; + begin + if UserTextHint and (TextHint <> '') and + Enabled and not IsEditReadOnly and not Focused and (Text = '') then + begin + SendMessage(FEditHandle, EM_GETRECT, 0, LPARAM(@R)); + + OldFont := SelectObject(DC, Font.Handle); + OldTextColor := SetTextColor(DC, ColorToRGB(clGrayText)); + DrawText(DC, PChar(TextHint), Length(TextHint), R, DT_LEFT or DT_VCENTER or DT_SINGLELINE or DT_NOPREFIX); + + SetTextColor(DC, OldTextColor); + SelectObject(DC, OldFont); + end; + end; + +var + DC: HDC; + PaintStruct: TPaintStruct; +begin + DC := 0; + try + if (ComboWnd = FEditHandle) and UserTextHint and (Message.Msg = WM_PAINT) then + begin + if TWMPaint(Message).DC = 0 then + begin + DC := BeginPaint(ComboWnd, PaintStruct); + TWMPaint(Message).DC := DC; + end; + end; + + inherited ComboWndProc(Message, ComboWnd, ComboProc); + + if ComboWnd = FEditHandle then + begin + case Message.Msg of + WM_PAINT: + EditPaintWindow(DC); + + WM_PRINTCLIENT: + EditPaintWindow(HDC(Message.WParam)); + + WM_KILLFOCUS, WM_SETFOCUS: + if UserTextHint and (TextHint <> '') then + Invalidate; + end; + end; + finally + if DC <> 0 then + begin + EndPaint(ComboWnd, PaintStruct); + TWMPaint(Message).DC := 0; + end; + end; +end; + constructor TJvExButtonControl.Create(AOwner: TComponent); begin inherited Create(AOwner); Modified: trunk/jvcl/run/JvMaskEdit.pas =================================================================== --- trunk/jvcl/run/JvMaskEdit.pas 2012-09-19 14:21:04 UTC (rev 13436) +++ trunk/jvcl/run/JvMaskEdit.pas 2012-09-24 11:46:58 UTC (rev 13437) @@ -183,6 +183,11 @@ property OnSetFocus; property OnKillFocus; property OnStartDrag; + + {$IFDEF COMPILER14_UP} + property Touch; + {$ENDIF COMPILER14_UP} + property TextHint; end; {$IFDEF UNITVERSIONING} Modified: trunk/jvcl/run/JvStringGrid.pas =================================================================== --- trunk/jvcl/run/JvStringGrid.pas 2012-09-19 14:21:04 UTC (rev 13436) +++ trunk/jvcl/run/JvStringGrid.pas 2012-09-24 11:46:58 UTC (rev 13437) @@ -142,7 +142,8 @@ procedure InvalidateRow(ARow: Integer); procedure MoveColumn(FromIndex, ToIndex: Integer); procedure MoveRow(FromIndex, ToIndex: Longint); - property GridState; + + property GridState: TGridState read FGridState; property InplaceEditor; // Calculates and sets the width of a specific column or all columns if Index < 0 Modified: trunk/jvcl/run/JvToolEdit.pas =================================================================== --- trunk/jvcl/run/JvToolEdit.pas 2012-09-19 14:21:04 UTC (rev 13436) +++ trunk/jvcl/run/JvToolEdit.pas 2012-09-24 11:46:58 UTC (rev 13437) @@ -505,6 +505,14 @@ property OnPopupHidden; property OnPopupChange; property OnPopupValueAccepted; + + {$IFDEF COMPILER12_UP} + property NumbersOnly; + {$ENDIF} + {$IFDEF COMPILER14_UP} + property Touch; + {$ENDIF COMPILER14_UP} + property TextHint; end; { TJvFileDirEdit } @@ -576,6 +584,11 @@ {$ELSE} property OEMConvert default True; // Mantis 3621 {$ENDIF UNICODE} + + {$IFDEF COMPILER14_UP} + property Touch; + {$ENDIF COMPILER14_UP} + property TextHint; end; TFileDialogKind = (dkOpen, dkSave, dkOpenPicture, dkSavePicture); @@ -1085,6 +1098,11 @@ property OnPopupShown; property DataConnector; + + {$IFDEF COMPILER14_UP} + property Touch; + {$ENDIF COMPILER14_UP} + property TextHint; end; EComboEditError = class(EJVCLException); @@ -1132,9 +1150,11 @@ {$R JvToolEdit.res} type - {$HINTS OFF} TCustomMaskEditAccessPrivate = class(TCustomEdit) - private + protected + {$IFDEF COMPILER18_UP} + {$MESSAGE WARNING 'Check if Vcl.Mask.TCustomMaskEdit still has the exact same fields and adjust the IFDEF'} + {$ENDIF} // Do not remove these fields, although they are not used. FEditMask: TEditMask; FMaskBlank: Char; @@ -1144,9 +1164,8 @@ FCaretPos: Integer; FBtnDownX: Integer; FOldValue: string; - FSettingCursor: Boolean; + FSettingCursor: Boolean; // << this field can't be read end; - {$HINTS ON} TCustomEditAccessProtected = class(TCustomEdit); TCustomFormAccessProtected = class(TCustomForm); Modified: trunk/jvcl/run/JvValidateEdit.pas =================================================================== --- trunk/jvcl/run/JvValidateEdit.pas 2012-09-19 14:21:04 UTC (rev 13436) +++ trunk/jvcl/run/JvValidateEdit.pas 2012-09-24 11:46:58 UTC (rev 13437) @@ -337,6 +337,14 @@ property OnIsValid; property OnDecimalRounding; property DataConnector; + + {$IFDEF COMPILER12_UP} + //property NumbersOnly; + {$ENDIF} + {$IFDEF COMPILER14_UP} + property Touch; + {$ENDIF COMPILER14_UP} + property TextHint; end; {$IFDEF UNITVERSIONING} This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ah...@us...> - 2012-09-19 14:21:14
|
Revision: 13436 http://jvcl.svn.sourceforge.net/jvcl/?rev=13436&view=rev Author: ahuser Date: 2012-09-19 14:21:04 +0000 (Wed, 19 Sep 2012) Log Message: ----------- Added support for IStorage that is used by Outlook Modified Paths: -------------- trunk/jvcl/run/JvDragDrop.pas Modified: trunk/jvcl/run/JvDragDrop.pas =================================================================== --- trunk/jvcl/run/JvDragDrop.pas 2012-09-12 01:55:23 UTC (rev 13435) +++ trunk/jvcl/run/JvDragDrop.pas 2012-09-19 14:21:04 UTC (rev 13436) @@ -386,7 +386,7 @@ ptd := nil; dwAspect := DVASPECT_CONTENT; lindex := 0; - tymed := TYMED_ISTREAM; + tymed := TYMED_ISTREAM or TYMED_ISTORAGE; end; end; @@ -752,12 +752,15 @@ var Medium: TStgMedium; InStream: IStream; + InStorage, StgMem: IStorage; Stat: TStatStg; + LockBytes: ILockBytes; Buf: Pointer; BufSize: Integer; Num: Int64; Position: Int64; + Offset: Int64; begin Result := False; if (Stream = nil) or (Index < 0) or (Index >= GetFileDescrCount) then @@ -765,6 +768,7 @@ FileContentFormatEtc.lindex := Index; if FDataObject.GetData(FileContentFormatEtc, Medium) = S_OK then + begin try try if Medium.tymed and TYMED_ISTREAM <> 0 then @@ -795,15 +799,65 @@ FreeMem(Buf); end; end; + Result := True; end else + if Medium.tymed and TYMED_ISTORAGE <> 0 then + begin + InStorage := IStorage(Medium.stg); + if Succeeded(CreateILockBytesOnHGlobal(0, True, LockBytes)) then + begin + if Succeeded(StgCreateDocfileOnILockBytes(LockBytes, STGM_CREATE or STGM_READWRITE or STGM_SHARE_EXCLUSIVE, 0, StgMem)) then + begin + if Succeeded(InStorage.CopyTo(0, nil, nil, StgMem)) then + begin + StgMem.Commit(STGC_DEFAULT); + LockBytes.Stat(Stat, STATFLAG_NONAME); + + Num := Stat.cbSize; + if Num > 0 then + begin + Offset := 0; + GetMem(Buf, MaxBufSize); + try + // Speicherbereich reservieren + Position := Stream.Position; + Stream.Size := Stream.Size + Num; + Stream.Position := Position; + + while Num > 0 do + begin + if Num < MaxBufSize then + BufSize := Num + else + BufSize := MaxBufSize; + LockBytes.ReadAt(Offset, Buf, BufSize, nil); + Inc(Offset, BufSize); + Stream.Write(Buf^, BufSize); + Dec(Num, BufSize); + end; + finally + FreeMem(Buf); + end; + end; + Result := True; + end; + end; + end; + end + else Result := False; finally + InStream := nil; + InStorage := nil; + StgMem := nil; + LockBytes := nil; ReleaseStgMedium(Medium); end; except Result := False; end; + end; end; initialization This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <wp...@us...> - 2012-09-12 01:55:31
|
Revision: 13435 http://jvcl.svn.sourceforge.net/jvcl/?rev=13435&view=rev Author: wpostma Date: 2012-09-12 01:55:23 +0000 (Wed, 12 Sep 2012) Log Message: ----------- Fix demo examples\jvdocking\DockingInCode - some of the buttons in the demo were for features that never worked. Removed. Also, it turns out that using caFree as a CloseAction in a formClose event in the Document Form, is incompatible with the design of JvDocking. Fixed the docking demo so that we have a list of docked documents, which we undock when things are going to be messy, and we free in a controlled way AFTER all docking or undocking operations have completed. Modified Paths: -------------- trunk/jvcl/examples/JvDocking/DockingInCode/DocFm.dfm trunk/jvcl/examples/JvDocking/DockingInCode/DocFm.pas trunk/jvcl/examples/JvDocking/DockingInCode/MainFm.dfm trunk/jvcl/examples/JvDocking/DockingInCode/MainFm.pas Modified: trunk/jvcl/examples/JvDocking/DockingInCode/DocFm.dfm =================================================================== --- trunk/jvcl/examples/JvDocking/DockingInCode/DocFm.dfm 2012-09-11 07:37:34 UTC (rev 13434) +++ trunk/jvcl/examples/JvDocking/DockingInCode/DocFm.dfm 2012-09-12 01:55:23 UTC (rev 13435) @@ -1,9 +1,9 @@ object DocForm: TDocForm Left = 456 Top = 476 - Width = 745 - Height = 513 Caption = 'Document Form' + ClientHeight = 474 + ClientWidth = 729 Color = clAqua DockSite = True DragKind = dkDock @@ -14,7 +14,6 @@ Font.Name = 'MS Sans Serif' Font.Style = [] OldCreateOrder = False - OnClose = FormClose OnCloseQuery = FormCloseQuery OnCreate = FormCreate OnEndDock = FormEndDock @@ -35,7 +34,7 @@ Left = 0 Top = 33 Width = 729 - Height = 442 + Height = 441 Align = alClient Color = 16642009 ColCount = 20 Modified: trunk/jvcl/examples/JvDocking/DockingInCode/DocFm.pas =================================================================== --- trunk/jvcl/examples/JvDocking/DockingInCode/DocFm.pas 2012-09-11 07:37:34 UTC (rev 13434) +++ trunk/jvcl/examples/JvDocking/DockingInCode/DocFm.pas 2012-09-12 01:55:23 UTC (rev 13435) @@ -23,7 +23,6 @@ DockForm: TForm; DockServer: TJvDockServer; DockPanel: TJvDockPanel; var CanDock: Boolean); procedure FormCloseQuery(Sender: TObject; var CanClose: Boolean); - procedure FormClose(Sender: TObject; var Action: TCloseAction); procedure Button1Click(Sender: TObject); procedure FormUnDock(Sender: TObject; Client: TControl; NewTarget: TWinControl; var Allow: Boolean); @@ -47,6 +46,7 @@ public { Public declarations } property OnTrace:TMsgEvent read FOnTrace write FOnTrace; + end; var @@ -171,9 +171,4 @@ end; -procedure TDocForm.FormClose(Sender: TObject; var Action: TCloseAction); -begin - Action := caFree; -end; - end. Modified: trunk/jvcl/examples/JvDocking/DockingInCode/MainFm.dfm =================================================================== --- trunk/jvcl/examples/JvDocking/DockingInCode/MainFm.dfm 2012-09-11 07:37:34 UTC (rev 13434) +++ trunk/jvcl/examples/JvDocking/DockingInCode/MainFm.dfm 2012-09-12 01:55:23 UTC (rev 13435) @@ -1,9 +1,9 @@ object MainForm: TMainForm Left = 290 Top = 259 - Width = 965 - Height = 678 Caption = 'Controlling Docking from Code' + ClientHeight = 639 + ClientWidth = 949 Color = 14734247 Font.Charset = DEFAULT_CHARSET Font.Color = clWindowText @@ -17,17 +17,18 @@ TextHeight = 13 object JvSplitter1: TJvSplitter Left = 0 - Top = 473 + Top = 472 Width = 949 Height = 3 Cursor = crVSplit Align = alBottom + ExplicitTop = 473 end object Panel1: TPanel Left = 0 Top = 0 Width = 265 - Height = 473 + Height = 472 Align = alLeft Color = 15399897 TabOrder = 0 @@ -48,34 +49,6 @@ TabOrder = 0 OnClick = ButtonSibDockClick end - object Button2: TButton - Left = 6 - Top = 164 - Width = 99 - Height = 25 - Hint = 'Display number of windows docked in the Custom Docking Area.' - Caption = 'View Dock Tree' - TabOrder = 5 - OnClick = Button2Click - end - object Button3: TButton - Left = 6 - Top = 101 - Width = 99 - Height = 25 - Caption = 'Save Layout' - TabOrder = 3 - OnClick = Button3Click - end - object Button4: TButton - Left = 6 - Top = 132 - Width = 99 - Height = 25 - Caption = 'Load Layout' - TabOrder = 4 - OnClick = Button4Click - end object ButtonCreateTabDock: TButton Left = 6 Top = 72 @@ -103,7 +76,7 @@ Height = 22 MaxValue = 100 MinValue = 0 - TabOrder = 6 + TabOrder = 3 Value = 18 OnChange = SpinEdit1Change end @@ -113,7 +86,7 @@ Width = 233 Height = 17 Caption = 'Dock in tabs to right side (reproduce bug)' - TabOrder = 7 + TabOrder = 4 OnClick = tbDockRightSideClick end object cbWorkaround: TCheckBox @@ -124,7 +97,7 @@ Caption = 'Tab-Docking workaround mode' Checked = True State = cbChecked - TabOrder = 8 + TabOrder = 5 Visible = False end end @@ -132,21 +105,22 @@ Left = 265 Top = 0 Width = 684 - Height = 473 + Height = 472 Align = alClient Caption = 'Custom Docking Area' - Color = 4227200 + Color = clWhite Font.Charset = DEFAULT_CHARSET Font.Color = clWindow Font.Height = -11 Font.Name = 'MS Sans Serif' Font.Style = [] + ParentBackground = False ParentFont = False TabOrder = 1 end object Panel3: TPanel Left = 0 - Top = 476 + Top = 475 Width = 949 Height = 164 Align = alBottom Modified: trunk/jvcl/examples/JvDocking/DockingInCode/MainFm.pas =================================================================== --- trunk/jvcl/examples/JvDocking/DockingInCode/MainFm.pas 2012-09-11 07:37:34 UTC (rev 13434) +++ trunk/jvcl/examples/JvDocking/DockingInCode/MainFm.pas 2012-09-12 01:55:23 UTC (rev 13435) @@ -132,25 +132,48 @@ } uses - Windows, Messages, SysUtils, Variants, Classes, Graphics, Controls, Forms, - Dialogs, JvComponent, JvDockControlForm, ExtCtrls, JvDockVIDVCStyle, - StdCtrls, JvDockVIDStyle, JvDockDelphiStyle, JvDockVSNetStyle, - JvAppStorage, JvAppIniStorage, DocFm, JvExExtCtrls, JvSplitter, Spin, - JvDockTree, JvComponentBase; + Windows, + Messages, + SysUtils, + Variants, + Classes, + Graphics, + Controls, + Forms, + Dialogs, + ExtCtrls, + StdCtrls, + Contnrs, + Spin, + DocFm, + + JvComponent, + JvDockControlForm, + JvDockVIDVCStyle, + JvDockVIDStyle, + JvDockDelphiStyle, + JvDockVSNetStyle, + JvAppStorage, + JvAppIniStorage, + JvExExtCtrls, + JvSplitter, + JvDockTree, + JvComponentBase; + + const - MinWidth=500; + MinWidth=500; type + TLastClickEnum = (lcNone,lcConjoin,lcSibling,lcTabbed); + TMainForm = class(TForm) Panel1: TPanel; Panel2: TPanel; dockServer: TJvDockServer; ButtonSibDock: TButton; JvDockVIDStyle1: TJvDockVIDStyle; - Button2: TButton; - Button3: TButton; DockIniStorage: TJvAppIniFileStorage; - Button4: TButton; ButtonCreateTabDock: TButton; ButtonCreateConjoin: TButton; Panel3: TPanel; @@ -179,11 +202,15 @@ FColors : Array of TColor; FIndex :Integer; FDocumentFormIndex:Integer; // Give each form a different caption. - + FDocs:TObjectList; + FLastClick:TLastClickEnum; procedure Trace(msg:String); function MakeNewDocFm:TDocForm; + procedure clearOldDocs; + + public { Public declarations } end; @@ -213,16 +240,19 @@ function TMainForm.MakeNewDocFm:TDocForm; begin result := TDocForm.Create(nil); + result.Visible := false; result.DockClient.DockStyle := DockServer.DockStyle; result.sg.Color := FColors[FIndex]; result.OnTrace := Trace; + Inc(FDocumentFormIndex); result.Caption := 'Document Form #'+IntToStr(FDocumentFormIndex); result.Name := 'DocumentForm'+IntToStr(FDocumentFormIndex); - Inc(FIndex); + FDocs.Add(result); + FIndex := FDocs.Count; if (FIndex>=Length(FColors)) then FIndex := 0; result.Top := result.Top + (FIndex * 10); @@ -230,6 +260,7 @@ end; + procedure TMainForm.ButtonSibDockClick(Sender: TObject); var newDocFm:TDocForm; @@ -239,14 +270,15 @@ ctrl:TWinControl; adef:TAlign; begin + if FLastClick<>lcSibling then + clearOldDocs; + + FLastClick := lcSibling; Assert(Assigned(DockServer.DockStyle)); newDocFm := MakeNewDocFm; - newDocFm.Show; - Assert(Assigned(DockServer.CustomDockPanel)); - { Simplest version just puts siblings side by side horizontally: } // newDocFm.ManualDock( DockServer.CustomDockPanel, nil, alNone ) @@ -289,11 +321,38 @@ newDocFm.ManualDock( ctrl, besideForm, alRight ); end; + newDocFm.Show; + TJvDockPanel(ctrl).DockManager.ResetBounds(true); end; +procedure TMainForm.clearOldDocs; +var + n:Integer; + R:TRect; + dockClient:TJvDockClient; + ctrl:TControl; +begin + R.Top := -800; + R.Left := -800; + for n := 0 to dockServer.CustomDockPanel.DockClientCount-1 do + begin + ctrl := dockServer.CustomDockPanel.DockClients[n]; + if ctrl is TForm then + begin + dockClient := FindDockClient(ctrl); + dockClient.FormUnDock(nil,nil); + end; + + //dockClient.FormUnDock(nil,nil); + end; + + // This Frees previously created forms. + FDocs.Clear; +end; + procedure TMainForm.FormCreate(Sender: TObject); begin SetLengtH( FColors, 5 ); @@ -305,6 +364,7 @@ DockIniStorage.FileName := ExtractFilePath(Application.ExeName)+'CustomTabbedDockingLayout.ini'; + FDocs := TObjectList.Create(true); end; @@ -431,6 +491,11 @@ tabHost: TJvDockTabHostForm; ctrl:TWinControl; begin + // clear previous contents + clearOldDocs; + FLastClick := lcTabbed; + + newDocFm1 := MakeNewDocFm; newDocFm2 := MakeNewDocFm; @@ -450,7 +515,9 @@ newDocFm2 := MakeNewDocFm; ManualTabDockAddPage( tabHost, newDocFm2 ); end; - + + newDocFm1.Show; + newDocFm2.Show; end; @@ -461,10 +528,16 @@ newDocFm1,newDocFm2:TDocForm; // conjoinHost:TJvDockConjoinHostForm; begin + if FLastClick <> lcConjoin then + clearOldDocs; + + FLastClick := lcConjoin; newDocFm1 := MakeNewDocFm; newDocFm2 := MakeNewDocFm; {conjoinHost := }ManualConjoinDock( DockServer.CustomDockPanel, newDocFm1, newDocFm2 ); + newDocFm1.Show; + newDocFm2.Show; // How to add a 3rd and a fourth page: // newDocFm2 := MakeNewDocFm; // ManualConjoinDockAdd( conjoinHost, newDocFm2 ); //TODO! IMPLEMENT THIS HELPER FUNCTION! This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |