Menu
▾
▴
[JVCL-Checkins] dev/JVCL3/run JvArrowButton.pas,1.25,1.26 JvButton.pas,1.47,1.48 JvCharMap.pas,1.34,1.35 JvCheckTreeView.pas,1.15,1.16 JvColorButton.pas,1.18,1.19 JvColorCombo.pas,1.39,1.40 JvColorForm.pas,1.22,1.23 JvComCtrls.pas,1.66,1.67 JvCombobox.pas,1.45,1.46 JvCustomItemViewer.pas,1.28,1.29 JvDatePickerEdit.pas,1.52,1.53 JvEmbeddedForms.pas,1.8,1.9 JvImageList.pas,1.37,1.38 JvPaintFX.pas,1.27,1.28 JvResources.pas,1.77,1.78 JvTFDays.pas,1.35,1.36 JvTFGlance.pas,1.25,1.26 JvTFManager.pas,1.35,1.36 JvTMTimeLine.pas,1.29,1.30 JvgAskListBox.pas,1.22,1.23 - Started to tighten Shift handling and some resourcestring fi
Update of /cvsroot/jvcl/dev/JVCL3/run In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6246/JVCL3/run Modified Files: JvArrowButton.pas JvButton.pas JvCharMap.pas JvCheckTreeView.pas JvColorButton.pas JvColorCombo.pas JvColorForm.pas JvComCtrls.pas JvCombobox.pas JvCustomItemViewer.pas JvDatePickerEdit.pas JvEmbeddedForms.pas JvImageList.pas JvPaintFX.pas JvResources.pas JvTFDays.pas JvTFGlance.pas JvTFManager.pas JvTMTimeLine.pas JvgAskListBox.pas Log Message: Started to tighten Shift handling and some resourcestring fixes Index: JvColorCombo.pas =================================================================== RCS file: /cvsroot/jvcl/dev/JVCL3/run/JvColorCombo.pas,v retrieving revision 1.39 retrieving revision 1.40 diff -C2 -d -r1.39 -r1.40 *** JvColorCombo.pas 20 Jul 2004 14:31:02 -0000 1.39 --- JvColorCombo.pas 26 Jul 2004 06:18:10 -0000 1.40 *************** *** 296,300 **** uses SysUtils, Math, StdCtrls, Printers, ! JvResources, JvTypes; {.$IFDEF MSWINDOWS} --- 296,300 ---- uses SysUtils, Math, StdCtrls, Printers, ! JvConsts, JvResources, JvTypes; {.$IFDEF MSWINDOWS} *************** *** 1259,1263 **** procedure TJvFontComboBox.KeyDown(var Key: Word; Shift: TShiftState); begin ! if (Key = VK_RETURN) and FShowMRU then ItemIndex := AddToMRU; inherited KeyDown(Key, Shift); --- 1259,1265 ---- procedure TJvFontComboBox.KeyDown(var Key: Word; Shift: TShiftState); begin ! // (rom) only accept without Shift, Alt or Ctrl down ! if (Shift * KeyboardShiftStates = []) and ! (Key = VK_RETURN) and FShowMRU then ItemIndex := AddToMRU; inherited KeyDown(Key, Shift); Index: JvArrowButton.pas =================================================================== RCS file: /cvsroot/jvcl/dev/JVCL3/run/JvArrowButton.pas,v retrieving revision 1.25 retrieving revision 1.26 diff -C2 -d -r1.25 -r1.26 *** JvArrowButton.pas 20 Jul 2004 09:00:39 -0000 1.25 --- JvArrowButton.pas 26 Jul 2004 06:18:10 -0000 1.26 *************** *** 1241,1245 **** const KeyText: WideString): Boolean; begin ! Result := IsAccel(Key, Caption) and Enabled and (ssAlt in Shift); if Result then Click --- 1241,1245 ---- const KeyText: WideString): Boolean; begin ! Result := IsAccel(Key, Caption) and Enabled and (Shift * KeyboardShiftStates = [ssAlt]); if Result then Click Index: JvCustomItemViewer.pas =================================================================== RCS file: /cvsroot/jvcl/dev/JVCL3/run/JvCustomItemViewer.pas,v retrieving revision 1.28 retrieving revision 1.29 diff -C2 -d -r1.28 -r1.29 *** JvCustomItemViewer.pas 20 Jul 2004 14:31:04 -0000 1.28 --- JvCustomItemViewer.pas 26 Jul 2004 06:18:11 -0000 1.29 *************** *** 342,346 **** uses SysUtils, Math, ! JvJCLUtils, JvJVCLUtils, JvThemes, JvFinalize; const --- 342,346 ---- uses SysUtils, Math, ! JvConsts, JvJCLUtils, JvJVCLUtils, JvThemes, JvFinalize; const *************** *** 979,983 **** if not inherited DoMouseWheel(Shift, WheelDelta, MousePos) then begin ! if ssCtrl in Shift then WD := WheelDelta * 3 else --- 979,983 ---- if not inherited DoMouseWheel(Shift, WheelDelta, MousePos) then begin ! if Shift * KeyboardShiftStates = [ssShift] then WD := WheelDelta * 3 else *************** *** 1263,1267 **** inherited KeyDown(Key, Shift); LIndex := -1; ! if Focused then case Key of VK_UP: --- 1263,1267 ---- inherited KeyDown(Key, Shift); LIndex := -1; ! if Focused and (Shift * KeyboardShiftStates = []) then case Key of VK_UP: *************** *** 1694,1701 **** if Options.MultiSelect then begin ! if ssCtrl in Shift then ToggleSelection(FTempSelected, True) else ! if ssShift in Shift then ShiftSelection(FTempSelected, True) else --- 1694,1701 ---- if Options.MultiSelect then begin ! if (Shift * KeyboardShiftStates = [ssCtrl]) then ToggleSelection(FTempSelected, True) else ! if Shift * KeyboardShiftStates = [ssShift] then ShiftSelection(FTempSelected, True) else Index: JvTFGlance.pas =================================================================== RCS file: /cvsroot/jvcl/dev/JVCL3/run/JvTFGlance.pas,v retrieving revision 1.25 retrieving revision 1.26 diff -C2 -d -r1.25 -r1.26 *** JvTFGlance.pas 25 Jul 2004 05:42:26 -0000 1.25 --- JvTFGlance.pas 26 Jul 2004 06:18:11 -0000 1.26 *************** *** 760,764 **** RsEASubcellCannotBeSplit = 'A subcell cannot be split'; RsGlanceMainTitle = '(Title)'; ! {$ENDIF USEJVCL} //=== { TJvTFGlanceCell } ==================================================== --- 760,764 ---- RsEASubcellCannotBeSplit = 'A subcell cannot be split'; RsGlanceMainTitle = '(Title)'; ! {$ENDIF USEJVCL} //=== { TJvTFGlanceCell } ==================================================== Index: JvCharMap.pas =================================================================== RCS file: /cvsroot/jvcl/dev/JVCL3/run/JvCharMap.pas,v retrieving revision 1.34 retrieving revision 1.35 diff -C2 -d -r1.34 -r1.35 *** JvCharMap.pas 20 Jul 2004 14:31:01 -0000 1.34 --- JvCharMap.pas 26 Jul 2004 06:18:10 -0000 1.35 *************** *** 382,386 **** uses ! SysUtils, Math, Forms; const --- 382,387 ---- uses ! SysUtils, Math, Forms, ! JvConsts; const *************** *** 860,909 **** // update new location inherited KeyDown(Key, Shift); ! case Key of ! VK_RETURN: ! ShowCharPanel(Col, Row); ! VK_SPACE: ! if not (ssAlt in Shift) then ! PanelVisible := not PanelVisible; ! VK_ESCAPE: ! PanelVisible := False; ! VK_UP, VK_DOWN, VK_PRIOR, VK_NEXT, VK_HOME, VK_END: ! if PanelVisible then ShowCharPanel(Col, Row); ! VK_LEFT: ! begin ! if (ACol = 0) and (ARow > 0) then ! begin ! ACol := ColCount - 1; ! Dec(ARow); ! end ! else ! begin ! ACol := Col; ! ARow := Row; ! end; ! Col := ACol; ! Row := ARow; if PanelVisible then ! ShowCharPanel(ACol, ARow); ! end; ! VK_RIGHT: ! begin ! if (ACol = ColCount - 1) and (ARow < RowCount - 1) then begin ! ACol := 0; ! Inc(ARow); ! end ! else begin ! ACol := Col; ! ARow := Row; end; ! Col := ACol; ! Row := ARow; ! if PanelVisible then ! ShowCharPanel(ACol, ARow); ! end; ! end; end; --- 861,911 ---- // update new location inherited KeyDown(Key, Shift); ! // (rom) only accept without Shift, Alt or Ctrl down ! if Shift * KeyboardShiftStates = [] then ! case Key of ! VK_RETURN: ShowCharPanel(Col, Row); ! VK_SPACE: ! PanelVisible := not PanelVisible; ! VK_ESCAPE: ! PanelVisible := False; ! VK_UP, VK_DOWN, VK_PRIOR, VK_NEXT, VK_HOME, VK_END: if PanelVisible then ! ShowCharPanel(Col, Row); ! VK_LEFT: begin ! if (ACol = 0) and (ARow > 0) then ! begin ! ACol := ColCount - 1; ! Dec(ARow); ! end ! else ! begin ! ACol := Col; ! ARow := Row; ! end; ! Col := ACol; ! Row := ARow; ! if PanelVisible then ! ShowCharPanel(ACol, ARow); ! end; ! VK_RIGHT: begin ! if (ACol = ColCount - 1) and (ARow < RowCount - 1) then ! begin ! ACol := 0; ! Inc(ARow); ! end ! else ! begin ! ACol := Col; ! ARow := Row; ! end; ! Col := ACol; ! Row := ARow; ! if PanelVisible then ! ShowCharPanel(ACol, ARow); end; ! end; end; *************** *** 924,929 **** ShowCharPanel(ACol, ARow) else ! if SelectCell(Col, Row) then ! ShowCharPanel(Col, Row); end; end; --- 926,931 ---- ShowCharPanel(ACol, ARow) else ! if SelectCell(Col, Row) then ! ShowCharPanel(Col, Row); end; end; *************** *** 1277,1292 **** procedure TCharZoomPanel.KeyDown(var Key: Word; Shift: TShiftState); begin ! case Key of ! VK_ESCAPE: ! begin ! Visible := False; ! if Parent.CanFocus then ! Parent.SetFocus; ! end; ! VK_LEFT, VK_RIGHT, VK_UP, VK_DOWN: ! TJvCustomCharMap(Parent).KeyDown(Key, Shift); else inherited KeyDown(Key, Shift); - end; end; --- 1279,1298 ---- procedure TCharZoomPanel.KeyDown(var Key: Word; Shift: TShiftState); begin ! // (rom) only accept without Shift, Alt or Ctrl down ! if Shift * KeyboardShiftStates = [] then ! case Key of ! VK_ESCAPE: ! begin ! Visible := False; ! if Parent.CanFocus then ! Parent.SetFocus; ! end; ! VK_LEFT, VK_RIGHT, VK_UP, VK_DOWN: ! TJvCustomCharMap(Parent).KeyDown(Key, Shift); ! else ! inherited KeyDown(Key, Shift); ! end else inherited KeyDown(Key, Shift); end; Index: JvTFDays.pas =================================================================== RCS file: /cvsroot/jvcl/dev/JVCL3/run/JvTFDays.pas,v retrieving revision 1.35 retrieving revision 1.36 diff -C2 -d -r1.35 -r1.36 *** JvTFDays.pas 25 Jul 2004 05:42:25 -0000 1.35 --- JvTFDays.pas 26 Jul 2004 06:18:11 -0000 1.36 *************** *** 1778,1782 **** '"%s" already exists'; RsEATimeBlockWithTheNamesDoesNotExist = 'A time block with the name "%s" does not exist'; ! {$ENDIF USEJVCL} //Type --- 1778,1782 ---- '"%s" already exists'; RsEATimeBlockWithTheNamesDoesNotExist = 'A time block with the name "%s" does not exist'; ! {$ENDIF USEJVCL} //Type Index: JvTFManager.pas =================================================================== RCS file: /cvsroot/jvcl/dev/JVCL3/run/JvTFManager.pas,v retrieving revision 1.35 retrieving revision 1.36 diff -C2 -d -r1.35 -r1.36 *** JvTFManager.pas 25 Jul 2004 05:42:26 -0000 1.35 --- JvTFManager.pas 26 Jul 2004 06:18:12 -0000 1.36 *************** *** 491,499 **** FFlushing: Boolean; FDestroying: Boolean; - FSchedBatch: TStringList; - procedure Notification(AComponent: TComponent; Operation: TOperation); override; - procedure ConnectControl(ApptCtrl: TJvTFControl); procedure DisconnectControl(ApptCtrl: TJvTFControl); --- 491,496 ---- *************** *** 663,672 **** procedure Assign(Source: TPersistent); override; published ! property HintColor: TColor read FHintColor write SetHintColor ! default clDefault; ! property HintHidePause: Integer read FHintHidePause write SetHintHidePause ! default -1; ! property HintPause: Integer read FHintPause write SetHintPause ! default -1; end; --- 660,666 ---- procedure Assign(Source: TPersistent); override; published ! property HintColor: TColor read FHintColor write SetHintColor default clDefault; ! property HintHidePause: Integer read FHintHidePause write SetHintHidePause default -1; ! property HintPause: Integer read FHintPause write SetHintPause default -1; end; *************** *** 728,732 **** end; ! TJvTFDragInfo = class private FApptCtrl: TJvTFControl; --- 722,726 ---- end; ! TJvTFDragInfo = class(TObject) private FApptCtrl: TJvTFControl; *************** *** 743,749 **** {$IFDEF USEJVCL} TJvTFComponent = class(TJvComponent) ! {$ELSE} TJvTFComponent = class(TComponent) ! {$ENDIF USEJVCL} private FScheduleManager: TJvTFScheduleManager; --- 737,743 ---- {$IFDEF USEJVCL} TJvTFComponent = class(TJvComponent) ! {$ELSE} TJvTFComponent = class(TComponent) ! {$ENDIF USEJVCL} private FScheduleManager: TJvTFScheduleManager; *************** *** 786,792 **** {$IFDEF USEJVCL} TJvTFControl = class(TJvCustomControl) ! {$ELSE} TJvTFControl = class(TCustomControl) ! {$ENDIF USEJVCL} private FScheduleManager: TJvTFScheduleManager; --- 780,786 ---- {$IFDEF USEJVCL} TJvTFControl = class(TJvCustomControl) ! {$ELSE} TJvTFControl = class(TCustomControl) ! {$ENDIF USEJVCL} private FScheduleManager: TJvTFScheduleManager; *************** *** 907,911 **** FConvertingProps: Boolean; FAborted: Boolean; - procedure SetMarginOffset(Index: Integer; Value: Integer); // always in pixels function GetMarginOffset(Index: Integer): Integer; // always in pixels --- 901,904 ---- *************** *** 1002,1008 **** FDWN_Friday: string; FDWN_Saturday: string; - FOnChange: TNotifyEvent; - procedure SetDWN(Index: Integer; const Value: string); function GetDWN(Index: Integer): string; --- 995,999 ---- *************** *** 1015,1020 **** function GetDWName(DWIndex: Integer): string; published ! property Source: TJvTFDWNameSource read FSource write SetSource ! default dwnsSysShort; property DWN_Sunday: string index 1 read GetDWN write SetDWN; property DWN_Monday: string index 2 read GetDWN write SetDWN; --- 1006,1010 ---- function GetDWName(DWIndex: Integer): string; published ! property Source: TJvTFDWNameSource read FSource write SetSource default dwnsSysShort; property DWN_Sunday: string index 1 read GetDWN write SetDWN; property DWN_Monday: string index 2 read GetDWN write SetDWN; *************** *** 1062,1069 **** {$IFDEF VisualCLX} QDialogs, QForms; ! {$ENDIF VisualCLX} ! {$IFDEF VCL} ! Dialogs, Forms; ! {$ENDIF VCL} {$IFNDEF USEJVCL} --- 1052,1059 ---- {$IFDEF VisualCLX} QDialogs, QForms; ! {$ENDIF VisualCLX} ! {$IFDEF VCL} ! Dialogs, Forms; ! {$ENDIF VCL} {$IFNDEF USEJVCL} *************** *** 1108,1112 **** RsEInvalidFooterHeightd = 'Invalid Footer Height (%d)'; RsEInvalidHeaderHeightd = 'Invalid Header Height (%d)'; ! {$ENDIF USEJVCL} function AdjustEndTime(ATime: TTime): TTime; --- 1098,1102 ---- RsEInvalidFooterHeightd = 'Invalid Footer Height (%d)'; RsEInvalidHeaderHeightd = 'Invalid Header Height (%d)'; ! {$ENDIF USEJVCL} function AdjustEndTime(ATime: TTime): TTime; Index: JvComCtrls.pas =================================================================== RCS file: /cvsroot/jvcl/dev/JVCL3/run/JvComCtrls.pas,v retrieving revision 1.66 retrieving revision 1.67 diff -C2 -d -r1.66 -r1.67 *** JvComCtrls.pas 25 Jul 2004 05:42:25 -0000 1.66 --- JvComCtrls.pas 26 Jul 2004 06:18:10 -0000 1.67 *************** *** 342,346 **** {$IFDEF VisualCLX} procedure KeyDown(var Key: Word; Shift: TShiftState); override; ! procedure MouseDown(Button: TMouseButton; Shift: TShiftState; X: Integer; Y: Integer); override; function DrawTab(TabIndex: Integer; const Rect: TRect; Active: Boolean): Boolean; override; {$ENDIF VisualCLX} --- 342,346 ---- {$IFDEF VisualCLX} procedure KeyDown(var Key: Word; Shift: TShiftState); override; ! procedure MouseDown(Button: TMouseButton; Shift: TShiftState; X, Y: Integer); override; function DrawTab(TabIndex: Integer; const Rect: TRect; Active: Boolean): Boolean; override; {$ENDIF VisualCLX} *************** *** 379,383 **** procedure SetTabPainter(const Value: TJvTabControlPainter); protected - function HintShow(var HintInfo: THintInfo): Boolean; override; function WantKey(Key: Integer; Shift: TShiftState; --- 379,382 ---- *************** *** 390,394 **** function DrawTab(TabIndex: Integer; const Rect: TRect; Active: Boolean): Boolean; override; procedure MouseDown(Button: TMouseButton; Shift: TShiftState; ! X: Integer; Y: Integer); override; {$ENDIF VisualCLX} {$IFDEF VCL} --- 389,393 ---- function DrawTab(TabIndex: Integer; const Rect: TRect; Active: Boolean): Boolean; override; procedure MouseDown(Button: TMouseButton; Shift: TShiftState; ! X, Y: Integer); override; {$ENDIF VisualCLX} {$IFDEF VCL} *************** *** 464,468 **** end; ! {$IFDEF VCL} TJvTreeNode = class(TTreeNode) private --- 463,468 ---- end; ! {$IFDEF VCL} ! TJvTreeNode = class(TTreeNode) private *************** *** 514,527 **** function GetSelectedCount: Integer; function GetSelectedItem(Index: Integer): TTreeNode; ! {$IFNDEF COMPILER6_UP} procedure SetMultiSelect(const Value: Boolean); ! {$ENDIF COMPILER6_UP} procedure SetScrollDirection(const Value: Integer); - {$IFDEF VCL} procedure WMLButtonDown(var Msg: TWMLButtonDown); message WM_LBUTTONDOWN; procedure WMTimer(var Msg: TWMTimer); message WM_TIMER; procedure WMHScroll(var Msg: TWMHScroll); message WM_HSCROLL; procedure WMVScroll(var Msg: TWMVScroll); message WM_VSCROLL; - {$ENDIF VCL} procedure SetCheckBoxes(const Value: Boolean); function GetItemHeight: Integer; --- 514,525 ---- function GetSelectedCount: Integer; function GetSelectedItem(Index: Integer): TTreeNode; ! {$IFNDEF COMPILER6_UP} procedure SetMultiSelect(const Value: Boolean); ! {$ENDIF COMPILER6_UP} procedure SetScrollDirection(const Value: Integer); procedure WMLButtonDown(var Msg: TWMLButtonDown); message WM_LBUTTONDOWN; procedure WMTimer(var Msg: TWMTimer); message WM_TIMER; procedure WMHScroll(var Msg: TWMHScroll); message WM_HSCROLL; procedure WMVScroll(var Msg: TWMVScroll); message WM_VSCROLL; procedure SetCheckBoxes(const Value: Boolean); function GetItemHeight: Integer; *************** *** 545,549 **** function DoComparePage(Page: TTabSheet; Node: TTreeNode): Boolean; virtual; function CreateNode: TTreeNode; override; - {$IFDEF VCL} procedure CreateParams(var Params: TCreateParams); override; procedure CreateWnd; override; --- 543,546 ---- *************** *** 551,555 **** procedure CNNotify(var Msg: TWMNotify); message CN_NOTIFY; procedure WMPaint(var Msg: TMessage); message WM_PAINT; - {$ENDIF VCL} procedure Change(Node: TTreeNode); override; procedure Delete(Node: TTreeNode); override; --- 548,551 ---- *************** *** 598,617 **** property Menu: TMenu read FMenu write SetMenu; property MenuDblClick: Boolean read FMenuDblClick write FMenuDblClick default False; - property HintColor; - property ItemIndex: Integer read GetItemIndex write SetItemIndex stored False; - property Checkboxes: Boolean read FCheckBoxes write SetCheckBoxes default False; - property OnVerticalScroll: TNotifyEvent read FOnVScroll write FOnVScroll; - property OnHorizontalScroll: TNotifyEvent read FOnHScroll write FOnHScroll; property PageControl: TPageControl read FPageControl write SetPageControl; - property OnPageChanged: TPageChangedEvent read FOnPage write FOnPage; - - property AutoDragScroll: Boolean read FAutoDragScroll write FAutoDragScroll default False; {$IFNDEF COMPILER6_UP} property MultiSelect: Boolean read FMultiSelect write SetMultiSelect default False; {$ENDIF COMPILER6_UP} property OnComparePage: TJvTreeViewComparePageEvent read FOnComparePage write FOnComparePage; property OnMouseEnter; --- 594,608 ---- property Menu: TMenu read FMenu write SetMenu; property MenuDblClick: Boolean read FMenuDblClick write FMenuDblClick default False; property HintColor; property ItemIndex: Integer read GetItemIndex write SetItemIndex stored False; property Checkboxes: Boolean read FCheckBoxes write SetCheckBoxes default False; property PageControl: TPageControl read FPageControl write SetPageControl; property AutoDragScroll: Boolean read FAutoDragScroll write FAutoDragScroll default False; {$IFNDEF COMPILER6_UP} property MultiSelect: Boolean read FMultiSelect write SetMultiSelect default False; {$ENDIF COMPILER6_UP} + property OnVerticalScroll: TNotifyEvent read FOnVScroll write FOnVScroll; + property OnHorizontalScroll: TNotifyEvent read FOnHScroll write FOnHScroll; + property OnPageChanged: TPageChangedEvent read FOnPage write FOnPage; property OnComparePage: TJvTreeViewComparePageEvent read FOnComparePage write FOnComparePage; property OnMouseEnter; *************** *** 622,626 **** property OnSelectionChange: TNotifyEvent read FOnSelectionChange write FOnSelectionChange; end; ! {$ENDIF VCL} implementation --- 613,618 ---- property OnSelectionChange: TNotifyEvent read FOnSelectionChange write FOnSelectionChange; end; ! ! {$ENDIF VCL} implementation *************** *** 629,635 **** SysUtils, JclStrings, ! JvJCLUtils; {$IFDEF VCL} const TVIS_CHECKED = $2000; --- 621,628 ---- SysUtils, JclStrings, ! JvConsts, JvJCLUtils; {$IFDEF VCL} + const TVIS_CHECKED = $2000; *************** *** 787,793 **** I: Integer; begin - {$IFDEF MSWINDOWS} CheckCommonControl(ICC_INTERNET_CLASSES); - {$ENDIF MSWINDOWS} inherited Create(AOwner); ControlStyle := ControlStyle + [csFixedHeight, csReflector]; --- 780,784 ---- *************** *** 822,826 **** end; - {$IFDEF VCL} procedure TJvIPAddress.CreateParams(var Params: TCreateParams); begin --- 813,816 ---- *************** *** 834,838 **** end; end; - {$ENDIF VCL} procedure TJvIPAddress.CreateWnd; --- 824,827 ---- *************** *** 1186,1197 **** case Event of WM_CREATE: begin ! if (FEditControlCount <= Length(FEditControls)) and ! (FEditControls[FEditControlCount] <> nil) then ! begin ! FEditControls[FEditControlCount].Handle := ChildWnd; ! EnableWindow(ChildWnd, Enabled and not (csDesigning in ComponentState)); ! Inc(FEditControlCount); ! end; end; WM_DESTROY: --- 1175,1184 ---- case Event of WM_CREATE: + if (FEditControlCount <= Length(FEditControls)) and + (FEditControls[FEditControlCount] <> nil) then begin ! FEditControls[FEditControlCount].Handle := ChildWnd; ! EnableWindow(ChildWnd, Enabled and not (csDesigning in ComponentState)); ! Inc(FEditControlCount); end; WM_DESTROY: *************** *** 1221,1224 **** --- 1208,1212 ---- end; end; + {$ENDIF VCL} *************** *** 1554,1557 **** --- 1542,1546 ---- {$IFDEF VCL} + procedure TJvTabControl.CMDialogKey(var Msg: TWMKey); begin *************** *** 1604,1612 **** {$IFDEF VisualCLX} procedure TJvTabControl.KeyDown(var Key: Word; Shift: TShiftState); begin ! if (Key = VK_TAB) and (ssCtrl in Shift) then begin ! if ssShift in Shift then begin if TabIndex = 0 then --- 1593,1602 ---- {$IFDEF VisualCLX} + procedure TJvTabControl.KeyDown(var Key: Word; Shift: TShiftState); begin ! if (Key = VK_TAB) and (Shift * KeyboardShiftStates >= [ssCtrl]) then begin ! if (Shift * KeyboardShiftStates >= [ssShift]) then begin if TabIndex = 0 then *************** *** 1647,1651 **** end; end; ! inherited; end; --- 1637,1641 ---- end; end; ! inherited MouseDown(Button, Shift, X, Y); end; *************** *** 1658,1661 **** --- 1648,1652 ---- Result := inherited DrawTab(TabIndex, Rect, Active); end; + {$ENDIF VisualCLX} *************** *** 1722,1729 **** begin Result := False; ! if HandleGlobalTab and not FormKeyPreview and (Key = VK_TAB) and (GetKeyState(VK_CONTROL) < 0) then begin ThisTab := ActivePage; ! Forwrd := GetKeyState(VK_SHIFT) >= 0; Tab := ThisTab; repeat --- 1713,1721 ---- begin Result := False; ! if HandleGlobalTab and not FormKeyPreview and ! (Key = VK_TAB) and (Shift * KeyboardShiftStates >= [ssCtrl]) then begin ThisTab := ActivePage; ! Forwrd := (Shift * KeyboardShiftStates >= [ssShift]); Tab := ThisTab; repeat *************** *** 1991,1995 **** end; end; ! inherited; end; {$ENDIF VisualCLX} --- 1983,1987 ---- end; end; ! inherited MouseDown(Button, Shift, X, Y); end; {$ENDIF VisualCLX} *************** *** 2008,2011 **** --- 2000,2004 ---- {$IFDEF VCL} + procedure TJvTrackBar.CNHScroll(var Msg: TWMHScroll); begin *************** *** 2047,2050 **** --- 2040,2044 ---- SendMessage(Handle, TBM_SETTIPSIDE, ToolTipSides[FToolTipSide], 0); end; + {$ENDIF VCL} *************** *** 2497,2501 **** inherited KeyDown(Key, Shift); if ((Key = VK_SPACE) or (Key = VK_RETURN)) and MenuDblClick and IsMenuItemClick(Selected) then ! TMenuItem(Selected.Data).OnClick(TMenuItem(Selected.Data)); end; --- 2491,2495 ---- inherited KeyDown(Key, Shift); if ((Key = VK_SPACE) or (Key = VK_RETURN)) and MenuDblClick and IsMenuItemClick(Selected) then ! TMenuItem(Selected.Data).OnClick(TMenuItem(Selected.Data)); end; Index: JvTMTimeLine.pas =================================================================== RCS file: /cvsroot/jvcl/dev/JVCL3/run/JvTMTimeLine.pas,v retrieving revision 1.29 retrieving revision 1.30 diff -C2 -d -r1.29 -r1.30 *** JvTMTimeLine.pas 25 Jul 2004 05:42:26 -0000 1.29 --- JvTMTimeLine.pas 26 Jul 2004 06:18:12 -0000 1.30 *************** *** 46,54 **** JvComponent, JvExControls; - {$IFDEF VisualCLX} - resourcestring - SInvalidImage = 'Invalid Image'; - {$ENDIF VisualCLX} - type TJvTLSelFrame = class(TPersistent) --- 46,49 ---- *************** *** 347,350 **** --- 342,350 ---- {$ENDIF LINUX} + {$IFDEF VisualCLX} + resourcestring + SInvalidImage = 'Invalid Image'; + {$ENDIF VisualCLX} + const cMagic = 'Jv.TMTIMELINE1'; Index: JvCheckTreeView.pas =================================================================== RCS file: /cvsroot/jvcl/dev/JVCL3/run/JvCheckTreeView.pas,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** JvCheckTreeView.pas 20 Jul 2004 14:31:02 -0000 1.15 --- JvCheckTreeView.pas 26 Jul 2004 06:18:10 -0000 1.16 *************** *** 145,148 **** --- 145,151 ---- implementation + uses + JvConsts; + procedure ToggleTreeViewCheckBoxes(Node: TTreeNode; AUnChecked, AChecked, ARadioUnchecked, ARadioChecked: Integer); *************** *** 315,319 **** begin inherited KeyDown(Key, Shift); ! if (CheckBoxOptions.Style = cbsJVCL) and (Key = VK_SPACE) and Assigned(Selected) then InternalSetChecked(Selected, not Checked[Selected], CheckBoxOptions.CascadeLevels); end; --- 318,323 ---- begin inherited KeyDown(Key, Shift); ! if (CheckBoxOptions.Style = cbsJVCL) and Assigned(Selected) and ! (Key = VK_SPACE) and (Shift * KeyboardShiftStates = []) then InternalSetChecked(Selected, not Checked[Selected], CheckBoxOptions.CascadeLevels); end; *************** *** 323,327 **** with CheckBoxOptions do if (Node <> nil) and (Style = cbsJVCL) then - begin if Value then begin --- 327,330 ---- *************** *** 333,337 **** else Node.StateIndex := 0; - end; end; --- 336,339 ---- Index: JvPaintFX.pas =================================================================== RCS file: /cvsroot/jvcl/dev/JVCL3/run/JvPaintFX.pas,v retrieving revision 1.27 retrieving revision 1.28 diff -C2 -d -r1.27 -r1.28 *** JvPaintFX.pas 24 Jul 2004 16:35:03 -0000 1.27 --- JvPaintFX.pas 26 Jul 2004 06:18:11 -0000 1.28 *************** *** 165,172 **** uses Math, ! JvJCLUtils, JvTypes; ! ! resourcestring ! RsESourceBitmapTooSmall = 'Source bitmap too small'; const --- 165,169 ---- uses Math, ! JvJCLUtils, JvResources, JvTypes; const Index: JvResources.pas =================================================================== RCS file: /cvsroot/jvcl/dev/JVCL3/run/JvResources.pas,v retrieving revision 1.77 retrieving revision 1.78 diff -C2 -d -r1.77 -r1.78 *** JvResources.pas 25 Jul 2004 15:18:41 -0000 1.77 --- JvResources.pas 26 Jul 2004 06:18:11 -0000 1.78 *************** *** 107,110 **** --- 107,112 ---- RsECircularReference = 'Circular reference not allowed'; + RsESourceBitmapTooSmall = 'Source bitmap too small'; + //=== JvAni.pas ============================================================== resourcestring *************** *** 329,332 **** --- 331,340 ---- RsEItemNotForList = 'Item does not belong to this list'; + //=== JvCombobox.pas ========================================================= + resourcestring + RsCapSelAll = '&Select all'; + RsCapDeselAll = '&Deselect all'; + RsENoMoreLength = 'Too many items selected'; + //=== JvComputerInfoEx.pas =================================================== resourcestring *************** *** 612,615 **** --- 620,628 ---- RsEInvalidCompletionMode = 'Invalid JvEditor Completion Mode'; + //=== JvEmbeddedForms.pas ==================================================== + resourcestring + RsEFormLinkSingleInstanceOnly = 'You only need one form link per form.'; + RsELinkCircularRef = 'Circular references not allowed.'; + //=== JvErrorIndicator.pas =================================================== resourcestring *************** *** 1482,1489 **** RsUnknownCaption = '(Unknown)'; - //=== JvResample.pas ========================================================= - resourcestring - RsESourceBitmapTooSmall = 'Source bitmap too small'; - //=== JvRichEdit.pas ========================================================= resourcestring --- 1495,1498 ---- Index: JvgAskListBox.pas =================================================================== RCS file: /cvsroot/jvcl/dev/JVCL3/run/JvgAskListBox.pas,v retrieving revision 1.22 retrieving revision 1.23 diff -C2 -d -r1.22 -r1.23 *** JvgAskListBox.pas 21 Jul 2004 06:01:18 -0000 1.22 --- JvgAskListBox.pas 26 Jul 2004 06:18:12 -0000 1.23 *************** *** 22,25 **** --- 22,33 ---- located at http://jvcl.sourceforge.net + Description: + ListBox-based component that provides convenient interface for + realization of the different tests for users. Component is very + useful during setup and install processes. + Items captions align in one of 9 positions. Component can display + glyphs on own items and fill background with bitmap. You can set + different fonts for selected item and for other list items. + Known Issues: -----------------------------------------------------------------------------} *************** *** 32,43 **** interface - { ListBox-based component that provides convenient interface for - realization of the different tests for users. Component is very - useful during setup and install processes. - Items captions align in one of 9 positions. Component can display - glyphs on own items and fill background with bitmap. You can set - different fonts for selected item and for other list items. - } - uses Windows, Messages, SysUtils, Classes, Graphics, Controls, Forms, --- 40,43 ---- *************** *** 79,83 **** FButtonWidth: Word; FOptions: TglAskLBOptions; - //''''''''''''''''''''''''''''''''''''''''' WallpaperBmp: TBitmap; TmpBitmap: TBitmap; --- 79,82 ---- Index: JvEmbeddedForms.pas =================================================================== RCS file: /cvsroot/jvcl/dev/JVCL3/run/JvEmbeddedForms.pas,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** JvEmbeddedForms.pas 21 Jul 2004 06:01:02 -0000 1.8 --- JvEmbeddedForms.pas 26 Jul 2004 06:18:11 -0000 1.9 *************** *** 48,52 **** FAlwaysVisible: Boolean; FPaintProcedure: TJvEmbeddedPaintProcedure; - procedure DrawFormImage; procedure SetLinkedForm; --- 48,51 ---- *************** *** 56,73 **** protected procedure Paint; override; - procedure InitLinkedForm; virtual; procedure ClearLinkedForm; virtual; procedure Notification(AComponent: TComponent; Operation: TOperation); override; - public procedure DockLinkedForm; virtual; procedure UndockLinkedForm(ABorderStyle: TFormBorderStyle; APosition: TPosition); virtual; ! function IsLinkedFormDocked:Boolean; property LinkedForm: TForm read FLinkedForm; - published property AlwaysVisible: Boolean read FAlwaysVisible write FAlwaysVisible; - property FormLink: TJvEmbeddedFormLink read FLink write SetFormLink; property Align; --- 55,68 ---- protected procedure Paint; override; procedure InitLinkedForm; virtual; procedure ClearLinkedForm; virtual; procedure Notification(AComponent: TComponent; Operation: TOperation); override; public procedure DockLinkedForm; virtual; procedure UndockLinkedForm(ABorderStyle: TFormBorderStyle; APosition: TPosition); virtual; ! function IsLinkedFormDocked: Boolean; property LinkedForm: TForm read FLinkedForm; published property AlwaysVisible: Boolean read FAlwaysVisible write FAlwaysVisible; property FormLink: TJvEmbeddedFormLink read FLink write SetFormLink; property Align; *************** *** 80,86 **** property ShowHint; property Visible; - - - property OnClick; property OnDblClick; --- 75,78 ---- *************** *** 138,148 **** uses ! SysUtils, Graphics, Controls; ! ! resourcestring ! RsEFormLinkSingleInstanceOnly = 'You only need one form link per form.'; ! RsELinkCircularRef = 'Circular references not allowed.'; ! //=== { TJvEmbeddedFormLink } ================================================= constructor TJvEmbeddedFormLink.Create(AOwner: TComponent); --- 130,137 ---- uses ! SysUtils, Graphics, Controls, ! JvResources; ! //=== { TJvEmbeddedFormLink } ================================================ constructor TJvEmbeddedFormLink.Create(AOwner: TComponent); *************** *** 157,161 **** end; ! //=== { TJvEmbeddedFormPanel } ================================================ procedure TJvEmbeddedFormPanel.Paint; --- 146,150 ---- end; ! //=== { TJvEmbeddedFormPanel } =============================================== procedure TJvEmbeddedFormPanel.Paint; *************** *** 202,205 **** --- 191,195 ---- procedure TJvEmbeddedFormPanel.UpdateLinkedForm; + // (rom) a really bad name. Owner in name, but uses Parent. function IsOwnerFormActive: Boolean; var *************** *** 211,214 **** --- 201,205 ---- Result := (FParent is TForm) and TForm(FParent).Active; end; + begin if (FLinkedForm.Parent <> Self) and (FLinkedForm.Parent <> nil) and IsOwnerFormActive then *************** *** 261,265 **** else if Value.Owner = Owner then ! raise Exception.Create(RsELinkCircularRef) else begin --- 252,256 ---- else if Value.Owner = Owner then ! raise Exception.CreateRes(@RsELinkCircularRef) else begin *************** *** 281,285 **** begin inherited Notification(AComponent, Operation); ! if (Operation = opRemove) then begin if AComponent = FLinkedForm then --- 272,276 ---- begin inherited Notification(AComponent, Operation); ! if Operation = opRemove then begin if AComponent = FLinkedForm then *************** *** 290,326 **** end; - //=== { TJvEmbeddedInstanceFormPanel } ======================================== - - procedure TJvEmbeddedInstanceFormPanel.CreateFormInstance; - begin - FLinkedForm := FFormClass.Create(Self); - FFormClass := nil; - FPaintProcedure := DefaultPaint; - SetLinkedForm; - end; - - procedure TJvEmbeddedInstanceFormPanel.ClearLinkedForm; - begin - if not (csDesigning in ComponentState) then - FLinkedForm.Free; - - FFormClass := nil; - inherited ClearLinkedForm; - end; - - procedure TJvEmbeddedInstanceFormPanel.InitLinkedForm; - begin - if csDesigning in ComponentState then - inherited InitLinkedForm - else - begin - FreeAndNil(FLinkedForm); - FFormClass := nil; - FPaintProcedure := DefaultPaint; - FFormClass := TFormClass((FLink.Owner as TForm).ClassType); - FPaintProcedure := CreateFormInstance; - end; - end; - procedure TJvEmbeddedFormPanel.DockLinkedForm; begin --- 281,284 ---- *************** *** 337,341 **** procedure TJvEmbeddedFormPanel.UndockLinkedForm(ABorderStyle: TFormBorderStyle; APosition: TPosition); ! var B:Boolean; begin if (FLinkedForm <> nil) and (FLinkedForm.Parent = Self) then --- 295,300 ---- procedure TJvEmbeddedFormPanel.UndockLinkedForm(ABorderStyle: TFormBorderStyle; APosition: TPosition); ! var ! B: Boolean; begin if (FLinkedForm <> nil) and (FLinkedForm.Parent = Self) then *************** *** 346,350 **** Align := alNone; Parent := nil; ! // IMPORTANT!!! Don't set BorderStyle unless Parent = nil!!! BorderStyle := ABorderStyle; Position := APosition; --- 305,309 ---- Align := alNone; Parent := nil; ! // IMPORTANT!!! Don't set BorderStyle unless Parent = nil!!! BorderStyle := ABorderStyle; Position := APosition; *************** *** 359,364 **** --- 318,354 ---- end; + //=== { TJvEmbeddedInstanceFormPanel } ====================================== + + procedure TJvEmbeddedInstanceFormPanel.CreateFormInstance; + begin + FLinkedForm := FFormClass.Create(Self); + FFormClass := nil; + FPaintProcedure := DefaultPaint; + SetLinkedForm; + end; + + procedure TJvEmbeddedInstanceFormPanel.ClearLinkedForm; + begin + if not (csDesigning in ComponentState) then + // (rom) FreeAndNil for safety + FreeAndNil(FLinkedForm); + FFormClass := nil; + inherited ClearLinkedForm; + end; + procedure TJvEmbeddedInstanceFormPanel.InitLinkedForm; + begin + if csDesigning in ComponentState then + inherited InitLinkedForm + else + begin + FreeAndNil(FLinkedForm); + FFormClass := nil; + FPaintProcedure := DefaultPaint; + FFormClass := TFormClass((FLink.Owner as TForm).ClassType); + FPaintProcedure := CreateFormInstance; + end; + end; end. Index: JvCombobox.pas =================================================================== RCS file: /cvsroot/jvcl/dev/JVCL3/run/JvCombobox.pas,v retrieving revision 1.45 retrieving revision 1.46 diff -C2 -d -r1.45 -r1.46 *** JvCombobox.pas 25 Jul 2004 05:42:25 -0000 1.45 --- JvCombobox.pas 26 Jul 2004 06:18:11 -0000 1.46 *************** *** 371,380 **** JvItemsSearchs, JvThemes, JvConsts, JvResources; - resourcestring - // for TCheckedComboBox - sCapSelAll = '&Select all'; - sCapDeselAll = '&Deselect all'; - sNoMoreLength = 'Too many items selected'; - //=== { TJvComboBoxStrings } ================================================= --- 371,374 ---- *************** *** 1535,1540 **** FNoFocusColor := clWindow; Caption := ''; ! FCapSelAll := sCapSelAll; ! FCapDeselAll := sCapDeselAll; Height := 24; Width := 121; --- 1529,1534 ---- FNoFocusColor := clWindow; Caption := ''; ! FCapSelAll := RsCapSelAll; ! FCapDeselAll := RsCapDeselAll; Height := 24; Width := 121; *************** *** 1693,1697 **** if Length(Str) + Length(Sub) + 1 >= MAXSELLENGTH then begin ! raise Exception.Create(sNoMoreLength); Exit; end; --- 1687,1691 ---- if Length(Str) + Length(Sub) + 1 >= MAXSELLENGTH then begin ! raise Exception.CreateRes(@RsENoMoreLength); Exit; end; *************** *** 1747,1751 **** Shift: TShiftState); begin ! if Key = VK_ESCAPE then begin FPrivForm.Close; --- 1741,1745 ---- Shift: TShiftState); begin ! if (Key = VK_ESCAPE) and (Shift * KeyboardShiftStates = []) then begin FPrivForm.Close; *************** *** 2017,2026 **** function TJvCheckedComboBox.IsStoredCapDeselAll: Boolean; begin ! Result := FCapSelAll <> sCapSelAll; end; function TJvCheckedComboBox.IsStoredCapSelAll: Boolean; begin ! Result := FCapDeselAll <> sCapDeselAll; end; --- 2011,2020 ---- function TJvCheckedComboBox.IsStoredCapDeselAll: Boolean; begin ! Result := FCapSelAll <> RsCapSelAll; end; function TJvCheckedComboBox.IsStoredCapSelAll: Boolean; begin ! Result := FCapDeselAll <> RsCapDeselAll; end; Index: JvDatePickerEdit.pas =================================================================== RCS file: /cvsroot/jvcl/dev/JVCL3/run/JvDatePickerEdit.pas,v retrieving revision 1.52 retrieving revision 1.53 diff -C2 -d -r1.52 -r1.53 *** JvDatePickerEdit.pas 20 Jul 2004 14:31:06 -0000 1.52 --- JvDatePickerEdit.pas 26 Jul 2004 06:18:11 -0000 1.53 *************** *** 162,166 **** procedure CreateWnd; override; procedure DoKillFocusEvent(const ANextControl: TWinControl); override; ! procedure KeyDown(var AKey: Word; AShift: TShiftState); override; procedure KeyPress(var Key: Char); override; procedure CreatePopup; override; --- 162,166 ---- procedure CreateWnd; override; procedure DoKillFocusEvent(const ANextControl: TWinControl); override; ! procedure KeyDown(var Key: Word; Shift: TShiftState); override; procedure KeyPress(var Key: Char); override; procedure CreatePopup; override; *************** *** 315,319 **** JvJCLUtils, // StrToXxxDef {$ENDIF COMPILER5} ! JvTypes, JvResources; const --- 315,319 ---- JvJCLUtils, // StrToXxxDef {$ENDIF COMPILER5} ! JvConsts, JvTypes, JvResources; const *************** *** 767,771 **** end; ! procedure TJvCustomDatePickerEdit.KeyDown(var AKey: Word; AShift: TShiftState); var // Indicates whether FDeleting is set here from False to True. --- 767,771 ---- end; ! procedure TJvCustomDatePickerEdit.KeyDown(var Key: Word; Shift: TShiftState); var // Indicates whether FDeleting is set here from False to True. *************** *** 780,789 **** end; ! if AllowNoDate and (ShortCut(AKey, AShift) = NoDateShortcut) then ! begin ! Date := 0; ! end else ! case AKey of // VK_ESCAPE: // begin --- 780,788 ---- end; ! if AllowNoDate and (ShortCut(Key, Shift) = NoDateShortcut) then ! Date := 0 else ! if Shift * KeyboardShiftStates = [] then ! case Key of // VK_ESCAPE: // begin *************** *** 800,804 **** end; end; ! inherited KeyDown(AKey, AShift); FDeleting := FDeleting and not DeleteSetHere; end; --- 799,803 ---- end; end; ! inherited KeyDown(Key, Shift); FDeleting := FDeleting and not DeleteSetHere; end; Index: JvButton.pas =================================================================== RCS file: /cvsroot/jvcl/dev/JVCL3/run/JvButton.pas,v retrieving revision 1.47 retrieving revision 1.48 diff -C2 -d -r1.47 -r1.48 *** JvButton.pas 20 Jul 2004 09:00:41 -0000 1.47 --- JvButton.pas 26 Jul 2004 06:18:10 -0000 1.48 *************** *** 238,242 **** const KeyText: WideString): Boolean; begin ! Result := IsAccel(Key, Caption) and Enabled and (ssAlt in Shift); if Result then Click --- 238,242 ---- const KeyText: WideString): Boolean; begin ! Result := IsAccel(Key, Caption) and Enabled and (Shift * KeyboardShiftStates = [ssAlt]); if Result then Click Index: JvColorButton.pas =================================================================== RCS file: /cvsroot/jvcl/dev/JVCL3/run/JvColorButton.pas,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** JvColorButton.pas 20 Jul 2004 14:31:02 -0000 1.18 --- JvColorButton.pas 26 Jul 2004 06:18:10 -0000 1.19 *************** *** 107,111 **** uses SysUtils, ExtCtrls, ! JvColorForm, JvResources; constructor TJvColorButton.Create(AOwner: TComponent); --- 107,111 ---- uses SysUtils, ExtCtrls, ! JvConsts, JvColorForm, JvResources; constructor TJvColorButton.Create(AOwner: TComponent); *************** *** 238,244 **** case Key of VK_RETURN, VK_SPACE: ! if not ((ssAlt in Shift) or (ssCtrl in Shift)) then MouseDown(mbLeft, [], 0, 0); VK_ESCAPE: begin FColorForm.Hide; --- 238,247 ---- case Key of VK_RETURN, VK_SPACE: ! // (rom) accept Shift key pressed at max ! if Shift * KeyboardShiftStates <= [ssShift] then MouseDown(mbLeft, [], 0, 0); VK_ESCAPE: + // (rom) only accept without Shift, Alt or Ctrl down + if Shift * KeyboardShiftStates = [] then begin FColorForm.Hide; *************** *** 253,257 **** case Key of VK_RETURN, VK_SPACE: ! if not ((ssAlt in Shift) or (ssCtrl in Shift)) then MouseUp(mbLeft, [], 0, 0); end; --- 256,261 ---- case Key of VK_RETURN, VK_SPACE: ! // (rom) accept Shift key pressed at max ! if Shift * KeyboardShiftStates <= [ssShift] then MouseUp(mbLeft, [], 0, 0); end; Index: JvColorForm.pas =================================================================== RCS file: /cvsroot/jvcl/dev/JVCL3/run/JvColorForm.pas,v retrieving revision 1.22 retrieving revision 1.23 diff -C2 -d -r1.22 -r1.23 *** JvColorForm.pas 20 Jul 2004 14:31:02 -0000 1.22 --- JvColorForm.pas 26 Jul 2004 06:18:10 -0000 1.23 *************** *** 100,105 **** uses ! ExtCtrls, ! JvColorButton; constructor TJvColorForm.CreateNew(AOwner: TComponent; Dummy: Integer); --- 100,105 ---- uses ! ExtCtrls, ! JvConsts, JvColorButton; constructor TJvColorForm.CreateNew(AOwner: TComponent; Dummy: Integer); *************** *** 246,250 **** Shift: TShiftState); begin ! if Key = VK_ESCAPE then begin Hide; --- 246,250 ---- Shift: TShiftState); begin ! if (Key = VK_ESCAPE) and (Shift * KeyboardShiftStates = []) then begin Hide; Index: JvImageList.pas =================================================================== RCS file: /cvsroot/jvcl/dev/JVCL3/run/JvImageList.pas,v retrieving revision 1.37 retrieving revision 1.38 diff -C2 -d -r1.37 -r1.38 *** JvImageList.pas 23 Jul 2004 07:31:23 -0000 1.37 --- JvImageList.pas 26 Jul 2004 06:18:11 -0000 1.38 *************** *** 474,478 **** // (usc) remove when MappedResourceBitmap support is finished if AKind = ikMappedResourceBitmap then ! raise EJvImageListError.CreateFmt(RsNotSupportedItemKind, ['ikMappedResourceBitmap']); if FKind <> AKind then --- 474,478 ---- // (usc) remove when MappedResourceBitmap support is finished if AKind = ikMappedResourceBitmap then ! raise EJvImageListError.CreateResFmt(@RsNotSupportedItemKind, ['ikMappedResourceBitmap']); if FKind <> AKind then |