From: Peter T. <pe...@us...> - 2002-10-09 22:47:52
|
Update of /cvsroot/jvcl/jvcl/source In directory usw-pr-cvs1:/tmp/cvs-serv10088/source Modified Files: JvCurrEdit.Res JvCurrEdit.pas JvDBCtrl.Res JvDBCtrl.pas JvDice.Res JvDice.pas JvPickDate.Res JvPickDate.pas JvSwitch.Res JvSwitch.pas JvToolEdit.pas JvToolEdit.res JvxCtrls.Res JvxCtrls.pas JvxSlider.Res JvxSlider.pas Log Message: Renamed resources (added JV_ prefix) to make it possible to install side by side with original RxLib Index: JvCurrEdit.Res =================================================================== RCS file: /cvsroot/jvcl/jvcl/source/JvCurrEdit.Res,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 Binary files /tmp/cvsDLpBZH and /tmp/cvsqrgZCf differ Index: JvCurrEdit.pas =================================================================== RCS file: /cvsroot/jvcl/jvcl/source/JvCurrEdit.pas,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** JvCurrEdit.pas 20 Jul 2002 11:52:35 -0000 1.3 --- JvCurrEdit.pas 9 Oct 2002 22:47:48 -0000 1.4 *************** *** 304,308 **** const ! sCalcBmp = 'CEDITBMP'; { Numeric editor button glyph } CalcBitmap: TBitmap = nil; --- 304,308 ---- const ! sCalcBmp = 'JV_CEDITBMP'; { Numeric editor button glyph } CalcBitmap: TBitmap = nil; Index: JvDBCtrl.Res =================================================================== RCS file: /cvsroot/jvcl/jvcl/source/JvDBCtrl.Res,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 Binary files /tmp/cvsm9Cu6M and /tmp/cvsMD0XZp differ Index: JvDBCtrl.pas =================================================================== RCS file: /cvsroot/jvcl/jvcl/source/JvDBCtrl.pas,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** JvDBCtrl.pas 11 Sep 2002 04:23:13 -0000 1.4 --- JvDBCtrl.pas 9 Oct 2002 22:47:48 -0000 1.5 *************** *** 813,822 **** const GridBmpNames: array[TGridPicture] of PChar = ! ('DBG_BLOB', 'DBG_MEMO', 'DBG_PICT', 'DBG_OLE', 'DBG_OBJECT', 'DBG_DATA', ! 'DBG_NOTEMPTY', 'DBG_SMDOWN', 'DBG_SMUP'); GridBitmaps: array[TGridPicture] of TBitmap = (nil, nil, nil, nil, nil, nil, nil, nil, nil); ! bmMultiDot = 'DBG_MSDOT'; ! bmMultiArrow = 'DBG_MSARROW'; function GetGridBitmap(BmpType: TGridPicture): TBitmap; --- 813,822 ---- const GridBmpNames: array[TGridPicture] of PChar = ! ('JV_DBG_BLOB', 'JV_DBG_MEMO', 'JV_DBG_PICT', 'JV_DBG_OLE', 'JV_DBG_OBJECT', 'JV_DBG_DATA', ! 'JV_DBG_NOTEMPTY', 'JV_DBG_SMDOWN', 'JV_DBG_SMUP'); GridBitmaps: array[TGridPicture] of TBitmap = (nil, nil, nil, nil, nil, nil, nil, nil, nil); ! bmMultiDot = 'JV_DBG_MSDOT'; ! bmMultiArrow = 'JV_DBG_MSARROW'; function GetGridBitmap(BmpType: TGridPicture): TBitmap; Index: JvDice.Res =================================================================== RCS file: /cvsroot/jvcl/jvcl/source/JvDice.Res,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 Binary files /tmp/cvscjIBMU and /tmp/cvsUpq4fF differ Index: JvDice.pas =================================================================== RCS file: /cvsroot/jvcl/jvcl/source/JvDice.pas,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** JvDice.pas 20 Jul 2002 11:52:35 -0000 1.3 --- JvDice.pas 9 Oct 2002 22:47:48 -0000 1.4 *************** *** 149,153 **** const ResName: array [TJvDiceValue] of PChar = ! ('DICE1', 'DICE2', 'DICE3', 'DICE4', 'DICE5', 'DICE6'); { TJvDice } --- 149,153 ---- const ResName: array [TJvDiceValue] of PChar = ! ('JV_DICE1', 'JV_DICE2', 'JV_DICE3', 'JV_DICE4', 'JV_DICE5', 'JV_DICE6'); { TJvDice } Index: JvPickDate.Res =================================================================== RCS file: /cvsroot/jvcl/jvcl/source/JvPickDate.Res,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 Binary files /tmp/cvsEI7L5X and /tmp/cvsEfgAUL differ Index: JvPickDate.pas =================================================================== RCS file: /cvsroot/jvcl/jvcl/source/JvPickDate.pas,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** JvPickDate.pas 4 Oct 2002 19:36:38 -0000 1.4 --- JvPickDate.pas 9 Oct 2002 22:47:48 -0000 1.5 *************** *** 72,76 **** const ! SBtnGlyphs: array[0..3] of PChar = ('PREV2', 'PREV1', 'NEXT1', 'NEXT2'); procedure FontSetDefault(AFont: TFont); --- 72,76 ---- const ! SBtnGlyphs: array[0..3] of PChar = ('JV_PREV2', 'JV_PREV1', 'JV_NEXT1', 'JV_NEXT2'); procedure FontSetDefault(AFont: TFont); Index: JvSwitch.Res =================================================================== RCS file: /cvsroot/jvcl/jvcl/source/JvSwitch.Res,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 Binary files /tmp/cvscgHIK1 and /tmp/cvsYFkveT differ Index: JvSwitch.pas =================================================================== RCS file: /cvsroot/jvcl/jvcl/source/JvSwitch.pas,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** JvSwitch.pas 20 Jul 2002 11:52:36 -0000 1.3 --- JvSwitch.pas 9 Oct 2002 22:47:48 -0000 1.4 *************** *** 145,149 **** implementation ! uses JvVCLUtils; {$IFDEF WIN32} --- 145,149 ---- implementation ! uses JvVCLUtils; {$IFDEF WIN32} *************** *** 154,158 **** const ! ResName: array [Boolean] of PChar = ('SWITCH_OFF', 'SWITCH_ON'); BorderStyles: array[TBorderStyle] of Longint = (0, WS_BORDER); --- 154,158 ---- const ! ResName: array [Boolean] of PChar = ('JV_SWITCH_OFF', 'JV_SWITCH_ON'); BorderStyles: array[TBorderStyle] of Longint = (0, WS_BORDER); Index: JvToolEdit.pas =================================================================== RCS file: /cvsroot/jvcl/jvcl/source/JvToolEdit.pas,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** JvToolEdit.pas 5 Oct 2002 11:49:43 -0000 1.8 --- JvToolEdit.pas 9 Oct 2002 22:47:48 -0000 1.9 *************** *** 801,806 **** const ! sFileBmp = 'FEDITBMP'; { Filename and directory editor button glyph } ! sDateBmp = 'DEDITBMP'; { Date editor button glyph } { Utility routines } --- 801,806 ---- const ! sFileBmp = 'JV_FEDITBMP'; { Filename and directory editor button glyph } ! sDateBmp = 'JV_DEDITBMP'; { Date editor button glyph } { Utility routines } Index: JvToolEdit.res =================================================================== RCS file: /cvsroot/jvcl/jvcl/source/JvToolEdit.res,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 Binary files /tmp/cvskDJbC9 and /tmp/cvsWuGKK8 differ Index: JvxCtrls.Res =================================================================== RCS file: /cvsroot/jvcl/jvcl/source/JvxCtrls.Res,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 Binary files /tmp/cvsjyHl5b and /tmp/cvss6XnTd differ Index: JvxCtrls.pas =================================================================== RCS file: /cvsroot/jvcl/jvcl/source/JvxCtrls.pas,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** JvxCtrls.pas 19 Sep 2002 07:44:18 -0000 1.5 --- JvxCtrls.pas 9 Oct 2002 22:47:48 -0000 1.6 *************** *** 1976,1980 **** if FCheckBitmap = nil then begin FCheckBitmap := TBitmap.Create; ! FCheckBitmap.Handle := LoadBitmap(hInstance, 'CHECK_IMAGES'); end; Result := FCheckBitmap; --- 1976,1980 ---- if FCheckBitmap = nil then begin FCheckBitmap := TBitmap.Create; ! FCheckBitmap.Handle := LoadBitmap(hInstance, 'JV_CHECK_IMAGES'); end; Result := FCheckBitmap; Index: JvxSlider.Res =================================================================== RCS file: /cvsroot/jvcl/jvcl/source/JvxSlider.Res,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 Binary files /tmp/cvsXHdvUi and /tmp/cvseDBCxr differ Index: JvxSlider.pas =================================================================== RCS file: /cvsroot/jvcl/jvcl/source/JvxSlider.pas,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** JvxSlider.pas 20 Jul 2002 11:52:36 -0000 1.4 --- JvxSlider.pas 9 Oct 2002 22:47:48 -0000 1.5 *************** *** 294,298 **** const ImagesResNames: array[TSliderImage] of PChar = ! ('W95_HTB', 'W95_HRL', 'W95_VTB', 'W95_VRL'); Indent = 6; JumpInterval = 400; --- 294,298 ---- const ImagesResNames: array[TSliderImage] of PChar = ! ('JV_W95_HTB', 'JV_W95_HRL', 'JV_W95_VTB', 'JV_W95_VRL'); Indent = 6; JumpInterval = 400; |