Menu
▾
▴
[JVCL-Checkins] dev/JVCL3/qrun JvQAlarms.pas,1.17,1.18 JvQAppIniStorage.pas,1.21,1.22 JvQAppRegistryStorage.pas,1.16,1.17 JvQAppStorage.pas,1.28,1.29 JvQAppXMLStorage.pas,1.20,1.21 JvQArrowButton.pas,1.21,1.22 JvQButton.pas,1.27,1.28 JvQCheckBox.pas,1.17,1.18 JvQColorCombo.pas,1.3,1.4 JvQColorTrackbar.pas,1.21,1.22 JvQComCtrls.pas,1.10,1.11 JvQComboListBox.pas,1.13,1.14 JvQComponent.pas,1.33,1.34 JvQContentScroller.pas,1.21,1.22 JvQCsvData.pas,1.20,1.21 JvQCtrls.pas,1.11,1.12 JvQDSADialogs.pas,1.20,1.21 JvQDynControlEngine.pas,1.15,1.16 JvQDynControlEngineIntf.pas,1.14,1.15 JvQDynControlEngineJVCL.pas,1.7,1.8 JvQDynControlEngineVCL.pas,1.17,1.18 JvQEasterEgg.pas,1.14,1.15 JvQEdit.pas,1.24,1.25 JvQErrorIndicator.pas,1.18,1.19 JvQExButtons.pas,1.30,1.31 JvQExCheckLst.pas,1.31,1.32 JvQExComCtrls.pas,1.32,1.33 JvQExComboEdits.pas,1.22,1.23 JvQExControls.pas,1.53,1.54 JvQExDBGrids.pas,1.23,1.24 JvQExExtCtrls.pas,1.32,1.33 JvQExForms.pas,1.31,1.32 JvQExGrids.pas,1.30,1.31 JvQExMask.pas,1.30,1.31 JvQExStdCtrls.pas,1.31,1.32 JvQFooter.pas,1.13,1.14 JvQGrids.pas,1.22,1.23 JvQGroupBox.pas,1.19,1.20 JvQHeaderControl.pas,1.13,1.14 JvQJCLUtils.pas,1.40,1.41 JvQJVCLUtils.pas,1.35,1.36 JvQLabel.pas,1.29,1.30 JvQLookOut.pas,1.30,1.31 JvQMTThreading.pas,1.26,1.27 JvQMarkupLabel.pas,1.14,1.15 JvQMaskEdit.pas,1.21,1.22 JvQMouseGesture.pas,1.15,1.16 JvQNavigationPane.pas,1.34,1.35 JvQOutlookBar.pas,1.27,1.28 JvQPropertyStorage.pas,1.17,1.18 JvQRadioButton.pas,1.21,1.22 JvQRegistryIniFile.pas,1.12,1.13 JvQResources.pas,1.28,1.29 JvQRollOut.pas,1.24,1.25 JvQScrollBar.pas,1.14,1.15 JvQScrollPanel.pas,1.21,1.22 JvQSecretPanel.pas,1.14,1.15 JvQSegmentedLEDDisplay.pas,1.17,1.18 JvQSimpleXml.pas,1.23,1.24 JvQSlider.pas,1.19,1.20 JvQSpecialProgress.pas,1.19,1.20 JvQSpeedButton.pas,1.27,1.28 JvQSpeedbar.pas,1.24,1.25 JvQSystemColors.pas,1.9,1.10 JvQTimeEdit.pas,1.7,1.8 JvQTimeLine.pas,1.19,1.20 JvQToolEdit.pas,1.41,1.42 JvQTransparentButton.pas,1.28,1.29 JvQTypes.pas,1.24,1.25 JvQValidateEdit.pas,1.19,1.20 JvQWizard.pas,1.27,1.28 JvQWizardCommon.pas,1.13,1.14 JvQWizardRouteMapList.pas,1.18,1.19 JvQWizardRouteMapNodes.pas,1.15,1.16 JvQWizardRouteMapSteps.pas,1.18,1.19 JvQXPContainer.pas,1.15,1.16 JvQXPProgressBar.pas,1.4,1.5 JvQYearGrid.pas,1.17,1.18 JvQZlibMultiple.pas,1.15,1.16 JvQZoom.pas,1.21,1.22 - updates
Update of /cvsroot/jvcl/dev/JVCL3/qrun In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22905/JVCL3/qrun Modified Files: JvQAlarms.pas JvQAppIniStorage.pas JvQAppRegistryStorage.pas JvQAppStorage.pas JvQAppXMLStorage.pas JvQArrowButton.pas JvQButton.pas JvQCheckBox.pas JvQColorCombo.pas JvQColorTrackbar.pas JvQComCtrls.pas JvQComboListBox.pas JvQComponent.pas JvQContentScroller.pas JvQCsvData.pas JvQCtrls.pas JvQDSADialogs.pas JvQDynControlEngine.pas JvQDynControlEngineIntf.pas JvQDynControlEngineJVCL.pas JvQDynControlEngineVCL.pas JvQEasterEgg.pas JvQEdit.pas JvQErrorIndicator.pas JvQExButtons.pas JvQExCheckLst.pas JvQExComCtrls.pas JvQExComboEdits.pas JvQExControls.pas JvQExDBGrids.pas JvQExExtCtrls.pas JvQExForms.pas JvQExGrids.pas JvQExMask.pas JvQExStdCtrls.pas JvQFooter.pas JvQGrids.pas JvQGroupBox.pas JvQHeaderControl.pas JvQJCLUtils.pas JvQJVCLUtils.pas JvQLabel.pas JvQLookOut.pas JvQMTThreading.pas JvQMarkupLabel.pas JvQMaskEdit.pas JvQMouseGesture.pas JvQNavigationPane.pas JvQOutlookBar.pas JvQPropertyStorage.pas JvQRadioButton.pas JvQRegistryIniFile.pas JvQResources.pas JvQRollOut.pas JvQScrollBar.pas JvQScrollPanel.pas JvQSecretPanel.pas JvQSegmentedLEDDisplay.pas JvQSimpleXml.pas JvQSlider.pas JvQSpecialProgress.pas JvQSpeedButton.pas JvQSpeedbar.pas JvQSystemColors.pas JvQTimeEdit.pas JvQTimeLine.pas JvQToolEdit.pas JvQTransparentButton.pas JvQTypes.pas JvQValidateEdit.pas JvQWizard.pas JvQWizardCommon.pas JvQWizardRouteMapList.pas JvQWizardRouteMapNodes.pas JvQWizardRouteMapSteps.pas JvQXPContainer.pas JvQXPProgressBar.pas JvQYearGrid.pas JvQZlibMultiple.pas JvQZoom.pas Log Message: updates Index: JvQRegistryIniFile.pas =================================================================== RCS file: /cvsroot/jvcl/dev/JVCL3/qrun/JvQRegistryIniFile.pas,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** JvQRegistryIniFile.pas 28 Aug 2004 18:57:36 -0000 1.12 --- JvQRegistryIniFile.pas 1 Dec 2004 22:53:20 -0000 1.13 *************** *** 174,179 **** strlist := TStringList.Create; try ! strlist.Delimiter := PathDelim; ! strlist.DelimitedText := Key; Ininame := RootKey; i := 0; --- 174,178 ---- strlist := TStringList.Create; try ! ExtractStrings([PathDelim], [], PChar(Key), strList ); Ininame := RootKey; i := 0; Index: JvQArrowButton.pas =================================================================== RCS file: /cvsroot/jvcl/dev/JVCL3/qrun/JvQArrowButton.pas,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -d -r1.21 -r1.22 *** JvQArrowButton.pas 11 Sep 2004 21:07:02 -0000 1.21 --- JvQArrowButton.pas 1 Dec 2004 22:53:16 -0000 1.22 *************** *** 1038,1042 **** --- 1038,1047 ---- Msg.Control := Self; Msg.Result := 0; + {$IFDEF VCL} Parent.Broadcast(Msg); + {$ENDIF VCL} + {$IFDEF VisualCLX} + BroadcastMsg(Parent, Msg); + {$ENDIF VisualCLX} end; end; Index: JvQOutlookBar.pas =================================================================== RCS file: /cvsroot/jvcl/dev/JVCL3/qrun/JvQOutlookBar.pas,v retrieving revision 1.27 retrieving revision 1.28 diff -C2 -d -r1.27 -r1.28 *** JvQOutlookBar.pas 7 Nov 2004 22:53:55 -0000 1.27 --- JvQOutlookBar.pas 1 Dec 2004 22:53:20 -0000 1.28 *************** *** 1825,1836 **** procedure TJvCustomOutlookBar.Paint; var ! I: Integer; begin if csDestroying in ComponentState then Exit; Canvas.Font := Self.Font; Canvas.Brush.Color := Self.Color; if Pages.Count = 0 then // we only need to draw the background when there are no pages ! begin begin if DoDrawBackGround then --- 1825,1839 ---- procedure TJvCustomOutlookBar.Paint; var ! I: Integer; ! R2: TRect; begin if csDestroying in ComponentState then Exit; + Canvas.Brush.Style := bsSolid; Canvas.Font := Self.Font; Canvas.Brush.Color := Self.Color; + Canvas.Brush.Style := bsSolid; if Pages.Count = 0 then // we only need to draw the background when there are no pages ! begin begin if DoDrawBackGround then *************** *** 1838,1846 **** end; end; - SetBkMode(Canvas.Handle, TRANSPARENT); I := DrawTopPages; if I >= 0 then DrawCurrentPage(I); ! DrawBottomPages(I + 1); end; --- 1841,1853 ---- end; end; I := DrawTopPages; + DrawBottomPages(I + 1); if I >= 0 then + begin + R2 := GetPageRect(I); + Canvas.SetClipRect(R2); DrawCurrentPage(I); ! Canvas.ResetClipRegion; ! end; end; *************** *** 1898,1903 **** if FBorderStyle <> Value then begin ! FBorderStyle := Value; ! RecreateWnd; end; end; --- 1905,1910 ---- if FBorderStyle <> Value then begin ! FBorderStyle := Value; ! Invalidate; end; end; *************** *** 2161,2165 **** procedure TJvCustomOutlookBar.RedrawRect(R: TRect; Erase: Boolean = False); begin ! QWindows.InvalidateRect(Handle, @R, Erase); end; --- 2168,2172 ---- procedure TJvCustomOutlookBar.RedrawRect(R: TRect; Erase: Boolean = False); begin ! // QWindows.InvalidateRect(Handle, @R, Erase); end; Index: JvQLookOut.pas =================================================================== RCS file: /cvsroot/jvcl/dev/JVCL3/qrun/JvQLookOut.pas,v retrieving revision 1.30 retrieving revision 1.31 diff -C2 -d -r1.30 -r1.31 *** JvQLookOut.pas 6 Nov 2004 22:08:19 -0000 1.30 --- JvQLookOut.pas 1 Dec 2004 22:53:19 -0000 1.31 *************** *** 39,43 **** QWindows, QMessages, QGraphics, QControls, QForms, QStdCtrls, QExtCtrls, QButtons, QMenus, QImgList, ! Qt, JvQJCLUtils, JvQTypes, JvQConsts, JvQComponent, JvQThemes, JvQExControls, JvQExButtons; --- 39,43 ---- QWindows, QMessages, QGraphics, QControls, QForms, QStdCtrls, QExtCtrls, QButtons, QMenus, QImgList, ! Qt, JvQJCLUtils, JvQTypes, JvQConsts, JvQComponent, JvQThemes, JvQExControls, JvQExButtons; *************** *** 45,49 **** CM_IMAGESIZECHANGED = CM_BASE + 200; CM_LEAVEBUTTON = CM_BASE + 201; - WM_NCPAINT = $0085; type --- 45,48 ---- *************** *** 1048,1053 **** Msg.Index := FGroupIndex; Msg.Control := Self; ! Msg.Result := 0; ! Parent.Broadcast(Msg); end; end; --- 1047,1052 ---- Msg.Index := FGroupIndex; Msg.Control := Self; ! Msg.Result := 0; ! BroadcastMsg(Parent, Msg); end; end; *************** *** 1295,1299 **** Canvas.Brush.Color := clBlack; with Canvas do ! FrameRect(Canvas, R); Canvas.Brush.Color := Color; end; --- 1294,1298 ---- Canvas.Brush.Color := clBlack; with Canvas do ! FrameRect( Canvas, R); Canvas.Brush.Color := Color; end; *************** *** 1462,1467 **** Msg.LParam := Longint(Self); Msg.Result := 0; ! Invalidate; ! Parent.Broadcast(Msg); end; end --- 1461,1466 ---- Msg.LParam := Longint(Self); Msg.Result := 0; ! Invalidate; ! BroadcastMsg(Parent, Msg); end; end *************** *** 2058,2065 **** Msg.WParam := Longint(Ord(FImageSize)); Msg.LParam := Longint(Self); ! Msg.Result := 0; if Parent <> nil then ! Parent.Broadcast(Msg); ! Broadcast(Msg); end; end; --- 2057,2064 ---- Msg.WParam := Longint(Ord(FImageSize)); Msg.LParam := Longint(Self); ! Msg.Result := 0; if Parent <> nil then ! BroadcastMsg(Parent, Msg); ! BroadcastMsg(self, Msg); end; end; *************** *** 2478,2483 **** Msg.WParam := Longint(Ord(FImageSize)); Msg.LParam := Longint(Self); ! Msg.Result := 0; ! Broadcast(Msg); end; end; --- 2477,2482 ---- Msg.WParam := Longint(Ord(FImageSize)); Msg.LParam := Longint(Self); ! Msg.Result := 0; ! BroadcastMsg(Self, Msg); end; end; Index: JvQExMask.pas =================================================================== RCS file: /cvsroot/jvcl/dev/JVCL3/qrun/JvQExMask.pas,v retrieving revision 1.30 retrieving revision 1.31 diff -C2 -d -r1.30 -r1.31 *** JvQExMask.pas 14 Nov 2004 19:27:20 -0000 1.30 --- JvQExMask.pas 1 Dec 2004 22:53:18 -0000 1.31 *************** *** 73,78 **** function HintShow(var HintInfo : THintInfo): Boolean; override; procedure WndProc(var Mesg: TMessage); dynamic; ! property DragCursor: TCursor read FDragCursor write FDragCursor default crDefault; { not implemented } ! property DragKind: TDragKind read FDragKind write FDragKind default dkDrag; { not implemented } property OnParentColorChange: TNotifyEvent read FOnParentColorChanged write FOnParentColorChanged; property DesktopFont: Boolean read FDesktopFont write SetDesktopFont default false; --- 73,78 ---- function HintShow(var HintInfo : THintInfo): Boolean; override; procedure WndProc(var Mesg: TMessage); dynamic; ! property DragCursor: TCursor read FDragCursor write FDragCursor stored False; { not implemented } ! property DragKind: TDragKind read FDragKind write FDragKind stored false; { not implemented } property OnParentColorChange: TNotifyEvent read FOnParentColorChanged write FOnParentColorChanged; property DesktopFont: Boolean read FDesktopFont write SetDesktopFont default false; *************** *** 136,142 **** { QWinControl } private ! FCanvas: TControlCanvas; FDoubleBuffered: Boolean; - function GetCanvas: TCanvas; protected procedure Paint; virtual; --- 136,141 ---- { QWinControl } private ! FCanvas: TCanvas; FDoubleBuffered: Boolean; protected procedure Paint; virtual; *************** *** 146,154 **** constructor Create(AOwner: TComponent); override; destructor Destroy; override; ! property Canvas: TCanvas read GetCanvas; ! end; ! ! { QWinControl } ! TJvExPubCustomMaskEdit = class(TJvExCustomMaskEdit) end; --- 145,149 ---- constructor Create(AOwner: TComponent); override; destructor Destroy; override; ! property Canvas: TCanvas read FCanvas; end; *************** *** 182,187 **** function HintShow(var HintInfo : THintInfo): Boolean; override; procedure WndProc(var Mesg: TMessage); dynamic; ! property DragCursor: TCursor read FDragCursor write FDragCursor default crDefault; { not implemented } ! property DragKind: TDragKind read FDragKind write FDragKind default dkDrag; { not implemented } property OnParentColorChange: TNotifyEvent read FOnParentColorChanged write FOnParentColorChanged; property DesktopFont: Boolean read FDesktopFont write SetDesktopFont default false; --- 177,182 ---- function HintShow(var HintInfo : THintInfo): Boolean; override; procedure WndProc(var Mesg: TMessage); dynamic; ! property DragCursor: TCursor read FDragCursor write FDragCursor stored False; { not implemented } ! property DragKind: TDragKind read FDragKind write FDragKind stored false; { not implemented } property OnParentColorChange: TNotifyEvent read FOnParentColorChanged write FOnParentColorChanged; property DesktopFont: Boolean read FDesktopFont write SetDesktopFont default false; *************** *** 245,251 **** { QWinControl } private ! FCanvas: TControlCanvas; FDoubleBuffered: Boolean; - function GetCanvas: TCanvas; protected procedure Paint; virtual; --- 240,245 ---- { QWinControl } private ! FCanvas: TCanvas; FDoubleBuffered: Boolean; protected procedure Paint; virtual; *************** *** 255,263 **** constructor Create(AOwner: TComponent); override; destructor Destroy; override; ! property Canvas: TCanvas read GetCanvas; ! end; ! ! { QWinControl } ! TJvExPubMaskEdit = class(TJvExMaskEdit) end; --- 249,253 ---- constructor Create(AOwner: TComponent); override; destructor Destroy; override; ! property Canvas: TCanvas read FCanvas; end; *************** *** 292,297 **** Font.OnChange := DoOnFontChanged; FHintColor := clDefault; - FDoubleBuffered := True; FClipBoardCommands := [caUndo, caCopy, caPaste, caCut]; FBeepOnError := True; FClipboardCommands := [caCopy..caUndo]; --- 282,288 ---- Font.OnChange := DoOnFontChanged; FHintColor := clDefault; FClipBoardCommands := [caUndo, caCopy, caPaste, caCut]; + FCanvas := TControlCanvas.Create; + TControlCanvas(FCanvas).Control := self; FBeepOnError := True; FClipboardCommands := [caCopy..caUndo]; *************** *** 347,360 **** EM_UNDO: Result := Perform(WM_UNDO, 0, 0); { WinControl Messages } ! WM_GETDLGCODE : Result := InputKeysToDlgCodes(InputKeys); ! WM_KILLFOCUS : DoKillFocus(FocusedWnd); ! WM_SETFOCUS : DoSetFocus(FocusedWnd); ! CM_FONTCHANGED : FInternalFontChanged(Font); ! ! CM_HINTSHOW: begin ! HintInfo^.HintColor := GetHintcolor(Self); end; - WM_ERASEBKGND: begin --- 338,350 ---- EM_UNDO: Result := Perform(WM_UNDO, 0, 0); { WinControl Messages } ! WM_KILLFOCUS : DoKillFocus(FocusedWnd); ! WM_SETFOCUS : DoSetFocus(FocusedWnd); ! CM_FONTCHANGED : FInternalFontChanged(Font); ! CM_HINTSHOW : HintInfo^.HintColor := GetHintcolor(Self); ! WM_GETDLGCODE: begin ! Result := InputKeysToDlgCodes(InputKeys); ! Exit; end; WM_ERASEBKGND: begin *************** *** 365,368 **** --- 355,359 ---- Canvas.Stop; end; + Exit; end; { Control Messages } *************** *** 406,456 **** { WinControl Paint } - function TJvExCustomMaskEdit.GetCanvas: TCanvas; - begin - if not Assigned(FCanvas) then - begin - FCanvas := TControlCanvas.Create; - FCanvas.Control := self; - end; - Result := FCanvas; - end; - - - //procedure TJvEx##NameOfClass.Paint; - //begin - // TControlCanvas(Canvas).StopPaint; - // inherited Painting(Handle, QPainter_clipRegion(Canvas.Handle)); - // TControlCanvas(Canvas).StartPaint; - //end; - procedure TJvExCustomMaskEdit.Paint; - var - ForcedPaintEvent: QPaintEventH; begin ! // ForcedPaintEvent := QPaintEvent_create(QPainter_clipRegion(Canvas.Handle), False); ! ForcedPaintEvent := QPaintEvent_create(QPainter_clipRegion(Canvas.Handle), True); ! try ! ControlState := ControlState + [csWidgetPainting]; ! TControlCanvas(Canvas).StopPaint; ! try ! QObject_event(Handle, ForcedPaintEvent); ! finally ! ControlState := ControlState - [csWidgetPainting]; ! end; ! finally ! QPaintEvent_destroy(ForcedPaintEvent); ! TControlCanvas(Canvas).StartPaint; ! end; end; procedure TJvExCustomMaskEdit.Painting(Sender: QObjectH; EventRegion: QRegionH); begin TControlCanvas(Canvas).StartPaint; try Canvas.Brush.Assign(Brush); Canvas.Font.Assign(Font); RequiredState(Canvas, [csHandleValid, csFontValid, csBrushValid]); - QPainter_setClipping(Canvas.Handle, True); Paint; finally --- 397,419 ---- { WinControl Paint } procedure TJvExCustomMaskEdit.Paint; begin ! TControlCanvas(Canvas).StopPaint; ! inherited Painting(Handle, QPainter_clipRegion(Canvas.Handle)); ! TControlCanvas(Canvas).StartPaint; end; procedure TJvExCustomMaskEdit.Painting(Sender: QObjectH; EventRegion: QRegionH); begin + if QRegion_isEmpty(EventRegion) then + Exit; + // QPainter_setClipping(Canvas.Handle, True); TControlCanvas(Canvas).StartPaint; try + QPainter_setClipRegion(Canvas.Handle, EventRegion); Canvas.Brush.Assign(Brush); Canvas.Font.Assign(Font); RequiredState(Canvas, [csHandleValid, csFontValid, csBrushValid]); Paint; finally *************** *** 562,566 **** procedure TJvExCustomMaskEdit.RecreateWnd; begin ! RecreateWidget; end; --- 525,530 ---- procedure TJvExCustomMaskEdit.RecreateWnd; begin ! if not (csRecreating in ControlState) then ! RecreateWidget; end; *************** *** 667,671 **** FWindowProc(TMessage(Mesg)) else ! WndProc(TMessage(Mesg)) end; --- 631,635 ---- FWindowProc(TMessage(Mesg)) else ! inherited Dispatch(Mesg); end; *************** *** 707,712 **** Font.OnChange := DoOnFontChanged; FHintColor := clDefault; - FDoubleBuffered := True; FClipBoardCommands := [caUndo, caCopy, caPaste, caCut]; FBeepOnError := True; FClipboardCommands := [caCopy..caUndo]; --- 671,677 ---- Font.OnChange := DoOnFontChanged; FHintColor := clDefault; FClipBoardCommands := [caUndo, caCopy, caPaste, caCut]; + FCanvas := TControlCanvas.Create; + TControlCanvas(FCanvas).Control := self; FBeepOnError := True; FClipboardCommands := [caCopy..caUndo]; *************** *** 762,775 **** EM_UNDO: Result := Perform(WM_UNDO, 0, 0); { WinControl Messages } ! WM_GETDLGCODE : Result := InputKeysToDlgCodes(InputKeys); ! WM_KILLFOCUS : DoKillFocus(FocusedWnd); ! WM_SETFOCUS : DoSetFocus(FocusedWnd); ! CM_FONTCHANGED : FInternalFontChanged(Font); ! ! CM_HINTSHOW: begin ! HintInfo^.HintColor := GetHintcolor(Self); end; - WM_ERASEBKGND: begin --- 727,739 ---- EM_UNDO: Result := Perform(WM_UNDO, 0, 0); { WinControl Messages } ! WM_KILLFOCUS : DoKillFocus(FocusedWnd); ! WM_SETFOCUS : DoSetFocus(FocusedWnd); ! CM_FONTCHANGED : FInternalFontChanged(Font); ! CM_HINTSHOW : HintInfo^.HintColor := GetHintcolor(Self); ! WM_GETDLGCODE: begin ! Result := InputKeysToDlgCodes(InputKeys); ! Exit; end; WM_ERASEBKGND: begin *************** *** 780,783 **** --- 744,748 ---- Canvas.Stop; end; + Exit; end; { Control Messages } *************** *** 821,871 **** { WinControl Paint } - function TJvExMaskEdit.GetCanvas: TCanvas; - begin - if not Assigned(FCanvas) then - begin - FCanvas := TControlCanvas.Create; - FCanvas.Control := self; - end; - Result := FCanvas; - end; - - - //procedure TJvEx##NameOfClass.Paint; - //begin - // TControlCanvas(Canvas).StopPaint; - // inherited Painting(Handle, QPainter_clipRegion(Canvas.Handle)); - // TControlCanvas(Canvas).StartPaint; - //end; - procedure TJvExMaskEdit.Paint; - var - ForcedPaintEvent: QPaintEventH; begin ! // ForcedPaintEvent := QPaintEvent_create(QPainter_clipRegion(Canvas.Handle), False); ! ForcedPaintEvent := QPaintEvent_create(QPainter_clipRegion(Canvas.Handle), True); ! try ! ControlState := ControlState + [csWidgetPainting]; ! TControlCanvas(Canvas).StopPaint; ! try ! QObject_event(Handle, ForcedPaintEvent); ! finally ! ControlState := ControlState - [csWidgetPainting]; ! end; ! finally ! QPaintEvent_destroy(ForcedPaintEvent); ! TControlCanvas(Canvas).StartPaint; ! end; end; procedure TJvExMaskEdit.Painting(Sender: QObjectH; EventRegion: QRegionH); begin TControlCanvas(Canvas).StartPaint; try Canvas.Brush.Assign(Brush); Canvas.Font.Assign(Font); RequiredState(Canvas, [csHandleValid, csFontValid, csBrushValid]); - QPainter_setClipping(Canvas.Handle, True); Paint; finally --- 786,808 ---- { WinControl Paint } procedure TJvExMaskEdit.Paint; begin ! TControlCanvas(Canvas).StopPaint; ! inherited Painting(Handle, QPainter_clipRegion(Canvas.Handle)); ! TControlCanvas(Canvas).StartPaint; end; procedure TJvExMaskEdit.Painting(Sender: QObjectH; EventRegion: QRegionH); begin + if QRegion_isEmpty(EventRegion) then + Exit; + // QPainter_setClipping(Canvas.Handle, True); TControlCanvas(Canvas).StartPaint; try + QPainter_setClipRegion(Canvas.Handle, EventRegion); Canvas.Brush.Assign(Brush); Canvas.Font.Assign(Font); RequiredState(Canvas, [csHandleValid, csFontValid, csBrushValid]); Paint; finally *************** *** 977,981 **** procedure TJvExMaskEdit.RecreateWnd; begin ! RecreateWidget; end; --- 914,919 ---- procedure TJvExMaskEdit.RecreateWnd; begin ! if not (csRecreating in ControlState) then ! RecreateWidget; end; *************** *** 1082,1086 **** FWindowProc(TMessage(Mesg)) else ! WndProc(TMessage(Mesg)) end; --- 1020,1024 ---- FWindowProc(TMessage(Mesg)) else ! inherited Dispatch(Mesg); end; Index: JvQWizard.pas =================================================================== RCS file: /cvsroot/jvcl/dev/JVCL3/qrun/JvQWizard.pas,v retrieving revision 1.27 retrieving revision 1.28 diff -C2 -d -r1.27 -r1.28 *** JvQWizard.pas 6 Nov 2004 22:08:21 -0000 1.27 --- JvQWizard.pas 1 Dec 2004 22:53:21 -0000 1.28 *************** *** 342,361 **** SysUtils, Classes, QWindows, QMessages, QControls, QForms, QGraphics, QButtons, QImgList, ! Types, ! JvQComponent, JvQThemes, JvQWizardCommon; type - TJvWizardAboutInfoForm = (JvWizardAbout); // Added by <Steve Forbes> - TJvWizardAlign = alTop..alRight; - TJvWizardLeftRight = alLeft..alRight; TJvWizardButtonKind = (bkStart, bkLast, bkBack, bkNext, bkFinish, bkCancel, bkHelp); TJvWizardButtonSet = set of TJvWizardButtonKind; - const bkAllButtons = [bkStart, bkLast, bkBack, bkFinish, bkNext, bkCancel, bkHelp]; ! type TJvWizardCustomPage = class; TJvWizard = class; --- 342,365 ---- SysUtils, Classes, QWindows, QMessages, QControls, QForms, QGraphics, QButtons, QImgList, ! Types, ! {.$IFDEF USEJVCL} ! JvQComponent, JvQThemes, ! {.$ENDIF USEJVCL} JvQWizardCommon; type TJvWizardButtonKind = (bkStart, bkLast, bkBack, bkNext, bkFinish, bkCancel, bkHelp); TJvWizardButtonSet = set of TJvWizardButtonKind; const bkAllButtons = [bkStart, bkLast, bkBack, bkFinish, bkNext, bkCancel, bkHelp]; ! type + TJvWizardAboutInfoForm = (JvWizardAbout); // Added by <Steve Forbes> + TJvWizardAlign = alTop..alRight; + TJvWizardLeftRight = alLeft..alRight; + TJvWizardImage = class; // forward + + TJvWizardCustomPage = class; TJvWizard = class; *************** *** 412,420 **** FPages: TList; FPageIndex: Integer; FOnDisplaying: TJvWizardRouteMapDisplayEvent; function GetPage(Index: Integer): TJvWizardCustomPage; function GetPageCount: Integer; procedure SetAlign(Value: TJvWizardAlign); ! procedure SetPageIndex(Value: Integer); procedure DoAddPage(const APage: TJvWizardCustomPage); procedure DoDeletePage(const APage: TJvWizardCustomPage); --- 416,426 ---- FPages: TList; FPageIndex: Integer; + FImage:TJvWizardImage; FOnDisplaying: TJvWizardRouteMapDisplayEvent; function GetPage(Index: Integer): TJvWizardCustomPage; function GetPageCount: Integer; procedure SetAlign(Value: TJvWizardAlign); ! procedure SetPageIndex(Value: Integer); ! procedure SetImage(const Value:TJvWizardImage); procedure DoAddPage(const APage: TJvWizardCustomPage); procedure DoDeletePage(const APage: TJvWizardCustomPage); *************** *** 422,426 **** procedure DoActivatePage(const APage: TJvWizardCustomPage); procedure DoMovePage(const APage: TJvWizardCustomPage; const OldIndex: Integer); ! protected procedure SetParent(const ParentA: TWidgetControl); override; procedure MouseDown(Button: TMouseButton; Shift: TShiftState; --- 428,434 ---- procedure DoActivatePage(const APage: TJvWizardCustomPage); procedure DoMovePage(const APage: TJvWizardCustomPage; const OldIndex: Integer); ! procedure DoImageChange(Sender: TObject); ! protected ! function HasPicture:boolean; procedure SetParent(const ParentA: TWidgetControl); override; procedure MouseDown(Button: TMouseButton; Shift: TShiftState; *************** *** 436,439 **** --- 444,448 ---- property Wizard: TJvWizard read FWizard write FWizard; property Align: TJvWizardAlign read FAlign write SetAlign default alLeft; + property Image:TJvWizardImage read FImage write SetImage; property OnDisplaying: TJvWizardRouteMapDisplayEvent read FOnDisplaying write FOnDisplaying; *************** *** 460,466 **** procedure DoChange; procedure DoPictureChange(Sender: TObject); - protected - procedure PaintTo(const ACanvas: TCanvas; ARect: TRect); public constructor Create; destructor Destroy; override; --- 469,474 ---- procedure DoChange; procedure DoPictureChange(Sender: TObject); public + procedure PaintTo(const ACanvas: TCanvas; ARect: TRect); constructor Create; destructor Destroy; override; *************** *** 1282,1285 **** --- 1290,1295 ---- begin inherited Create(AOwner); + FImage := TJvWizardImage.Create; + FImage.OnChange := DoImageChange; { !!! YW - Add csNoDesignVisible in order to make it visible and invisible at design Time. } *************** *** 1299,1305 **** --- 1309,1321 ---- Wizard.FRouteMap := nil; FPages.Free; + FImage.Free; inherited Destroy; end; + procedure TJvWizardRouteMapControl.DoImageChange(Sender:TObject); + begin + Invalidate; + end; + procedure TJvWizardRouteMapControl.DoAddPage(const APage: TJvWizardCustomPage); begin *************** *** 1381,1384 **** --- 1397,1410 ---- end; + procedure TJvWizardRouteMapControl.SetImage(const Value:TJvWizardImage); + begin + FImage.Assign(Value); + end; + + function TJvWizardRouteMapControl.HasPicture:boolean; + begin + Result := (FImage.Picture.Graphic <> nil) and not FImage.Picture.Graphic.Empty; + end; + procedure TJvWizardRouteMapControl.SetPageIndex(Value: Integer); begin Index: JvQRollOut.pas =================================================================== RCS file: /cvsroot/jvcl/dev/JVCL3/qrun/JvQRollOut.pas,v retrieving revision 1.24 retrieving revision 1.25 diff -C2 -d -r1.24 -r1.25 *** JvQRollOut.pas 6 Nov 2004 22:08:20 -0000 1.24 --- JvQRollOut.pas 1 Dec 2004 22:53:20 -0000 1.25 *************** *** 856,861 **** R: TRect; TopC, BottomC: TColor; ! FIndex: Integer; ! WS: WideString; begin if FPlacement = plTop then --- 856,861 ---- R: TRect; TopC, BottomC: TColor; ! FIndex: Integer; ! WS: WideString; begin if FPlacement = plTop then *************** *** 931,935 **** SetBkMode(Canvas.Handle, Transparent); if FMouseDown and FInsideButton then ! OffsetRect(R, 1, 1); WS := Caption; SetPenColor(Canvas.Handle, Font.Color); --- 931,935 ---- SetBkMode(Canvas.Handle, Transparent); if FMouseDown and FInsideButton then ! OffsetRect(R, 1, 1); WS := Caption; SetPenColor(Canvas.Handle, Font.Color); *************** *** 937,941 **** DrawText(Canvas, WS, -1, R, DT_VCENTER, 270) else ! DrawText(Canvas, WS, -1, R, DT_VCENTER, 0) end; if ShowFocus and Focused then --- 937,941 ---- DrawText(Canvas, WS, -1, R, DT_VCENTER, 270) else ! DrawText(Canvas, WS, -1, R, DT_VCENTER, 0) end; if ShowFocus and Focused then *************** *** 990,995 **** Msg.WParam := FGroupIndex; Msg.LParam := Longint(Self); ! Msg.Result := 0; ! Parent.Broadcast(Msg); end; end; --- 990,995 ---- Msg.WParam := FGroupIndex; Msg.LParam := Longint(Self); ! Msg.Result := 0; ! BroadcastMsg(Parent, Msg); end; end; Index: JvQSpeedButton.pas =================================================================== RCS file: /cvsroot/jvcl/dev/JVCL3/qrun/JvQSpeedButton.pas,v retrieving revision 1.27 retrieving revision 1.28 diff -C2 -d -r1.27 -r1.28 *** JvQSpeedButton.pas 7 Nov 2004 22:53:55 -0000 1.27 --- JvQSpeedButton.pas 1 Dec 2004 22:53:20 -0000 1.28 *************** *** 1438,1443 **** Msg.Index := FGroupIndex; Msg.Control := Self; ! Msg.Result := 0; ! Parent.Broadcast(Msg); end; end; --- 1438,1443 ---- Msg.Index := FGroupIndex; Msg.Control := Self; ! Msg.Result := 0; ! BroadcastMsg(Parent, Msg); end; end; Index: JvQExStdCtrls.pas =================================================================== RCS file: /cvsroot/jvcl/dev/JVCL3/qrun/JvQExStdCtrls.pas,v retrieving revision 1.31 retrieving revision 1.32 diff -C2 -d -r1.31 -r1.32 *** JvQExStdCtrls.pas 14 Nov 2004 19:27:20 -0000 1.31 --- JvQExStdCtrls.pas 1 Dec 2004 22:53:19 -0000 1.32 *************** *** 74,79 **** function HintShow(var HintInfo : THintInfo): Boolean; override; procedure WndProc(var Mesg: TMessage); dynamic; ! property DragCursor: TCursor read FDragCursor write FDragCursor default crDefault; { not implemented } ! property DragKind: TDragKind read FDragKind write FDragKind default dkDrag; { not implemented } property OnParentColorChange: TNotifyEvent read FOnParentColorChanged write FOnParentColorChanged; property DesktopFont: Boolean read FDesktopFont write SetDesktopFont default false; --- 74,79 ---- function HintShow(var HintInfo : THintInfo): Boolean; override; procedure WndProc(var Mesg: TMessage); dynamic; ! property DragCursor: TCursor read FDragCursor write FDragCursor stored False; { not implemented } [...3872 lines suppressed...] --- 7782,7787 ---- procedure TJvExLabel.RecreateWnd; begin ! if not (csRecreating in ControlState) then ! RecreateWidget; end; *************** *** 8418,8422 **** FWindowProc(TMessage(Mesg)) else ! WndProc(TMessage(Mesg)) end; --- 7888,7892 ---- FWindowProc(TMessage(Mesg)) else ! inherited Dispatch(Mesg); end; Index: JvQMaskEdit.pas =================================================================== RCS file: /cvsroot/jvcl/dev/JVCL3/qrun/JvQMaskEdit.pas,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -d -r1.21 -r1.22 *** JvQMaskEdit.pas 10 Sep 2004 22:05:57 -0000 1.21 --- JvQMaskEdit.pas 1 Dec 2004 22:53:19 -0000 1.22 *************** *** 41,45 **** QWindows, QMessages, SysUtils, Classes, QGraphics, QControls, QMask, QForms, ! JvQComponent, JvQTypes, JvQCaret, JvQToolEdit, JvQExMask; type --- 41,46 ---- QWindows, QMessages, SysUtils, Classes, QGraphics, QControls, QMask, QForms, ! JvQComponent, JvQTypes, ! JvQToolEdit, JvQExMask; type *************** *** 47,51 **** private FHotTrack: Boolean; - FCaret: TJvCaret; FEntering: Boolean; FLeaving: Boolean; --- 48,51 ---- *************** *** 53,60 **** FLastNotifiedText: string; FOnSetFocus: TJvFocusChangeEvent; ! FOnKillFocus: TJvFocusChangeEvent; ! procedure SetHotTrack(Value: Boolean); protected - procedure CaretChanged(Sender: TObject); dynamic; procedure DoKillFocus(FocusedWnd: HWND); override; procedure DoSetFocus(FocusedWnd: HWND); override; --- 53,59 ---- FLastNotifiedText: string; FOnSetFocus: TJvFocusChangeEvent; ! FOnKillFocus: TJvFocusChangeEvent; ! procedure SetHotTrack(Value: Boolean); protected procedure DoKillFocus(FocusedWnd: HWND); override; procedure DoSetFocus(FocusedWnd: HWND); override; *************** *** 64,69 **** procedure SetText(const Value: TCaption); override; procedure MouseEnter(Control: TControl); override; ! procedure MouseLeave(Control: TControl); override; ! procedure SetCaret(const Value: TJvCaret); procedure NotifyIfChanged; procedure Change; override; --- 63,67 ---- procedure SetText(const Value: TCaption); override; procedure MouseEnter(Control: TControl); override; ! procedure MouseLeave(Control: TControl); override; procedure NotifyIfChanged; procedure Change; override; *************** *** 79,83 **** property ProtectPassword: Boolean read FProtectPassword write FProtectPassword default False; property HotTrack: Boolean read FHotTrack write SetHotTrack default False; - property Caret: TJvCaret read FCaret write SetCaret; property ShowButton default False; --- 77,80 ---- *************** *** 88,92 **** TJvMaskEdit = class(TJvCustomMaskEdit) published - property Caret; property ClipboardCommands; property DisabledTextColor; --- 85,88 ---- *************** *** 148,155 **** {$ENDIF UNITVERSIONING} ! procedure TJvCustomMaskEdit.CaretChanged(Sender: TObject); ! begin ! FCaret.CreateCaret; ! end; procedure TJvCustomMaskEdit.Change; --- 144,148 ---- {$ENDIF UNITVERSIONING} ! procedure TJvCustomMaskEdit.Change; *************** *** 162,168 **** begin inherited Create(AOwner); ! FHotTrack := False; ! FCaret := TJvCaret.Create(Self); ! FCaret.OnChanged := CaretChanged; FEntering := False; FLeaving := False; --- 155,159 ---- begin inherited Create(AOwner); ! FHotTrack := False; FEntering := False; FLeaving := False; *************** *** 179,185 **** destructor TJvCustomMaskEdit.Destroy; ! begin ! FCaret.OnChanged := nil; ! FreeAndNil(FCaret); inherited Destroy; end; --- 170,174 ---- destructor TJvCustomMaskEdit.Destroy; ! begin inherited Destroy; end; *************** *** 188,193 **** begin FLeaving := True; ! try ! FCaret.DestroyCaret; inherited DoKillFocus(FocusedWnd); DoKillFocusEvent(FindControl(FocusedWnd)); --- 177,181 ---- begin FLeaving := True; ! try inherited DoKillFocus(FocusedWnd); DoKillFocusEvent(FindControl(FocusedWnd)); *************** *** 208,213 **** FEntering := True; try ! inherited DoSetFocus(FocusedWnd); ! FCaret.CreateCaret; DoSetFocusEvent(FindControl(FocusedWnd)); finally --- 196,200 ---- FEntering := True; try ! inherited DoSetFocus(FocusedWnd); DoSetFocusEvent(FindControl(FocusedWnd)); finally *************** *** 270,277 **** end; ! procedure TJvCustomMaskEdit.SetCaret(const Value: TJvCaret); ! begin ! FCaret.Assign(Value); ! end; procedure TJvCustomMaskEdit.SetHotTrack(Value: Boolean); --- 257,261 ---- end; ! procedure TJvCustomMaskEdit.SetHotTrack(Value: Boolean); Index: JvQLabel.pas =================================================================== RCS file: /cvsroot/jvcl/dev/JVCL3/qrun/JvQLabel.pas,v retrieving revision 1.29 retrieving revision 1.30 diff -C2 -d -r1.29 -r1.30 *** JvQLabel.pas 6 Nov 2004 22:08:19 -0000 1.29 --- JvQLabel.pas 1 Dec 2004 22:53:19 -0000 1.30 *************** *** 64,67 **** --- 64,70 ---- JvQTypes, JvQComponent, JvQDataProvider, JvQExControls; + const + clGrayText = clDisabledText; + type TShadowPosition = (spLeftTop, spLeftBottom, spRightBottom, spRightTop); Index: JvQDSADialogs.pas =================================================================== RCS file: /cvsroot/jvcl/dev/JVCL3/qrun/JvQDSADialogs.pas,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** JvQDSADialogs.pas 6 Nov 2004 22:08:16 -0000 1.20 --- JvQDSADialogs.pas 1 Dec 2004 22:53:16 -0000 1.21 *************** *** 39,47 **** {$IFDEF MSWINDOWS} Windows, ! {$ENDIF MSWINDOWS} ! {$IFDEF LINUX} ! Qt, ! {$ENDIF LINUX} ! QWindows, QClipbrd, SysUtils, Classes, Contnrs, QGraphics, QControls, QForms, QStdCtrls, QDialogs, QExtCtrls, --- 39,44 ---- {$IFDEF MSWINDOWS} Windows, ! {$ENDIF MSWINDOWS} ! Qt, QWindows, QClipbrd, SysUtils, Classes, Contnrs, QGraphics, QControls, QForms, QStdCtrls, QDialogs, QExtCtrls, *************** *** 219,222 **** --- 216,220 ---- // Additional values for DefaultButton, CancelButton and HelpButton parameters + type TMsgDlgBtn = *************** *** 226,231 **** ! const ! // mbNone = TMsgDlgBtn(-1); mbDefault = TMsgDlgBtn(-2); --- 224,230 ---- ! ! ! const mbDefault = TMsgDlgBtn(-2); *************** *** 430,433 **** --- 429,435 ---- uses + {$IFDEF UNITVERSIONING} + JclUnitVersioning, + {$ENDIF UNITVERSIONING} QConsts, Math, TypInfo, {$IFDEF MSWINDOWS} *************** *** 435,442 **** {$ENDIF MSWINDOWS} JclBase, JclSysUtils, ! JvQDynControlEngineIntf, JvQConsts, JvQResources, JvQFinalize; ! ! const ! sUnitName = 'JvDSADialogs'; const --- 437,441 ---- {$ENDIF MSWINDOWS} JclBase, JclSysUtils, ! JvQDynControlEngineIntf, JvQConsts, JvQResources; const *************** *** 455,462 **** begin if GlobalCheckMarkTexts = nil then - begin GlobalCheckMarkTexts := TStringList.Create; - AddFinalizeObjectNil(sUnitName, TObject(GlobalCheckMarkTexts)); - end; Result := GlobalCheckMarkTexts; end; --- 454,458 ---- *************** *** 478,482 **** begin ! inherited CreateNew(AOwner, Dummy); FTimer := TTimer.Create(Self); FTimer.Enabled := False; --- 474,478 ---- begin ! inherited CreateNew(AOwner, Dummy); FTimer := TTimer.Create(Self); FTimer.Enabled := False; *************** *** 521,526 **** procedure TDSAMessageForm.HelpButtonClick(Sender: TObject); begin ! CancelAutoClose; ! Application.ContextHelp(HelpContext); end; --- 517,522 ---- procedure TDSAMessageForm.HelpButtonClick(Sender: TObject); begin ! CancelAutoClose; ! Application.ContextHelp(HelpContext); end; *************** *** 719,723 **** SetRect(TextRect, 0, 0, Screen.Width div 2, 0); DrawText(Canvas, Msg, Length(Msg) + 1, TextRect, ! DT_EXPANDTABS or DT_CALCRECT or DT_WORDBREAK or DrawTextBiDiModeFlagsReadingOnly); IconTextWidth := TextRect.Right; --- 715,719 ---- SetRect(TextRect, 0, 0, Screen.Width div 2, 0); DrawText(Canvas, Msg, Length(Msg) + 1, TextRect, ! DT_EXPANDTABS or DT_CALCRECT or DT_WORDBREAK); IconTextWidth := TextRect.Right; *************** *** 727,731 **** SetRect(TempRect, 0, 0, Screen.Width div 2, 0); DrawText(Canvas, CheckCaption, Length(CheckCaption) + 1, TempRect, ! DT_EXPANDTABS or DT_CALCRECT or DT_WORDBREAK or DrawTextBiDiModeFlagsReadingOnly); ChkTextWidth := TempRect.Right; end --- 723,727 ---- SetRect(TempRect, 0, 0, Screen.Width div 2, 0); DrawText(Canvas, CheckCaption, Length(CheckCaption) + 1, TempRect, ! DT_EXPANDTABS or DT_CALCRECT or DT_WORDBREAK); ChkTextWidth := TempRect.Right; end *************** *** 737,741 **** DrawText(Canvas, Format(RsCntdownText, [Timeout, TimeoutUnit(Timeout)]), Length(Format(RsCntdownText, [Timeout, TimeoutUnit(Timeout)])) + 1, TempRect, ! DT_EXPANDTABS or DT_CALCRECT or DT_WORDBREAK or DrawTextBiDiModeFlagsReadingOnly); TimeoutTextWidth := TempRect.Right; end --- 733,737 ---- DrawText(Canvas, Format(RsCntdownText, [Timeout, TimeoutUnit(Timeout)]), Length(Format(RsCntdownText, [Timeout, TimeoutUnit(Timeout)])) + 1, TempRect, ! DT_EXPANDTABS or DT_CALCRECT or DT_WORDBREAK); TimeoutTextWidth := TempRect.Right; end *************** *** 870,874 **** begin GlobalDSARegister := TDSARegister.Create; - AddFinalizeObjectNil(sUnitName, TObject(GlobalDSARegister)); // register RegisterDSACheckMarkText(ctkShow, RsDSActkShowText); --- 866,869 ---- *************** *** 1514,1534 **** Captions: array [TMsgDlgType] of string = (SMsgDlgWarning, SMsgDlgError, SMsgDlgInformation, SMsgDlgConfirm, ''); ! {$IFDEF MSWINDOWS} ! IconIDs: array [TMsgDlgType] of PChar = ! (IDI_EXCLAMATION, IDI_HAND, IDI_ASTERISK, IDI_QUESTION, nil); ! {$ENDIF MSWINDOWS} ! {$IFDEF LINUX} IconIDs: array [TMsgDlgType] of QMessageBoxIcon = (QMessageBoxIcon_Warning, QMessageBoxIcon_Critical, QMessageBoxIcon_Information, ! QMessageBoxIcon_Information, QMessageBoxIcon_NoIcon); ! {$ENDIF LINUX} // TMsgDlgType = (mtCustom, mtInformation, mtWarning, mtError, mtConfirmation); ! (* ! ButtonCaptions: array [TMsgDlgBtn] of string = ! (SMsgDlgHelp, SMsgDlgOK, SMsgDlgCancel, SMsgDlgYes, ! SMsgDlgNo, SMsgDlgAbort, SMsgDlgRetry, SMsgDlgIgnore, ! SMsgDlgAll, SMsgDlgNoToAll, SMsgDlgYesToAll); ! *) ButtonCaptions: array [TMsgDlgBtn] of string = ('', SMsgDlgOK, SMsgDlgCancel, SMsgDlgYes, --- 1509,1521 ---- Captions: array [TMsgDlgType] of string = (SMsgDlgWarning, SMsgDlgError, SMsgDlgInformation, SMsgDlgConfirm, ''); ! IconIDs: array [TMsgDlgType] of QMessageBoxIcon = (QMessageBoxIcon_Warning, QMessageBoxIcon_Critical, QMessageBoxIcon_Information, ! QMessageBoxIcon_NoIcon, QMessageBoxIcon_NoIcon); // TMsgDlgType = (mtCustom, mtInformation, mtWarning, mtError, mtConfirmation); ! // (mbNone, mbOk, mbCancel, mbYes, mbNo, mbAbort, mbRetry, mbIgnore, ! // mbAll, mbNoToAll, mbYesToAll, mbHelp); ! ButtonCaptions: array [TMsgDlgBtn] of string = ('', SMsgDlgOK, SMsgDlgCancel, SMsgDlgYes, *************** *** 1537,1546 **** ModalResults: array [TMsgDlgBtn] of Integer = (0, mrOk, mrCancel, mrYes, mrNo, mrAbort, mrRetry, mrIgnore, mrAll, mrNoToAll, ! mrYesToAll, mrOK); ! (* ! ModalResults: array [TMsgDlgBtn] of Integer = ! (0, mrOk, mrCancel, mrYes, mrNo, mrAbort, mrRetry, mrIgnore, mrAll, mrNoToAll, ! mrYesToAll); ! *) function DlgCaption(const DlgType: TMsgDlgType): string; begin --- 1524,1529 ---- ModalResults: array [TMsgDlgBtn] of Integer = (0, mrOk, mrCancel, mrYes, mrNo, mrAbort, mrRetry, mrIgnore, mrAll, mrNoToAll, ! mrYesToAll, 0); ! function DlgCaption(const DlgType: TMsgDlgType): string; begin *************** *** 1550,1563 **** function DlgPic(const DlgType: TMsgDlgType): TGraphic; begin - {$IFDEF MSWINDOWS} - if IconIDs[DlgType] <> nil then - {$ENDIF MSWINDOWS} - {$IFDEF LINUX} if IconIDs[DlgType] <> QMessageBoxIcon_NoIcon then - {$ENDIF LINUX} begin Result := TIcon.Create; ! try ! // TODO except Result.Free; --- 1533,1541 ---- function DlgPic(const DlgType: TMsgDlgType): TGraphic; begin if IconIDs[DlgType] <> QMessageBoxIcon_NoIcon then begin Result := TIcon.Create; ! try ! // TODO except Result.Free; *************** *** 2025,2029 **** GlobalRegStore := TDSARegStorage.Create(HKEY_CURRENT_USER, 'Software\' + Application.Title + '\DSA'); - AddFinalizeObjectNil(sUnitName, TObject(GlobalRegStore)); end; Result := TDSARegStorage(GlobalRegStore); --- 2003,2006 ---- *************** *** 2038,2045 **** begin if GlobalQueueStore = nil then - begin GlobalQueueStore := TDSAQueueStorage.Create; - AddFinalizeObjectNil(sUnitName, TObject(GlobalQueueStore)); - end; Result := TDSAQueueStorage(GlobalQueueStore); end; --- 2015,2019 ---- *************** *** 2366,2373 **** end; initialization finalization ! FinalizeUnit(sUnitName); end. --- 2340,2368 ---- end; + {$IFDEF UNITVERSIONING} + const + UnitVersioning: TUnitVersionInfo = ( + RCSfile: '$RCSfile$'; + Revision: '$Revision$'; + Date: '$Date$'; + LogPath: 'JVCL\run' + ); + {$ENDIF UNITVERSIONING} + initialization + {$IFDEF UNITVERSIONING} + RegisterUnitVersion(HInstance, UnitVersioning); + {$ENDIF UNITVERSIONING} finalization ! FreeAndNil(GlobalCheckMarkTexts); ! FreeAndNil(GlobalDSARegister); ! FreeAndNil(GlobalQueueStore); ! {$IFDEF MSWINDOWS} ! FreeAndNil(GlobalRegStore); ! {$ENDIF MSWINDOWS} ! {$IFDEF UNITVERSIONING} ! UnregisterUnitVersion(HInstance); ! {$ENDIF UNITVERSIONING} end. Index: JvQExComboEdits.pas =================================================================== RCS file: /cvsroot/jvcl/dev/JVCL3/qrun/JvQExComboEdits.pas,v retrieving revision 1.22 retrieving revision 1.23 diff -C2 -d -r1.22 -r1.23 *** JvQExComboEdits.pas 14 Nov 2004 19:27:18 -0000 1.22 --- JvQExComboEdits.pas 1 Dec 2004 22:53:17 -0000 1.23 *************** *** 74,79 **** function HintShow(var HintInfo : THintInfo): Boolean; override; procedure WndProc(var Mesg: TMessage); dynamic; ! property DragCursor: TCursor read FDragCursor write FDragCursor default crDefault; { not implemented } ! property DragKind: TDragKind read FDragKind write FDragKind default dkDrag; { not implemented } property OnParentColorChange: TNotifyEvent read FOnParentColorChanged write FOnParentColorChanged; property DesktopFont: Boolean read FDesktopFont write SetDesktopFont default false; --- 74,79 ---- function HintShow(var HintInfo : THintInfo): Boolean; override; procedure WndProc(var Mesg: TMessage); dynamic; ! property DragCursor: TCursor read FDragCursor write FDragCursor stored False; { not implemented } ! property DragKind: TDragKind read FDragKind write FDragKind stored false; { not implemented } property OnParentColorChange: TNotifyEvent read FOnParentColorChanged write FOnParentColorChanged; property DesktopFont: Boolean read FDesktopFont write SetDesktopFont default false; *************** *** 131,137 **** { QWinControl } private ! FCanvas: TControlCanvas; FDoubleBuffered: Boolean; - function GetCanvas: TCanvas; protected procedure Paint; virtual; --- 131,136 ---- { QWinControl } private ! FCanvas: TCanvas; FDoubleBuffered: Boolean; protected procedure Paint; virtual; *************** *** 141,149 **** constructor Create(AOwner: TComponent); override; destructor Destroy; override; ! property Canvas: TCanvas read GetCanvas; ! end; ! ! { QWinControl } ! TJvExPubCustomComboEdit = class(TJvExCustomComboEdit) end; --- 140,144 ---- constructor Create(AOwner: TComponent); override; destructor Destroy; override; ! property Canvas: TCanvas read FCanvas; end; *************** *** 176,181 **** function HintShow(var HintInfo : THintInfo): Boolean; override; procedure WndProc(var Mesg: TMessage); dynamic; ! property DragCursor: TCursor read FDragCursor write FDragCursor default crDefault; { not implemented } ! property DragKind: TDragKind read FDragKind write FDragKind default dkDrag; { not implemented } property OnParentColorChange: TNotifyEvent read FOnParentColorChanged write FOnParentColorChanged; property DesktopFont: Boolean read FDesktopFont write SetDesktopFont default false; --- 171,176 ---- function HintShow(var HintInfo : THintInfo): Boolean; override; procedure WndProc(var Mesg: TMessage); dynamic; ! property DragCursor: TCursor read FDragCursor write FDragCursor stored False; { not implemented } ! property DragKind: TDragKind read FDragKind write FDragKind stored false; { not implemented } property OnParentColorChange: TNotifyEvent read FOnParentColorChanged write FOnParentColorChanged; property DesktopFont: Boolean read FDesktopFont write SetDesktopFont default false; *************** *** 233,239 **** { QWinControl } private ! FCanvas: TControlCanvas; FDoubleBuffered: Boolean; - function GetCanvas: TCanvas; protected procedure Paint; virtual; --- 228,233 ---- { QWinControl } private ! FCanvas: TCanvas; FDoubleBuffered: Boolean; protected procedure Paint; virtual; *************** *** 243,251 **** constructor Create(AOwner: TComponent); override; destructor Destroy; override; ! property Canvas: TCanvas read GetCanvas; ! end; ! ! { QWinControl } ! TJvExPubComboEdit = class(TJvExComboEdit) end; --- 237,241 ---- constructor Create(AOwner: TComponent); override; destructor Destroy; override; ! property Canvas: TCanvas read FCanvas; end; *************** *** 279,284 **** function HintShow(var HintInfo : THintInfo): Boolean; override; procedure WndProc(var Mesg: TMessage); dynamic; ! property DragCursor: TCursor read FDragCursor write FDragCursor default crDefault; { not implemented } ! property DragKind: TDragKind read FDragKind write FDragKind default dkDrag; { not implemented } property OnParentColorChange: TNotifyEvent read FOnParentColorChanged write FOnParentColorChanged; property DesktopFont: Boolean read FDesktopFont write SetDesktopFont default false; --- 269,274 ---- function HintShow(var HintInfo : THintInfo): Boolean; override; procedure WndProc(var Mesg: TMessage); dynamic; ! property DragCursor: TCursor read FDragCursor write FDragCursor stored False; { not implemented } ! property DragKind: TDragKind read FDragKind write FDragKind stored false; { not implemented } property OnParentColorChange: TNotifyEvent read FOnParentColorChanged write FOnParentColorChanged; property DesktopFont: Boolean read FDesktopFont write SetDesktopFont default false; *************** *** 342,348 **** { QWinControl } private ! FCanvas: TControlCanvas; FDoubleBuffered: Boolean; - function GetCanvas: TCanvas; protected procedure Paint; virtual; --- 332,337 ---- { QWinControl } private ! FCanvas: TCanvas; FDoubleBuffered: Boolean; protected procedure Paint; virtual; *************** *** 352,360 **** constructor Create(AOwner: TComponent); override; destructor Destroy; override; ! property Canvas: TCanvas read GetCanvas; ! end; ! ! { QWinControl } ! TJvExPubCustomComboMaskEdit = class(TJvExCustomComboMaskEdit) end; --- 341,345 ---- constructor Create(AOwner: TComponent); override; destructor Destroy; override; ! property Canvas: TCanvas read FCanvas; end; *************** *** 388,393 **** function HintShow(var HintInfo : THintInfo): Boolean; override; procedure WndProc(var Mesg: TMessage); dynamic; ! property DragCursor: TCursor read FDragCursor write FDragCursor default crDefault; { not implemented } ! property DragKind: TDragKind read FDragKind write FDragKind default dkDrag; { not implemented } property OnParentColorChange: TNotifyEvent read FOnParentColorChanged write FOnParentColorChanged; property DesktopFont: Boolean read FDesktopFont write SetDesktopFont default false; --- 373,378 ---- function HintShow(var HintInfo : THintInfo): Boolean; override; procedure WndProc(var Mesg: TMessage); dynamic; ! property DragCursor: TCursor read FDragCursor write FDragCursor stored False; { not implemented } ! property DragKind: TDragKind read FDragKind write FDragKind stored false; { not implemented } property OnParentColorChange: TNotifyEvent read FOnParentColorChanged write FOnParentColorChanged; property DesktopFont: Boolean read FDesktopFont write SetDesktopFont default false; *************** *** 451,457 **** { QWinControl } private ! FCanvas: TControlCanvas; FDoubleBuffered: Boolean; - function GetCanvas: TCanvas; protected procedure Paint; virtual; --- 436,441 ---- { QWinControl } private ! FCanvas: TCanvas; FDoubleBuffered: Boolean; protected procedure Paint; virtual; *************** *** 461,469 **** constructor Create(AOwner: TComponent); override; destructor Destroy; override; ! property Canvas: TCanvas read GetCanvas; ! end; ! ! { QWinControl } ! TJvExPubComboMaskEdit = class(TJvExComboMaskEdit) end; --- 445,449 ---- constructor Create(AOwner: TComponent); override; destructor Destroy; override; ! property Canvas: TCanvas read FCanvas; end; *************** *** 479,484 **** Font.OnChange := DoOnFontChanged; FHintColor := clDefault; - FDoubleBuffered := True; FClipBoardCommands := [caUndo, caCopy, caPaste, caCut]; end; --- 459,465 ---- Font.OnChange := DoOnFontChanged; FHintColor := clDefault; FClipBoardCommands := [caUndo, caCopy, caPaste, caCut]; + FCanvas := TControlCanvas.Create; + TControlCanvas(FCanvas).Control := self; end; *************** *** 533,546 **** EM_UNDO: Result := Perform(WM_UNDO, 0, 0); { WinControl Messages } ! WM_GETDLGCODE : Result := InputKeysToDlgCodes(InputKeys); ! WM_KILLFOCUS : DoKillFocus(FocusedWnd); ! WM_SETFOCUS : DoSetFocus(FocusedWnd); ! CM_FONTCHANGED : FInternalFontChanged(Font); ! ! CM_HINTSHOW: begin ! HintInfo^.HintColor := GetHintcolor(Self); end; - WM_ERASEBKGND: begin --- 514,526 ---- EM_UNDO: Result := Perform(WM_UNDO, 0, 0); { WinControl Messages } ! WM_KILLFOCUS : DoKillFocus(FocusedWnd); ! WM_SETFOCUS : DoSetFocus(FocusedWnd); ! CM_FONTCHANGED : FInternalFontChanged(Font); ! CM_HINTSHOW : HintInfo^.HintColor := GetHintcolor(Self); ! WM_GETDLGCODE: begin ! Result := InputKeysToDlgCodes(InputKeys); ! Exit; end; WM_ERASEBKGND: begin *************** *** 551,554 **** --- 531,535 ---- Canvas.Stop; end; + Exit; end; { Control Messages } *************** *** 592,642 **** { WinControl Paint } - function TJvExCustomComboEdit.GetCanvas: TCanvas; - begin - if not Assigned(FCanvas) then - begin - FCanvas := TControlCanvas.Create; - FCanvas.Control := self; - end; - Result := FCanvas; - end; - - - //procedure TJvEx##NameOfClass.Paint; - //begin - // TControlCanvas(Canvas).StopPaint; - // inherited Painting(Handle, QPainter_clipRegion(Canvas.Handle)); - // TControlCanvas(Canvas).StartPaint; - //end; - procedure TJvExCustomComboEdit.Paint; - var - ForcedPaintEvent: QPaintEventH; begin ! // ForcedPaintEvent := QPaintEvent_create(QPainter_clipRegion(Canvas.Handle), False); ! ForcedPaintEvent := QPaintEvent_create(QPainter_clipRegion(Canvas.Handle), True); ! try ! ControlState := ControlState + [csWidgetPainting]; ! TControlCanvas(Canvas).StopPaint; ! try ! QObject_event(Handle, ForcedPaintEvent); ! finally ! ControlState := ControlState - [csWidgetPainting]; ! end; ! finally ! QPaintEvent_destroy(ForcedPaintEvent); ! TControlCanvas(Canvas).StartPaint; ! end; end; procedure TJvExCustomComboEdit.Painting(Sender: QObjectH; EventRegion: QRegionH); begin TControlCanvas(Canvas).StartPaint; try Canvas.Brush.Assign(Brush); Canvas.Font.Assign(Font); RequiredState(Canvas, [csHandleValid, csFontValid, csBrushValid]); - QPainter_setClipping(Canvas.Handle, True); Paint; finally --- 573,595 ---- { WinControl Paint } procedure TJvExCustomComboEdit.Paint; begin ! TControlCanvas(Canvas).StopPaint; ! inherited Painting(Handle, QPainter_clipRegion(Canvas.Handle)); ! TControlCanvas(Canvas).StartPaint; end; procedure TJvExCustomComboEdit.Painting(Sender: QObjectH; EventRegion: QRegionH); begin + if QRegion_isEmpty(EventRegion) then + Exit; + // QPainter_setClipping(Canvas.Handle, True); TControlCanvas(Canvas).StartPaint; try + QPainter_setClipRegion(Canvas.Handle, EventRegion); Canvas.Brush.Assign(Brush); Canvas.Font.Assign(Font); RequiredState(Canvas, [csHandleValid, csFontValid, csBrushValid]); Paint; finally *************** *** 748,752 **** procedure TJvExCustomComboEdit.RecreateWnd; begin ! RecreateWidget; end; --- 701,706 ---- procedure TJvExCustomComboEdit.RecreateWnd; begin ! if not (csRecreating in ControlState) then ! RecreateWidget; end; *************** *** 853,857 **** FWindowProc(TMessage(Mesg)) else ! WndProc(TMessage(Mesg)) end; --- 807,811 ---- FWindowProc(TMessage(Mesg)) else ! inherited Dispatch(Mesg); end; *************** *** 881,886 **** Font.OnChange := DoOnFontChanged; FHintColor := clDefault; - FDoubleBuffered := True; FClipBoardCommands := [caUndo, caCopy, caPaste, caCut]; end; --- 835,841 ---- Font.OnChange := DoOnFontChanged; FHintColor := clDefault; FClipBoardCommands := [caUndo, caCopy, caPaste, caCut]; + FCanvas := TControlCanvas.Create; + TControlCanvas(FCanvas).Control := self; end; *************** *** 935,948 **** EM_UNDO: Result := Perform(WM_UNDO, 0, 0); { WinControl Messages } ! WM_GETDLGCODE : Result := InputKeysToDlgCodes(InputKeys); ! WM_KILLFOCUS : DoKillFocus(FocusedWnd); ! WM_SETFOCUS : DoSetFocus(FocusedWnd); ! CM_FONTCHANGED : FInternalFontChanged(Font); ! ! CM_HINTSHOW: begin ! HintInfo^.HintColor := GetHintcolor(Self); end; - WM_ERASEBKGND: begin --- 890,902 ---- EM_UNDO: Result := Perform(WM_UNDO, 0, 0); { WinControl Messages } ! WM_KILLFOCUS : DoKillFocus(FocusedWnd); ! WM_SETFOCUS : DoSetFocus(FocusedWnd); ! CM_FONTCHANGED : FInternalFontChanged(Font); ! CM_HINTSHOW : HintInfo^.HintColor := GetHintcolor(Self); ! WM_GETDLGCODE: begin ! Result := InputKeysToDlgCodes(InputKeys); ! Exit; end; WM_ERASEBKGND: begin *************** *** 953,956 **** --- 907,911 ---- Canvas.Stop; end; + Exit; end; { Control Messages } *************** *** 994,1044 **** { WinControl Paint } - function TJvExComboEdit.GetCanvas: TCanvas; - begin - if not Assigned(FCanvas) then - begin - FCanvas := TControlCanvas.Create; - FCanvas.Control := self; - end; - Result := FCanvas; - end; - - - //procedure TJvEx##NameOfClass.Paint; - //begin - // TControlCanvas(Canvas).StopPaint; - // inherited Painting(Handle, QPainter_clipRegion(Canvas.Handle)); - // TControlCanvas(Canvas).StartPaint; - //end; - procedure TJvExComboEdit.Paint; - var - ForcedPaintEvent: QPaintEventH; begin ! // ForcedPaintEvent := QPaintEvent_create(QPainter_clipRegion(Canvas.Handle), False); ! ForcedPaintEvent := QPaintEvent_create(QPainter_clipRegion(Canvas.Handle), True); ! try ! ControlState := ControlState + [csWidgetPainting]; ! TControlCanvas(Canvas).StopPaint; ! try ! QObject_event(Handle, ForcedPaintEvent); ! finally ! ControlState := ControlState - [csWidgetPainting]; ! end; ! finally ! QPaintEvent_destroy(ForcedPaintEvent); ! TControlCanvas(Canvas).StartPaint; ! end; end; procedure TJvExComboEdit.Painting(Sender: QObjectH; EventRegion: QRegionH); begin TControlCanvas(Canvas).StartPaint; try Canvas.Brush.Assign(Brush); Canvas.Font.Assign(Font); RequiredState(Canvas, [csHandleValid, csFontValid, csBrushValid]); - QPainter_setClipping(Canvas.Handle, True); Paint; finally --- 949,971 ---- { WinControl Paint } procedure TJvExComboEdit.Paint; begin ! TControlCanvas(Canvas).StopPaint; ! inherited Painting(Handle, QPainter_clipRegion(Canvas.Handle)); ! TControlCanvas(Canvas).StartPaint; end; procedure TJvExComboEdit.Painting(Sender: QObjectH; EventRegion: QRegionH); begin + if QRegion_isEmpty(EventRegion) then + Exit; + // QPainter_setClipping(Canvas.Handle, True); TControlCanvas(Canvas).StartPaint; try + QPainter_setClipRegion(Canvas.Handle, EventRegion); Canvas.Brush.Assign(Brush); Canvas.Font.Assign(Font); RequiredState(Canvas, [csHandleValid, csFontValid, csBrushValid]); Paint; finally *************** *** 1150,1154 **** procedure TJvExComboEdit.RecreateWnd; begin ! RecreateWidget; end; --- 1077,1082 ---- procedure TJvExComboEdit.RecreateWnd; begin ! if not (csRecreating in ControlState) then ! RecreateWidget; end; *************** *** 1255,1259 **** FWindowProc(TMessage(Mesg)) else ! WndProc(TMessage(Mesg)) end; --- 1183,1187 ---- FWindowProc(TMessage(Mesg)) else ! inherited Dispatch(Mesg); end; *************** *** 1301,1306 **** Font.OnChange := DoOnFontChanged; FHintColor := clDefault; - FDoubleBuffered := True; FClipBoardCommands := [caUndo, caCopy, caPaste, caCut]; FBeepOnError := True; end; --- 1229,1235 ---- Font.OnChange := DoOnFontChanged; FHintColor := clDefault; FClipBoardCommands := [caUndo, caCopy, caPaste, caCut]; + FCanvas := TControlCanvas.Create; + TControlCanvas(FCanvas).Contr... [truncated message content] |