Menu
▾
▴
[JVCL-Checkins] dev/JVCL3/qrun JvQButton.pas,1.11,1.12 JvQCharMap.pas,1.1,1.2 JvQComputerInfo.pas,1.1,1.2 JvQCsvData.pas,1.13,1.14 JvQEdit.pas,1.8,1.9 JvQFormPlacement.pas,1.5,1.6 JvQGammaPanel.pas,1.8,1.9 JvQGradientCaption.pas,1.3,1.4 JvQImageList.pas,1.7,1.8 JvQImageListViewer.pas,1.5,1.6 JvQImagesViewer.pas,1.5,1.6 JvQJVCLUtils.pas,1.14,1.15 JvQLookOut.pas,1.11,1.12 JvQMRUManager.pas,1.3,1.4 JvQOfficeColorPanel.pas,1.10,1.11 JvQOutlookBar.pas,1.7,1.8 JvQPageList.pas,1.5,1.6 JvQPatchForm.pas,1.5,1.6 - Updated
Update of /cvsroot/jvcl/dev/JVCL3/qrun In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17021/JVCL3/qrun Modified Files: JvQButton.pas JvQCharMap.pas JvQComputerInfo.pas JvQCsvData.pas JvQEdit.pas JvQFormPlacement.pas JvQGammaPanel.pas JvQGradientCaption.pas JvQImageList.pas JvQImageListViewer.pas JvQImagesViewer.pas JvQJVCLUtils.pas JvQLookOut.pas JvQMRUManager.pas JvQOfficeColorPanel.pas JvQOutlookBar.pas JvQPageList.pas JvQPatchForm.pas Log Message: Updated Index: JvQGammaPanel.pas =================================================================== RCS file: /cvsroot/jvcl/dev/JVCL3/qrun/JvQGammaPanel.pas,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** JvQGammaPanel.pas 6 May 2004 13:37:42 -0000 1.8 --- JvQGammaPanel.pas 16 May 2004 10:05:33 -0000 1.9 *************** *** 77,81 **** public constructor Create(AOwner: TComponent); override; - destructor Destroy; override; published property Align; --- 77,80 ---- *************** *** 407,415 **** end; - destructor TJvGammaPanel.Destroy; - begin - inherited Destroy; - end; - end. --- 406,409 ---- Index: JvQOutlookBar.pas =================================================================== RCS file: /cvsroot/jvcl/dev/JVCL3/qrun/JvQOutlookBar.pas,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** JvQOutlookBar.pas 12 May 2004 23:35:34 -0000 1.7 --- JvQOutlookBar.pas 16 May 2004 10:05:34 -0000 1.8 *************** *** 47,52 **** ! Types, QControls, QButtons, QGraphics, QTypes, ! QImgList, QForms, QStdCtrls, QExtCtrls, QWindows, JvQThemes, JvQComponent, JvQExButtons; --- 47,52 ---- ! QControls, QButtons, QGraphics, QTypes, QImgList, QForms, QStdCtrls, ! QExtCtrls, Types, QWindows, JvQThemes, JvQComponent, JvQExButtons; Index: JvQButton.pas =================================================================== RCS file: /cvsroot/jvcl/dev/JVCL3/qrun/JvQButton.pas,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** JvQButton.pas 13 May 2004 23:39:16 -0000 1.11 --- JvQButton.pas 16 May 2004 10:05:33 -0000 1.12 *************** *** 211,220 **** end; ! // == TJvCustomGraphicButton =================================================== constructor TJvCustomGraphicButton.Create(AOwner: TComponent); begin inherited Create(AOwner); ! ControlStyle := ControlStyle - [csOpaque, csDoubleClicks,csCaptureMouse]; FStates := []; SetBounds(0, 0, 40, 40); --- 211,221 ---- end; ! //=== TJvCustomGraphicButton ================================================= constructor TJvCustomGraphicButton.Create(AOwner: TComponent); begin inherited Create(AOwner); ! ControlStyle := ControlStyle - ! [csOpaque, csDoubleClicks , csCaptureMouse ]; FStates := []; SetBounds(0, 0, 40, 40); *************** *** 328,333 **** end; ! procedure TJvCustomGraphicButton.MouseMove(Shift: TShiftState; X, ! Y: Integer); begin inherited MouseMove(Shift, X, Y); --- 329,334 ---- end; ! procedure TJvCustomGraphicButton.MouseMove(Shift: TShiftState; ! X, Y: Integer); begin inherited MouseMove(Shift, X, Y); *************** *** 582,586 **** end; ! // == TJvCustomButton ========================================================== constructor TJvCustomButton.Create(AOwner: TComponent); --- 583,587 ---- end; ! //=== TJvCustomButton ======================================================== constructor TJvCustomButton.Create(AOwner: TComponent); *************** *** 760,764 **** end; ! // == TJvDropDownButton =================================================== constructor TJvDropDownButton.Create(AOwner: TComponent); --- 761,765 ---- end; ! //=== TJvDropDownButton ====================================================== constructor TJvDropDownButton.Create(AOwner: TComponent); Index: JvQLookOut.pas =================================================================== RCS file: /cvsroot/jvcl/dev/JVCL3/qrun/JvQLookOut.pas,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** JvQLookOut.pas 15 May 2004 00:50:27 -0000 1.11 --- JvQLookOut.pas 16 May 2004 10:05:33 -0000 1.12 *************** *** 1199,1203 **** begin Brush.Color := clBlack; ! FrameRect(Canvas, R); end; --- 1199,1203 ---- begin Brush.Color := clBlack; ! FrameRect( Canvas, R); end; Index: JvQGradientCaption.pas =================================================================== RCS file: /cvsroot/jvcl/dev/JVCL3/qrun/JvQGradientCaption.pas,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** JvQGradientCaption.pas 14 May 2004 22:45:25 -0000 1.3 --- JvQGradientCaption.pas 16 May 2004 10:05:33 -0000 1.4 *************** *** 34,43 **** uses ! ! QClasses, QGraphics, QControls, QForms, QMenus, JvQJCLUtils, JvQWndProcHook; ! ! type --- 34,42 ---- uses ! ! QClasses, QGraphics, QControls, QForms, QMenus, JvQJCLUtils, JvQWndProcHook; ! type Index: JvQImageList.pas =================================================================== RCS file: /cvsroot/jvcl/dev/JVCL3/qrun/JvQImageList.pas,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** JvQImageList.pas 14 May 2004 22:45:25 -0000 1.7 --- JvQImageList.pas 16 May 2004 10:05:33 -0000 1.8 *************** *** 45,49 **** QGraphics, QControls, QImgList, ! SysUtils, Classes, JvQFinalize; type --- 45,50 ---- QGraphics, QControls, QImgList, ! SysUtils, Classes, ! JvQFinalize; type *************** *** 672,676 **** if (FFileName <> '') and FileExists(FFileName) ! {$IFDEF LINUX} and not DirectoryExists(FFileName){$ENDIF} then try FPicture.LoadFromFile(FFileName); --- 673,677 ---- if (FFileName <> '') and FileExists(FFileName) ! {$IFDEF LINUX} and not DirectoryExists(FFileName) {$ENDIF} then try FPicture.LoadFromFile(FFileName); *************** *** 949,953 **** procedure TJvImageList.ItemListError; begin ! raise EJvImageListError.CreateFmt(RsEWrongImageListMode, ['imItemList']); end; --- 950,954 ---- procedure TJvImageList.ItemListError; begin ! raise EJvImageListError.CreateResFmt(@RsEWrongImageListMode, ['imItemList']); end; Index: JvQComputerInfo.pas =================================================================== RCS file: /cvsroot/jvcl/dev/JVCL3/qrun/JvQComputerInfo.pas,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** JvQComputerInfo.pas 15 May 2004 21:48:55 -0000 1.1 --- JvQComputerInfo.pas 16 May 2004 10:05:33 -0000 1.2 *************** *** 59,63 **** uses ! Windows, SysUtils, Classes, Registry, MMSystem, Controls, JvQComponent, JvQTypes; --- 59,64 ---- uses ! Windows, SysUtils, Classes, Registry, MMSystem, ! JvQComponent, JvQTypes; Index: JvQPageList.pas =================================================================== RCS file: /cvsroot/jvcl/dev/JVCL3/qrun/JvQPageList.pas,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** JvQPageList.pas 4 May 2004 23:48:09 -0000 1.5 --- JvQPageList.pas 16 May 2004 10:05:34 -0000 1.6 *************** *** 34,42 **** interface uses SysUtils, Classes, ! QGraphics, QControls, Types, Qt, QWindows, JvQComponent, JvQThemes; --- 34,43 ---- interface + uses SysUtils, Classes, ! Types, QGraphics, QControls, Qt, QWindows, JvQComponent, JvQThemes; *************** *** 333,347 **** if not Enabled then begin ! ! ! SetBkMode(Handle, QWindows.TRANSPARENT); ! Canvas.Font.Color := clHighlightText; SetPainterFont(Handle, Canvas.Font); DrawText(Handle, PChar(S), Length(S), ARect, GetDesignCaptionFlags(PageList.ShowDesignCaption) or DT_SINGLELINE); OffsetRect(ARect, -1, -1); Canvas.Font.Color := clGrayText; end; SetPainterFont(Handle, Canvas.Font); DrawText(Handle, PChar(S), Length(S), ARect, GetDesignCaptionFlags(PageList.ShowDesignCaption) or DT_SINGLELINE); InflateRect(ARect, 4, 4); --- 334,350 ---- if not Enabled then begin ! Canvas.Font.Color := clHighlightText; + SetPainterFont(Handle, Canvas.Font); + // SetBkMode(Handle, QWindows.TRANSPARENT); + DrawText(Handle, PChar(S), Length(S), ARect, GetDesignCaptionFlags(PageList.ShowDesignCaption) or DT_SINGLELINE); OffsetRect(ARect, -1, -1); Canvas.Font.Color := clGrayText; end; + SetPainterFont(Handle, Canvas.Font); + DrawText(Handle, PChar(S), Length(S), ARect, GetDesignCaptionFlags(PageList.ShowDesignCaption) or DT_SINGLELINE); InflateRect(ARect, 4, 4); *************** *** 436,440 **** end; end ! else if not Showing then begin try --- 439,444 ---- end; end ! else ! if not Showing then begin try *************** *** 671,675 **** if (ActivePageIndex < PageCount - 1) and (PageCount > 1) then ActivePageIndex := ActivePageIndex + 1 ! else if PageCOunt > 0 then ActivePageIndex := 0 else --- 675,680 ---- if (ActivePageIndex < PageCount - 1) and (PageCount > 1) then ActivePageIndex := ActivePageIndex + 1 ! else ! if PageCount > 0 then ActivePageIndex := 0 else *************** *** 679,683 **** procedure TJvCustomPageList.PrevPage; begin ! if (ActivePageIndex > 0) then ActivePageIndex := ActivePageIndex - 1 else --- 684,688 ---- procedure TJvCustomPageList.PrevPage; begin ! if ActivePageIndex > 0 then ActivePageIndex := ActivePageIndex - 1 else Index: JvQFormPlacement.pas =================================================================== RCS file: /cvsroot/jvcl/dev/JVCL3/qrun/JvQFormPlacement.pas,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** JvQFormPlacement.pas 15 May 2004 23:59:40 -0000 1.5 --- JvQFormPlacement.pas 16 May 2004 10:05:33 -0000 1.6 *************** *** 250,254 **** --- 250,257 ---- uses + + QConsts, + JvQJCLUtils, JvQPropertyStorage; *************** *** 561,565 **** if Options <> [fpActiveControl] then begin ! JvQJVCLUtils.InternalSaveFormPlacement(Form, AppStorage, AppStoragePath, Options); AppStorage.WriteInteger(AppStoragePath + siVisible, Ord(FDestroying)); if (fpActiveControl in Options) and (Form.ActiveControl <> nil) then --- 564,568 ---- if Options <> [fpActiveControl] then begin ! InternalSaveFormPlacement(Form, AppStorage, AppStoragePath, Options); AppStorage.WriteInteger(AppStoragePath + siVisible, Ord(FDestroying)); if (fpActiveControl in Options) and (Form.ActiveControl <> nil) then *************** *** 574,578 **** if Owner is TCustomForm then begin ! JvQJVCLUtils.InternalRestoreFormPlacement(Form, AppStorage, AppStoragePath, Options); end; NotifyLinks(poRestore); --- 577,581 ---- if Owner is TCustomForm then begin ! InternalRestoreFormPlacement(Form, AppStorage, AppStoragePath, Options); end; NotifyLinks(poRestore); Index: JvQOfficeColorPanel.pas =================================================================== RCS file: /cvsroot/jvcl/dev/JVCL3/qrun/JvQOfficeColorPanel.pas,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** JvQOfficeColorPanel.pas 6 May 2004 13:37:42 -0000 1.10 --- JvQOfficeColorPanel.pas 16 May 2004 10:05:33 -0000 1.11 *************** *** 48,52 **** const - MaxColorButtonNumber = 40; --- 48,51 ---- *************** *** 56,61 **** Tag_OtherHint = 3; - {------------------------------------------------------------------------------} - const MinButtonHeight = 22; MinButtonWidth = 23; --- 55,58 ---- *************** *** 87,95 **** $CC99FF, $99CCFF, $99FFFF, $CCFFCC, $FFFFCC, $FFCC99, $FF99CC, $FFFFFF); - {------------------------------------------------------------------------------} - type ! ! TJvClickColorButtonType = (cbctColorsButton,cbctAutoButton,cbctOtherButton,cbctNone); TJvPropertiesChangedEvent = procedure(Sender: TObject; PropName: string) of object; --- 84,90 ---- $CC99FF, $99CCFF, $99FFFF, $CCFFCC, $FFFFCC, $FFCC99, $FF99CC, $FFFFFF); type ! TJvClickColorButtonType = ! (cbctColorsButton, cbctAutoButton, cbctOtherButton, cbctNone); TJvPropertiesChangedEvent = procedure(Sender: TObject; PropName: string) of object; *************** *** 102,106 **** FEdgeWidth: Integer; procedure Paint; override; ! function GetEdgeWidth: integer; virtual; public constructor Create(AOwner: TComponent); override; --- 97,101 ---- FEdgeWidth: Integer; procedure Paint; override; ! function GetEdgeWidth: Integer; virtual; public constructor Create(AOwner: TComponent); override; *************** *** 111,115 **** end; ! // (ahuser) TJvColorDialog is not registered as component TJvOfficeColorDialog = class(TColorDialog) published --- 106,110 ---- end; ! // (ahuser) TJvColorDialog is not registered as component TJvOfficeColorDialog = class(TColorDialog) published *************** *** 122,133 **** FShowAutoButton: Boolean; FShowOtherButton: Boolean; ! FTopMargin: integer; ! FColorSpaceBottom: integer; ! FHoriMargin: integer; ! FColorSpace: integer; ! FColorSpaceTop: integer; ! FButtonHeight: integer; ! FColorSize: integer; ! FBottomMargin: integer; FAutoCaption: string; --- 117,128 ---- FShowAutoButton: Boolean; FShowOtherButton: Boolean; ! FTopMargin: Integer; ! FColorSpaceBottom: Integer; ! FHoriMargin: Integer; ! FColorSpace: Integer; ! FColorSpaceTop: Integer; ! FButtonHeight: Integer; ! FColorSize: Integer; ! FBottomMargin: Integer; FAutoCaption: string; *************** *** 141,145 **** procedure SetShowAutoButton(const Value: Boolean); procedure SetShowOtherButton(const Value: Boolean); ! procedure SetMeasure(const Index, Value: integer); function GetStringValue(const Index: Integer): string; procedure SetStringValue(const Index: Integer; const Value: string); --- 136,140 ---- procedure SetShowAutoButton(const Value: Boolean); procedure SetShowOtherButton(const Value: Boolean); ! procedure SetMeasure(const Index, Value: Integer); function GetStringValue(const Index: Integer): string; procedure SetStringValue(const Index: Integer; const Value: string); *************** *** 159,172 **** property ShowColorHint: Boolean read FShowColorHint write SetShowColorHint default True; ! property TopMargin: integer index Tag_TopMargin read FTopMargin write SetMeasure default MinTopMargin; ! property BottomMargin: integer index Tag_BottomMargin read FBottomMargin write SetMeasure default MinBottomMargin; ! property HoriMargin: integer index Tag_HoriMargin read FHoriMargin write SetMeasure default MinHoriMargin; ! property ColorSpace: integer index Tag_ColorSpace read FColorSpace write SetMeasure default MinColorSpace; ! property ColorSpaceTop: integer index Tag_ColorSpaceTop read FColorSpaceTop write SetMeasure default MinColorSpaceTop; ! property ColorSpaceBottom: integer index Tag_ColorSpaceBottom read FColorSpaceBottom write SetMeasure default MinColorSpaceBottom; ! property ColorSize: integer index Tag_ColorSize read FColorSize write SetMeasure default MinColorSize; ! property ButtonHeight: integer index Tag_ButtonHeight read FButtonHeight write SetMeasure default MinButtonHeight; property AutoCaption: string index Tag_AutoCaption read GetStringValue write SetStringValue; --- 154,167 ---- property ShowColorHint: Boolean read FShowColorHint write SetShowColorHint default True; ! property TopMargin: Integer index Tag_TopMargin read FTopMargin write SetMeasure default MinTopMargin; ! property BottomMargin: Integer index Tag_BottomMargin read FBottomMargin write SetMeasure default MinBottomMargin; ! property HoriMargin: Integer index Tag_HoriMargin read FHoriMargin write SetMeasure default MinHoriMargin; ! property ColorSpace: Integer index Tag_ColorSpace read FColorSpace write SetMeasure default MinColorSpace; ! property ColorSpaceTop: Integer index Tag_ColorSpaceTop read FColorSpaceTop write SetMeasure default MinColorSpaceTop; ! property ColorSpaceBottom: Integer index Tag_ColorSpaceBottom read FColorSpaceBottom write SetMeasure default MinColorSpaceBottom; ! property ColorSize: Integer index Tag_ColorSize read FColorSize write SetMeasure default MinColorSize; ! property ButtonHeight: Integer index Tag_ButtonHeight read FButtonHeight write SetMeasure default MinButtonHeight; property AutoCaption: string index Tag_AutoCaption read GetStringValue write SetStringValue; *************** *** 178,182 **** TJvCustomOfficeColorPanel = class(TJvCustomPanel) private ! FColorButtons: array[0..MaxColorButtonNumber - 1] of TJvSubColorButton; FAutoButton: TJvSubColorButton; FOtherButton: TJvColorSpeedButton; --- 173,177 ---- TJvCustomOfficeColorPanel = class(TJvCustomPanel) private ! FColorButtons: array [0..MaxColorButtonNumber - 1] of TJvSubColorButton; FAutoButton: TJvSubColorButton; FOtherButton: TJvColorSpeedButton; *************** *** 188,193 **** FSelectedColor: TColor; FWordStyle: Boolean; ! FFlat: boolean; ! Inited: boolean; FOnColorChange: TNotifyEvent; FOnColorButtonClick: TNotifyEvent; --- 183,188 ---- FSelectedColor: TColor; FWordStyle: Boolean; ! FFlat: Boolean; ! Inited: Boolean; FOnColorChange: TNotifyEvent; FOnColorButtonClick: TNotifyEvent; *************** *** 197,201 **** procedure ColorButtonClick(Sender: TObject); ! procedure SetFlat(const Value: boolean); procedure SetSelectedColor(const Value: TColor); function GetCustomColors: TStrings; --- 192,196 ---- procedure ColorButtonClick(Sender: TObject); ! procedure SetFlat(const Value: Boolean); procedure SetSelectedColor(const Value: TColor); function GetCustomColors: TStrings; *************** *** 204,208 **** function GetProperties: TJvOfficeColorPanelProperties; virtual; procedure SetProperties(const Value: TJvOfficeColorPanelProperties); virtual; - protected --- 199,202 ---- *************** *** 211,215 **** - procedure Loaded; override; procedure Resize; override; procedure Paint; override; --- 205,208 ---- *************** *** 217,226 **** procedure PropertiesChanged(Sender: TObject; PropName: string); virtual; ! procedure SetWordStyle(const Value: boolean); procedure MakeColorButtons; procedure AdjustColorButtons(); procedure SetEnabled( const Value: Boolean); override; - public constructor Create(AOwner: TComponent); override; --- 210,218 ---- procedure PropertiesChanged(Sender: TObject; PropName: string); virtual; ! procedure SetWordStyle(const Value: Boolean); procedure MakeColorButtons; procedure AdjustColorButtons(); procedure SetEnabled( const Value: Boolean); override; public constructor Create(AOwner: TComponent); override; *************** *** 235,239 **** property Color: TColor read FSelectedColor write SetSelectedColor default clBlack; ! property Flat: boolean read FFlat write SetFlat default true; property CustomColors: TStrings read GetCustomColors write SetCustomColors; --- 227,231 ---- property Color: TColor read FSelectedColor write SetSelectedColor default clBlack; ! property Flat: Boolean read FFlat write SetFlat default True; property CustomColors: TStrings read GetCustomColors write SetCustomColors; *************** *** 325,329 **** constructor TJvOfficeColorPanelProperties.Create; begin ! inherited; FShowAutoButton := True; FShowOtherButton := True; --- 317,321 ---- constructor TJvOfficeColorPanelProperties.Create; begin ! inherited Create; FShowAutoButton := True; FShowOtherButton := True; *************** *** 374,381 **** end; ! procedure TJvOfficeColorPanelProperties.SetMeasure(const Index, Value: integer); var MeasureItem: PInteger; ! MeasureConst: integer; LName: string; begin --- 366,373 ---- end; ! procedure TJvOfficeColorPanelProperties.SetMeasure(const Index, Value: Integer); var MeasureItem: PInteger; ! MeasureConst: Integer; LName: string; begin *************** *** 506,514 **** constructor TJvSubColorButton.Create(AOwner: TComponent); begin ! inherited; FEdgeWidth := 4; end; ! function TJvSubColorButton.GetEdgeWidth: integer; begin Result := Height div 5; --- 498,506 ---- constructor TJvSubColorButton.Create(AOwner: TComponent); begin ! inherited Create(AOwner); FEdgeWidth := 4; end; ! function TJvSubColorButton.GetEdgeWidth: Integer; begin Result := Height div 5; *************** *** 517,525 **** procedure TJvSubColorButton.Paint; var ! B, X, Y: integer; FColor: TColor; begin ! inherited; ! if not Visible then Exit; if Enabled then --- 509,518 ---- procedure TJvSubColorButton.Paint; var ! B, X, Y: Integer; FColor: TColor; begin ! inherited Paint; ! if not Visible then ! Exit; if Enabled then *************** *** 535,539 **** if (not Glyph.Empty) then begin ! Glyph.Transparent := true; X := (Width div 2) - 9 + Integer(FState in [TJvButtonState(bsDown)]); Y := (Height div 2) + 4 + Integer(FState in [TJvButtonState(bsDown)]); --- 528,532 ---- if (not Glyph.Empty) then begin ! Glyph.Transparent := True; X := (Width div 2) - 9 + Integer(FState in [TJvButtonState(bsDown)]); Y := (Height div 2) + 4 + Integer(FState in [TJvButtonState(bsDown)]); *************** *** 582,586 **** inherited Create(AOwner); ControlStyle := ControlStyle - [csAcceptsControls]; ! Inited := false; FSelectedColor := clBlack; --- 575,579 ---- inherited Create(AOwner); ControlStyle := ControlStyle - [csAcceptsControls]; ! Inited := False; FSelectedColor := clBlack; *************** *** 597,602 **** GroupIndex := 1; Tag := MaxColorButtonNumber + 1; ! Down := true; ! AllowAllUp := true; Color := FProperties.AutoColor; Hint := ColorToString(Color); --- 590,595 ---- GroupIndex := 1; Tag := MaxColorButtonNumber + 1; ! Down := True; ! AllowAllUp := True; Color := FProperties.AutoColor; Hint := ColorToString(Color); *************** *** 613,617 **** Color := clDefault; Hint := ColorToString(Color); ! AllowAllUp := true; Visible := False; --- 606,610 ---- Color := clDefault; Hint := ColorToString(Color); ! AllowAllUp := True; Visible := False; *************** *** 626,630 **** FOtherButton.Flat := True; Flat := True; ! SetWordStyle(true); MakeColorButtons; --- 619,623 ---- FOtherButton.Flat := True; Flat := True; ! SetWordStyle(True); MakeColorButtons; *************** *** 636,640 **** begin FProperties.Free; ! inherited; end; --- 629,633 ---- begin FProperties.Free; ! inherited Destroy; end; *************** *** 646,650 **** procedure TJvCustomOfficeColorPanel.MakeColorButtons; var ! i: integer; begin for I := 0 to MaxColorButtonNumber - 1 do --- 639,643 ---- procedure TJvCustomOfficeColorPanel.MakeColorButtons; var ! I: Integer; begin for I := 0 to MaxColorButtonNumber - 1 do *************** *** 657,661 **** Parent := Self; GroupIndex := 1; ! AllowAllUp := true; Color := SubColorButtonColors[I]; Tag := I; --- 650,654 ---- Parent := Self; GroupIndex := 1; ! AllowAllUp := True; Color := SubColorButtonColors[I]; Tag := I; *************** *** 670,676 **** procedure TJvCustomOfficeColorPanel.AdjustColorButtons(); var ! I: integer; ! ButtonLine: integer; ! TempHeight: integer; LButtonCount, LColorsButtonTop, LColorsButtonLeft: Integer; begin --- 663,669 ---- procedure TJvCustomOfficeColorPanel.AdjustColorButtons(); var ! I: Integer; ! ButtonLine: Integer; ! TempHeight: Integer; LButtonCount, LColorsButtonTop, LColorsButtonLeft: Integer; begin *************** *** 733,737 **** var ! i: integer; begin --- 726,730 ---- var ! I: Integer; begin *************** *** 740,744 **** if TComponent(Sender).Tag = FAutoButton.Tag then FClickColorButton := cbctAutoButton ! else if TComponent(Sender).Tag = FOtherButton.Tag then FClickColorButton := cbctOtherButton else --- 733,738 ---- if TComponent(Sender).Tag = FAutoButton.Tag then FClickColorButton := cbctAutoButton ! else ! if TComponent(Sender).Tag = FOtherButton.Tag then FClickColorButton := cbctOtherButton else *************** *** 766,770 **** else begin ! TJvSubColorButton(Sender).Down := true; //in clx have bug --- 760,764 ---- else begin ! TJvSubColorButton(Sender).Down := True; //in clx have bug *************** *** 780,784 **** end; ! procedure TJvCustomOfficeColorPanel.SetWordStyle(const Value: boolean); begin if FWordStyle <> Value then --- 774,778 ---- end; ! procedure TJvCustomOfficeColorPanel.SetWordStyle(const Value: Boolean); begin if FWordStyle <> Value then *************** *** 788,792 **** if FWordStyle then begin ! SetFlat(true); ButtonHeight := MinButtonHeight; --- 782,786 ---- if FWordStyle then begin ! SetFlat(True); ButtonHeight := MinButtonHeight; *************** *** 803,807 **** end; ! procedure TJvCustomOfficeColorPanel.SetFlat(const Value: boolean); begin if FFlat <> Value then --- 797,801 ---- end; ! procedure TJvCustomOfficeColorPanel.SetFlat(const Value: Boolean); begin if FFlat <> Value then *************** *** 814,818 **** procedure TJvCustomOfficeColorPanel.SetSelectedColor(const Value: TColor); var ! I: integer; begin if FSelectedColor <> Value then --- 808,812 ---- procedure TJvCustomOfficeColorPanel.SetSelectedColor(const Value: TColor); var ! I: Integer; begin if FSelectedColor <> Value then *************** *** 821,836 **** Color := Value; if FAutoButton.Color = Value then ! FAutoButton.Down := true else begin ! FAutoButton.Down := false; for I := 0 to MaxColorButtonNumber - 1 do if FColorButtons[I].Color = Value then begin ! FColorButtons[I].Down := true; Break; end else ! FColorButtons[I].Down := false; end; --- 815,830 ---- Color := Value; if FAutoButton.Color = Value then ! FAutoButton.Down := True else begin ! FAutoButton.Down := False; for I := 0 to MaxColorButtonNumber - 1 do if FColorButtons[I].Color = Value then begin ! FColorButtons[I].Down := True; Break; end else ! FColorButtons[I].Down := False; end; *************** *** 852,856 **** procedure TJvCustomOfficeColorPanel.Resize; begin ! inherited; if Inited then AdjustColorButtons(); --- 846,850 ---- procedure TJvCustomOfficeColorPanel.Resize; begin ! inherited Resize; if Inited then AdjustColorButtons(); *************** *** 859,863 **** procedure TJvCustomOfficeColorPanel.Paint; begin ! inherited; if FFlat then begin --- 853,857 ---- procedure TJvCustomOfficeColorPanel.Paint; begin ! inherited Paint; if FFlat then begin *************** *** 875,879 **** procedure TJvCustomOfficeColorPanel.SetEnabled( const Value: Boolean); var ! i: integer; begin inherited SetEnabled(Value); --- 869,873 ---- procedure TJvCustomOfficeColorPanel.SetEnabled( const Value: Boolean); var ! I: Integer; begin inherited SetEnabled(Value); *************** *** 886,905 **** procedure TJvCustomOfficeColorPanel.ShowHintChanged; var ! i: integer; begin ! inherited; FAutoButton.ShowHint := ShowHint; FOtherButton.ShowHint := ShowHint; for I := 0 to MaxColorButtonNumber - 1 do - begin FColorButtons[I].ShowHint := ShowHint; - end; - end; - - - - procedure TJvCustomOfficeColorPanel.Loaded; - begin - inherited; end; --- 880,890 ---- procedure TJvCustomOfficeColorPanel.ShowHintChanged; var ! I: Integer; begin ! inherited ShowHintChanged; FAutoButton.ShowHint := ShowHint; FOtherButton.ShowHint := ShowHint; for I := 0 to MaxColorButtonNumber - 1 do FColorButtons[I].ShowHint := ShowHint; end; *************** *** 910,914 **** procedure TJvCustomOfficeColorPanel.InitWidget; begin ! inherited; AdjustColorButtons; end; --- 895,899 ---- procedure TJvCustomOfficeColorPanel.InitWidget; begin ! inherited InitWidget; AdjustColorButtons; end; *************** *** 932,961 **** var LFlag: Boolean; ! i: integer; begin LFlag := False; if cmp(PropName, 'ShowAutoButton') or cmp(PropName, 'ShowOtherButton') then LFlag := True ! else if cmp(PropName, 'AutoCaption') then begin if Properties.AutoCaption = '' then Properties.ShowAutoButton := False; end ! else if cmp(PropName, 'OtherCaption') then begin if Properties.OtherCaption = '' then Properties.ShowOtherButton := False; end ! else if cmp(PropName, 'AutoHint') then begin FAutoButton.Hint := Properties.AutoHint; end ! else if cmp(PropName, 'OtherHint') then begin FOtherButton.Hint := Properties.OtherHint; end ! else if cmp(PropName, 'AutoColor') then FAutoButton.Color := Properties.AutoColor ! else if cmp(PropName, 'ShowColorHint') then begin FAutoButton.ShowHint := Properties.ShowColorHint; --- 917,952 ---- var LFlag: Boolean; ! I: Integer; begin LFlag := False; if cmp(PropName, 'ShowAutoButton') or cmp(PropName, 'ShowOtherButton') then LFlag := True ! else ! if cmp(PropName, 'AutoCaption') then begin if Properties.AutoCaption = '' then Properties.ShowAutoButton := False; end ! else ! if cmp(PropName, 'OtherCaption') then begin if Properties.OtherCaption = '' then Properties.ShowOtherButton := False; end ! else ! if cmp(PropName, 'AutoHint') then begin FAutoButton.Hint := Properties.AutoHint; end ! else ! if cmp(PropName, 'OtherHint') then begin FOtherButton.Hint := Properties.OtherHint; end ! else ! if cmp(PropName, 'AutoColor') then FAutoButton.Color := Properties.AutoColor ! else ! if cmp(PropName, 'ShowColorHint') then begin FAutoButton.ShowHint := Properties.ShowColorHint; Index: JvQCharMap.pas =================================================================== RCS file: /cvsroot/jvcl/dev/JVCL3/qrun/JvQCharMap.pas,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** JvQCharMap.pas 15 May 2004 21:48:55 -0000 1.1 --- JvQCharMap.pas 16 May 2004 10:05:33 -0000 1.2 *************** *** 266,272 **** procedure KeyDown(var Key: Word; Shift: TShiftState); override; function DoMouseWheelDown(Shift: TShiftState; ! const MousePos: TPoint): Boolean; override; function DoMouseWheelUp(Shift: TShiftState; ! const MousePos: TPoint): Boolean; override; function InGridRange(ACol, ARow:Integer):Boolean;virtual; function InCharRange(AChar:WideChar):Boolean;virtual; --- 266,272 ---- procedure KeyDown(var Key: Word; Shift: TShiftState); override; function DoMouseWheelDown(Shift: TShiftState; ! const MousePos: TPoint): Boolean; override; function DoMouseWheelUp(Shift: TShiftState; ! const MousePos: TPoint): Boolean; override; function InGridRange(ACol, ARow:Integer):Boolean;virtual; function InCharRange(AChar:WideChar):Boolean;virtual; *************** *** 409,413 **** procedure BoundsChanged; override; ! procedure SetParent(const AParent: TWinControl); override; public constructor Create(AOwner: TComponent); override; --- 409,413 ---- procedure BoundsChanged; override; ! procedure SetParent( const AParent: TWinControl); override; public constructor Create(AOwner: TComponent); override; *************** *** 593,597 **** function TJvCustomCharMap.DoMouseWheelDown(Shift: TShiftState; ! constMousePos: TPoint): Boolean; begin // ignore the return value, because inherited always returns True --- 593,597 ---- function TJvCustomCharMap.DoMouseWheelDown(Shift: TShiftState; ! const MousePos: TPoint): Boolean; begin // ignore the return value, because inherited always returns True *************** *** 604,608 **** function TJvCustomCharMap.DoMouseWheelUp(Shift: TShiftState; ! constMousePos: TPoint): Boolean; begin // ignore the return value, because inherited always returns True --- 604,608 ---- function TJvCustomCharMap.DoMouseWheelUp(Shift: TShiftState; ! const MousePos: TPoint): Boolean; begin // ignore the return value, because inherited always returns True *************** *** 1161,1165 **** ! procedure TCharZoomPanel.SetParent(const AParent: TWinControl); begin inherited SetParent(AParent); --- 1161,1165 ---- ! procedure TCharZoomPanel.SetParent( const AParent: TWinControl); begin inherited SetParent(AParent); Index: JvQPatchForm.pas =================================================================== RCS file: /cvsroot/jvcl/dev/JVCL3/qrun/JvQPatchForm.pas,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** JvQPatchForm.pas 6 May 2004 13:37:42 -0000 1.5 --- JvQPatchForm.pas 16 May 2004 10:05:34 -0000 1.6 *************** *** 177,181 **** FPatch.Add('end%' + IntToStr(iCount)); end ! else if res2 > res1 then begin //g>f patched>original --- 177,182 ---- FPatch.Add('end%' + IntToStr(iCount)); end ! else ! if res2 > res1 then begin //g>f patched>original Index: JvQEdit.pas =================================================================== RCS file: /cvsroot/jvcl/dev/JVCL3/qrun/JvQEdit.pas,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** JvQEdit.pas 12 May 2004 23:35:33 -0000 1.8 --- JvQEdit.pas 16 May 2004 10:05:33 -0000 1.9 *************** *** 85,89 **** FNullPixmap: QPixmapH; ! function GetPasswordChar: Char; procedure SetAlignment(Value: TAlignment); --- 85,91 ---- FNullPixmap: QPixmapH; ! FEmptyValue: string; ! FIsEmptyValue: boolean; ! FEmptyFontColor, FOldFontColor: TColor; function GetPasswordChar: Char; procedure SetAlignment(Value: TAlignment); *************** *** 94,100 **** procedure SetHotTrack(const Value: Boolean); ! procedure SetGroupIndex(const Value: Integer); function GetFlat: Boolean; ! procedure SetAutoHint(const Value: Boolean); protected procedure DoClipboardCut; override; --- 96,103 ---- procedure SetHotTrack(const Value: Boolean); ! procedure SetEmptyValue(const Value: string); ! procedure SetGroupIndex(Value: Integer); function GetFlat: Boolean; ! procedure SetAutoHint(Value: Boolean); protected procedure DoClipboardCut; override; *************** *** 114,118 **** --- 117,126 ---- + procedure DoEnter; override; + procedure DoExit; override; + procedure DoEmptyValueEnter; virtual; + procedure DoEmptyValueExit; virtual; + procedure InitWidget; override; procedure Paint; override; procedure TextChanged; override; *************** *** 139,143 **** property AutoHint: Boolean read FAutoHint write SetAutoHint default False; property Caret: TJvCaret read FCaret write SetCaret; ! property HotTrack: Boolean read FHotTrack write SetHotTrack default False; property PasswordChar: Char read GetPasswordChar write SetPasswordChar; --- 147,152 ---- property AutoHint: Boolean read FAutoHint write SetAutoHint default False; property Caret: TJvCaret read FCaret write SetCaret; ! property EmptyValue: string read FEmptyValue write SetEmptyValue; ! property EmptyFontColor:TColor read FEmptyFontColor write FEmptyFontColor default clGrayText; property HotTrack: Boolean read FHotTrack write SetHotTrack default False; property PasswordChar: Char read GetPasswordChar write SetPasswordChar; *************** *** 250,253 **** --- 259,263 ---- FMaxPixel.OnChanged := MaxPixelChanged; FGroupIndex := -1; + FEmptyFontColor := clGrayText; end; *************** *** 502,506 **** end; ! procedure TJvCustomEdit.SetGroupIndex(const Value: Integer); begin FGroupIndex := Value; --- 512,516 ---- end; ! procedure TJvCustomEdit.SetGroupIndex(Value: Integer); begin FGroupIndex := Value; *************** *** 644,648 **** end; ! procedure TJvCustomEdit.SetAutoHint(const Value: Boolean); begin if FAutoHint <> Value then --- 654,658 ---- end; ! procedure TJvCustomEdit.SetAutoHint(Value: Boolean); begin if FAutoHint <> Value then *************** *** 663,666 **** --- 673,742 ---- end; + procedure TJvCustomEdit.DoEnter; + begin + inherited DoEnter; + DoEmptyValueEnter; + end; + + procedure TJvCustomEdit.DoExit; + begin + inherited DoExit; + DoEmptyValueExit; + end; + + procedure TJvCustomEdit.DoEmptyValueEnter; + begin + if EmptyValue <> '' then + begin + if FIsEmptyValue then + begin + Text := ''; + FIsEmptyValue := false; + if not (csDesigning in ComponentState) then + Font.Color := FOldFontColor; + end; + end; + end; + + procedure TJvCustomEdit.DoEmptyValueExit; + begin + if EmptyValue <> '' then + begin + if Text = '' then + begin + Text := EmptyValue; + FIsEmptyValue := true; + if not (csDesigning in ComponentState) then + begin + FOldFontColor := Font.Color; + Font.Color := FEmptyFontColor; + end; + end; + end; + end; + + + + procedure TJvCustomEdit.InitWidget; + + begin + inherited; + if Focused then + DoEmptyValueEnter + else + DoEmptyValueExit; + end; + + procedure TJvCustomEdit.SetEmptyValue(const Value: string); + begin + FEmptyValue := Value; + if HandleAllocated then + begin + if Focused then + DoEmptyValueEnter + else + DoEmptyValueExit; + end; + end; Index: JvQMRUManager.pas =================================================================== RCS file: /cvsroot/jvcl/dev/JVCL3/qrun/JvQMRUManager.pas,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** JvQMRUManager.pas 15 May 2004 21:48:55 -0000 1.3 --- JvQMRUManager.pas 16 May 2004 10:05:33 -0000 1.4 *************** *** 443,447 **** if (FSeparateSize > 0) and (I > 0) and (I mod FSeparateSize = 0) then AddMenuItem(NewLine) ! else if (I = 0) and (MenuLocation = mruSibling) and (FRecentMenu.Count = 0) then AddMenuItem(NewLine); S := Strings[I]; --- 443,448 ---- if (FSeparateSize > 0) and (I > 0) and (I mod FSeparateSize = 0) then AddMenuItem(NewLine) ! else ! if (I = 0) and (MenuLocation = mruSibling) and (FRecentMenu.Count = 0) then AddMenuItem(NewLine); S := Strings[I]; *************** *** 456,460 **** if L < 10 then C := '&' + Char(Ord('0') + L) ! else if L <= (Ord('Z') + 10) then C := '&' + Char(L + Ord('A') - 10) else --- 457,462 ---- if L < 10 then C := '&' + Char(Ord('0') + L) ! else ! if L <= (Ord('Z') + 10) then C := '&' + Char(L + Ord('A') - 10) else *************** *** 804,808 **** S, GetCanvas.TextWidth('n') * MaxLength, cpCenter) ! else if Length(S) > MaxLength then Result := '...' + Copy(S, Length(S) - MaxLength + 1, MaxInt); end; --- 806,811 ---- S, GetCanvas.TextWidth('n') * MaxLength, cpCenter) ! else ! if Length(S) > MaxLength then Result := '...' + Copy(S, Length(S) - MaxLength + 1, MaxInt); end; Index: JvQCsvData.pas =================================================================== RCS file: /cvsroot/jvcl/dev/JVCL3/qrun/JvQCsvData.pas,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** JvQCsvData.pas 13 May 2004 23:39:16 -0000 1.13 --- JvQCsvData.pas 16 May 2004 10:05:33 -0000 1.14 *************** *** 735,739 **** OutputDebugString(PChar('JvCsvDatabaseError in ' + TableName + ': ' + Msg)); {$ENDIF DEBUGINFO_ON} ! raise EJvCsvDataSetError.CreateFmt(RsECsvErrFormat, [TableName, Msg]); end; --- 735,739 ---- OutputDebugString(PChar('JvCsvDatabaseError in ' + TableName + ': ' + Msg)); {$ENDIF DEBUGINFO_ON} ! raise EJvCsvDataSetError.CreateResFmt(@RsECsvErrFormat, [TableName, Msg]); end; *************** *** 1113,1117 **** // GotoBookmark(m); //except ! // on E:EDatabaseError do begin // First; // Exit; --- 1113,1118 ---- // GotoBookmark(m); //except ! // on E: EDatabaseError do ! // begin // First; // Exit; *************** *** 1384,1389 **** CsvColumnData := FCsvColumns.FindByFieldNo(FieldLookup.FieldNo); max := -1; ! for recindex := 0 to Self.FData.Count-1 do begin ! try // skip filtered rows: RowPtr := FData[recindex]; --- 1385,1390 ---- CsvColumnData := FCsvColumns.FindByFieldNo(FieldLookup.FieldNo); max := -1; ! for recindex := 0 to Self.FData.Count-1 do ! try // skip filtered rows: RowPtr := FData[recindex]; *************** *** 1392,1406 **** continue; // skip filtered row! - value := GetFieldValueAsVariant(CsvColumnData,FieldLookup,recindex); ! if value>max then max := value; // keep maximum. ! except ! on E:EVariantError do begin ! exit; // failed. ! end; ! end; ! end; ! if (max<0) then result := 0 // autoincrement starts at zero else --- 1393,1404 ---- continue; // skip filtered row! value := GetFieldValueAsVariant(CsvColumnData,FieldLookup,recindex); ! if value > max then max := value; // keep maximum. ! except ! on E: EVariantError do ! exit; // failed. ! end; ! if max < 0 then result := 0 // autoincrement starts at zero else *************** *** 1417,1421 **** // or [] {none} var - KeyFieldArray: array[0..20] of string; FieldLookup: array[0..20] of TField; --- 1415,1418 ---- *************** *** 2517,2521 **** begin if FTableName = '' then ! raise EJvCsvDataSetError.Create(RsETableNameNotSet); if FFileDirty and FSavesChanges and (Length(FTableName) > 0) then --- 2514,2518 ---- begin if FTableName = '' then ! raise EJvCsvDataSetError.CreateRes(@RsETableNameNotSet); if FFileDirty and FSavesChanges and (Length(FTableName) > 0) then *************** *** 2885,2889 **** OutputDebugString(PChar('JvCsvDataSet Uniqueness: recordPos='+IntToStr(FRecordPos)+' '+GetRowAsString(FRecordPos) )); {$ENDIF DEBUGINFO_ON} ! raise EJvCsvKeyError.CreateFmt(RsEKeyNotUnique, [FTableName]); Exit; // never get here, since normally JvCsvDatabaseError raises an exception. end; --- 2882,2886 ---- OutputDebugString(PChar('JvCsvDataSet Uniqueness: recordPos='+IntToStr(FRecordPos)+' '+GetRowAsString(FRecordPos) )); {$ENDIF DEBUGINFO_ON} ! raise EJvCsvKeyError.CreateResFmt(@RsEKeyNotUnique, [FTableName]); Exit; // never get here, since normally JvCsvDatabaseError raises an exception. end; *************** *** 3330,3334 **** Result := PCsvRow(Get(RowIndex)) // return pointer to a row item. else ! raise EJvCsvDataSetError.Create(RsECsvNoRecord); { NO Such Record } end; --- 3327,3331 ---- Result := PCsvRow(Get(RowIndex)) // return pointer to a row item. else ! raise EJvCsvDataSetError.CreateRes(@RsECsvNoRecord); { NO Such Record } end; *************** *** 3638,3644 **** Exit; if Length(DataRow) >= (MAXLINELENGTH - 1) then ! begin ! raise EJvCsvDataSetError.Create(Format(RsECsvStringTooLong, [Copy(DataRow, 1, 40)])); ! end; pNewRow := AllocMem(SizeOf(TJvCsvRow)); StringToCsvRow(DataRow, Separator, pNewRow, True, FEnquoteBackslash); --- 3635,3639 ---- Exit; if Length(DataRow) >= (MAXLINELENGTH - 1) then ! raise EJvCsvDataSetError.CreateResFmt(@RsECsvStringTooLong, [Copy(DataRow, 1, 40)]); pNewRow := AllocMem(SizeOf(TJvCsvRow)); StringToCsvRow(DataRow, Separator, pNewRow, True, FEnquoteBackslash); *************** *** 3808,3812 **** if (Col >= MAXCOLUMNS) or (t >= MAXLINELENGTH) then begin ! raise ERangeError.CreateFmt(RsEInternalLimit, [MAXCOLUMNS]); Exit; end; --- 3803,3807 ---- if (Col >= MAXCOLUMNS) or (t >= MAXLINELENGTH) then begin ! raise ERangeError.CreateResFmt(@RsEInternalLimit, [MAXCOLUMNS]); Exit; end; *************** *** 4246,4250 **** else S := Format('#%.2d',[Ord(Value)]); ! raise EJvCsvDataSetError.CreateFmt(RsECsvInvalidSeparatorFmt,[S]); end; FSeparator := Value; --- 4241,4245 ---- else S := Format('#%.2d',[Ord(Value)]); ! raise EJvCsvDataSetError.CreateResFmt(@RsECsvInvalidSeparatorFmt,[S]); end; FSeparator := Value; *************** *** 4282,4288 **** { make sure the range is valid and that the csv schema is the same } if (RecNo < 0) or (RecNo >= FData.Count) then ! raise EJvCsvDataSetError.CreateFmt(RsEProblemReadingRow,[RecNo]); if FCsvFieldDef <> dataset.FCsvFieldDef then ! raise EJvCsvDataSetError.CreateFmt(RsEProblemReadingRow,[RecNo]); {the ugly hack:} --- 4277,4283 ---- { make sure the range is valid and that the csv schema is the same } if (RecNo < 0) or (RecNo >= FData.Count) then ! raise EJvCsvDataSetError.CreateResFmt(@RsEProblemReadingRow,[RecNo]); if FCsvFieldDef <> dataset.FCsvFieldDef then ! raise EJvCsvDataSetError.CreateResFmt(@RsEProblemReadingRow,[RecNo]); {the ugly hack:} Index: JvQImagesViewer.pas =================================================================== RCS file: /cvsroot/jvcl/dev/JVCL3/qrun/JvQImagesViewer.pas,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** JvQImagesViewer.pas 14 May 2004 22:45:25 -0000 1.5 --- JvQImagesViewer.pas 16 May 2004 10:05:33 -0000 1.6 *************** *** 479,483 **** Canvas.Pen.Width := 1; end ! else if (Options.FrameColor <> clNone) and not (cdsHot in State) then begin Canvas.Brush.Color := Options.FrameColor; --- 479,484 ---- Canvas.Pen.Width := 1; end ! else ! if (Options.FrameColor <> clNone) and not (cdsHot in State) then begin Canvas.Brush.Color := Options.FrameColor; Index: JvQJVCLUtils.pas =================================================================== RCS file: /cvsroot/jvcl/dev/JVCL3/qrun/JvQJVCLUtils.pas,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** JvQJVCLUtils.pas 15 May 2004 16:41:55 -0000 1.14 --- JvQJVCLUtils.pas 16 May 2004 10:05:33 -0000 1.15 *************** *** 987,992 **** QPixmap_grabWidget(Pixmap, Control.Parent.Handle, Control.Left, Control.Top, Control.Width, Control.Height); ! BitBlt(DestDev, 0, 0, Pixmap, 0, 0, Control.Width, ! Control.Height, RasterOp_CopyROP, True); finally TPrivateControl(Control).FVisible := OrigVisible; --- 987,992 ---- QPixmap_grabWidget(Pixmap, Control.Parent.Handle, Control.Left, Control.Top, Control.Width, Control.Height); ! Qt.bitBlt(DestDev, 0, 0, Pixmap, 0, 0, Control.Width, [...1687 lines suppressed...] ! Canvas.MoveTo(Rect.Left + I, Rect.Top + I); ! Canvas.LineTo(Rect.Left + I, Rect.Bottom - I); end; end; akTop: begin ! for I := 0 to Size div 2 do begin ! Canvas.MoveTo(Rect.Left + I, Rect.Bottom - I); ! Canvas.LineTo(Rect.Right - I, Rect.Bottom - I); end; end; akBottom: begin ! for I := 0 to Size div 2 do begin ! Canvas.MoveTo(Rect.Left + I, Rect.Top + I); ! Canvas.LineTo(Rect.Right - I, Rect.Top + I); end; end; |