From: Andreas H. <ah...@us...> - 2004-01-05 18:22:34
|
Update of /cvsroot/jvcl/dev/JVCL3/run In directory sc8-pr-cvs1:/tmp/cvs-serv7940/run Modified Files: JvExComCtrls.pas JvExExtCtrls.pas Log Message: Fixed CLX issues Index: JvExComCtrls.pas =================================================================== RCS file: /cvsroot/jvcl/dev/JVCL3/run/JvExComCtrls.pas,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** JvExComCtrls.pas 5 Jan 2004 17:32:06 -0000 1.3 --- JvExComCtrls.pas 5 Jan 2004 18:22:30 -0000 1.4 *************** *** 229,233 **** // // -------------------------------------- ! TJvExProgressBar = class(TProgressBar, IJvWinControlEvents, IJvControlEvents) {$IFDEF VCL} protected --- 229,233 ---- // // -------------------------------------- ! TJvExStatusBar = class(TStatusBar, IJvWinControlEvents, IJvControlEvents) {$IFDEF VCL} protected *************** *** 274,280 **** {$ENDIF} end; // // -------------------------------------- ! TJvExStatusBar = class(TStatusBar, IJvWinControlEvents, IJvControlEvents) {$IFDEF VCL} protected --- 274,281 ---- {$ENDIF} end; + {$IFDEF VCL} // // -------------------------------------- ! TJvExProgressBar = class(TProgressBar, IJvWinControlEvents, IJvControlEvents) {$IFDEF VCL} protected *************** *** 321,328 **** {$ENDIF} end; ! {$IFDEF COMPILER6_UP} // // -------------------------------------- ! TJvExCustomStatusBar = class(TCustomStatusBar, IJvWinControlEvents, IJvControlEvents) {$IFDEF VCL} protected --- 322,329 ---- {$ENDIF} end; ! {$ELSE} // // -------------------------------------- ! TJvExProgressBar = class(TProgressBar, IJvControlEvents) {$IFDEF VCL} protected *************** *** 342,352 **** procedure MouseEnter(Control: TControl); dynamic; procedure MouseLeave(Control: TControl); dynamic; - protected - // TWinControl - procedure CursorChanged; dynamic; - procedure ShowingChanged; dynamic; - procedure ShowHintChanged; dynamic; - procedure ControlsListChanging(Control: TControl; Inserting: Boolean); dynamic; - procedure ControlsListChanged(Control: TControl; Inserting: Boolean); dynamic; public procedure Dispatch(var Message); override; --- 343,346 ---- *************** *** 369,372 **** --- 363,368 ---- {$ENDIF} end; + {$ENDIF VCL} + {$IFDEF COMPILER6_UP} // // -------------------------------------- *************** *** 416,423 **** {$ENDIF} end; ! {$ENDIF COMPILER6_UP} // // -------------------------------------- ! TJvExHeaderControl = class(THeaderControl, IJvWinControlEvents, IJvControlEvents) {$IFDEF VCL} protected --- 412,419 ---- {$ENDIF} end; ! {$IFDEF VCL} // // -------------------------------------- ! TJvExCustomStatusBar = class(TCustomStatusBar, IJvWinControlEvents, IJvControlEvents) {$IFDEF VCL} protected *************** *** 464,470 **** {$ENDIF} end; // // -------------------------------------- ! TJvExCustomTreeView = class(TCustomTreeView, IJvWinControlEvents, IJvControlEvents) {$IFDEF VCL} protected --- 460,468 ---- {$ENDIF} end; + {$ENDIF VCL} + {$ENDIF COMPILER6_UP} // // -------------------------------------- ! TJvExHeaderControl = class(THeaderControl, IJvWinControlEvents, IJvControlEvents) {$IFDEF VCL} protected *************** *** 513,517 **** // // -------------------------------------- ! TJvExTreeView = class(TTreeView, IJvWinControlEvents, IJvControlEvents) {$IFDEF VCL} protected --- 511,515 ---- // // -------------------------------------- ! TJvExCustomTreeView = class(TCustomTreeView, IJvWinControlEvents, IJvControlEvents) {$IFDEF VCL} protected *************** *** 560,564 **** // // -------------------------------------- ! TJvExCustomListView = class(TCustomListView, IJvWinControlEvents, IJvControlEvents) {$IFDEF VCL} protected --- 558,562 ---- // // -------------------------------------- ! TJvExTreeView = class(TTreeView, IJvWinControlEvents, IJvControlEvents) {$IFDEF VCL} protected *************** *** 607,611 **** // // -------------------------------------- ! TJvExListView = class(TListView, IJvWinControlEvents, IJvControlEvents) {$IFDEF VCL} protected --- 605,609 ---- // // -------------------------------------- ! TJvExCustomListView = class(TCustomListView, IJvWinControlEvents, IJvControlEvents) {$IFDEF VCL} protected *************** *** 652,660 **** {$ENDIF} end; - - {$IFDEF COMPILER7_UP} // // -------------------------------------- ! TJvExAnimate = class(TAnimate, IJvWinControlEvents, IJvControlEvents) {$IFDEF VCL} protected --- 650,656 ---- {$ENDIF} end; // // -------------------------------------- ! TJvExListView = class(TListView, IJvWinControlEvents, IJvControlEvents) {$IFDEF VCL} protected *************** *** 701,706 **** {$ENDIF} end; ! {$ELSE} ! {$IFDEF VCL} // // -------------------------------------- --- 697,709 ---- {$ENDIF} end; ! ! {$DEFINE ANIMATE} ! {$IFDEF COMPILER6_UP} ! {$IF not declared(TAnimate)} ! {$UNDEF ANIMATE} ! {$IFEND} ! {$ENDIF COMPILER6_UP} ! ! {$IFDEF ANIMATE} // // -------------------------------------- *************** *** 750,755 **** {$ENDIF} end; ! {$ENDIF VCL} ! {$ENDIF COMPILER7_UP} // // -------------------------------------- --- 753,757 ---- {$ENDIF} end; ! {$ENDIF ANIMATE} // // -------------------------------------- *************** *** 1882,1926 **** // ----------------------------------------------------------------------------- {$IFDEF VCL} ! procedure TJvExProgressBar.VisibleChanged; begin InheritMsg(Self, CM_VISIBLECHANGED); end; ! procedure TJvExProgressBar.EnabledChanged; begin InheritMsg(Self, CM_ENABLEDCHANGED); end; ! procedure TJvExProgressBar.TextChanged; begin InheritMsg(Self, CM_TEXTCHANGED); end; ! procedure TJvExProgressBar.FontChanged; begin InheritMsg(Self, CM_FONTCHANGED); end; ! procedure TJvExProgressBar.ColorChanged; begin InheritMsg(Self, CM_COLORCHANGED); end; ! procedure TJvExProgressBar.ParentColorChanged; begin InheritMsg(Self, CM_PARENTCOLORCHANGED); end; ! procedure TJvExProgressBar.ParentFontChanged; begin InheritMsg(Self, CM_PARENTFONTCHANGED); end; ! procedure TJvExProgressBar.ParentShowHintChanged; begin InheritMsg(Self, CM_PARENTSHOWHINTCHANGED); end; ! function TJvExProgressBar.WantKey(Key: Integer; Shift: TShiftState; const KeyText: WideString): Boolean; begin --- 1884,1928 ---- // ----------------------------------------------------------------------------- {$IFDEF VCL} ! procedure TJvExStatusBar.VisibleChanged; begin InheritMsg(Self, CM_VISIBLECHANGED); end; ! procedure TJvExStatusBar.EnabledChanged; begin InheritMsg(Self, CM_ENABLEDCHANGED); end; ! procedure TJvExStatusBar.TextChanged; begin InheritMsg(Self, CM_TEXTCHANGED); end; ! procedure TJvExStatusBar.FontChanged; begin InheritMsg(Self, CM_FONTCHANGED); end; ! procedure TJvExStatusBar.ColorChanged; begin InheritMsg(Self, CM_COLORCHANGED); end; ! procedure TJvExStatusBar.ParentColorChanged; begin InheritMsg(Self, CM_PARENTCOLORCHANGED); end; ! procedure TJvExStatusBar.ParentFontChanged; begin InheritMsg(Self, CM_PARENTFONTCHANGED); end; ! procedure TJvExStatusBar.ParentShowHintChanged; begin InheritMsg(Self, CM_PARENTSHOWHINTCHANGED); end; ! function TJvExStatusBar.WantKey(Key: Integer; Shift: TShiftState; const KeyText: WideString): Boolean; begin *************** *** 1928,1942 **** end; ! function TJvExProgressBar.HintShow(var HintInfo: THintInfo): Boolean; begin Result := InheritMsg(Self, CM_HINTSHOW, 0, Integer(@HintInfo)) <> 0; end; ! function TJvExProgressBar.HitTest(X, Y: Integer): Boolean; begin Result := InheritMsg(Self, CM_HITTEST, 0, Integer(PointToSmallPoint(Point(X, Y)))) <> 0; end; ! procedure TJvExProgressBar.MouseEnter(Control: TControl); begin InheritMsg(Self, CM_MOUSEENTER, 0, Integer(Control)); --- 1930,1944 ---- end; ! function TJvExStatusBar.HintShow(var HintInfo: THintInfo): Boolean; begin Result := InheritMsg(Self, CM_HINTSHOW, 0, Integer(@HintInfo)) <> 0; end; ! function TJvExStatusBar.HitTest(X, Y: Integer): Boolean; begin Result := InheritMsg(Self, CM_HITTEST, 0, Integer(PointToSmallPoint(Point(X, Y)))) <> 0; end; ! procedure TJvExStatusBar.MouseEnter(Control: TControl); begin InheritMsg(Self, CM_MOUSEENTER, 0, Integer(Control)); *************** *** 1945,1949 **** end; ! procedure TJvExProgressBar.MouseLeave(Control: TControl); begin InheritMsg(Self, CM_MOUSELEAVE, 0, Integer(Control)); --- 1947,1951 ---- end; ! procedure TJvExStatusBar.MouseLeave(Control: TControl); begin InheritMsg(Self, CM_MOUSELEAVE, 0, Integer(Control)); *************** *** 1954,1958 **** {$IFDEF VisualCLX} {$IF not declared(PatchedVCLX)} ! procedure TJvExProgressBar.MouseEnter(Control: TControl); begin inherited MouseEnter(Control); --- 1956,1960 ---- {$IFDEF VisualCLX} {$IF not declared(PatchedVCLX)} ! procedure TJvExStatusBar.MouseEnter(Control: TControl); begin inherited MouseEnter(Control); *************** *** 1961,1965 **** end; ! procedure TJvExProgressBar.MouseLeave(Control: TControl); begin inherited MouseLeave(Control); --- 1963,1967 ---- end; ! procedure TJvExStatusBar.MouseLeave(Control: TControl); begin inherited MouseLeave(Control); *************** *** 1970,1989 **** {$ENDIF VisualCLX} {$IFDEF VCL} ! procedure TJvExProgressBar.CursorChanged; begin InheritMsg(Self, CM_CURSORCHANGED); end; ! procedure TJvExProgressBar.ShowHintChanged; begin InheritMsg(Self, CM_SHOWHINTCHANGED); end; ! procedure TJvExProgressBar.ShowingChanged; begin InheritMsg(Self, CM_SHOWINGCHANGED); end; ! procedure TJvExProgressBar.ControlsListChanging(Control: TControl; Inserting: Boolean); begin if Inserting then --- 1972,1991 ---- {$ENDIF VisualCLX} {$IFDEF VCL} ! procedure TJvExStatusBar.CursorChanged; begin InheritMsg(Self, CM_CURSORCHANGED); end; ! procedure TJvExStatusBar.ShowHintChanged; begin InheritMsg(Self, CM_SHOWHINTCHANGED); end; ! procedure TJvExStatusBar.ShowingChanged; begin InheritMsg(Self, CM_SHOWINGCHANGED); end; ! procedure TJvExStatusBar.ControlsListChanging(Control: TControl; Inserting: Boolean); begin if Inserting then *************** *** 1993,1997 **** end; ! procedure TJvExProgressBar.ControlsListChanged(Control: TControl; Inserting: Boolean); begin if not Inserting then --- 1995,1999 ---- end; ! procedure TJvExStatusBar.ControlsListChanged(Control: TControl; Inserting: Boolean); begin if not Inserting then *************** *** 2002,2006 **** {$ENDIF VCL} {$IFDEF VCL} ! procedure TJvExProgressBar.Dispatch(var Message); begin if not DispatchMsg(Self, Message) then --- 2004,2008 ---- {$ENDIF VCL} {$IFDEF VCL} ! procedure TJvExStatusBar.Dispatch(var Message); begin if not DispatchMsg(Self, Message) then *************** *** 2008,2055 **** end; {$ENDIF VCL} // // ----------------------------------------------------------------------------- {$IFDEF VCL} ! procedure TJvExStatusBar.VisibleChanged; begin InheritMsg(Self, CM_VISIBLECHANGED); end; ! procedure TJvExStatusBar.EnabledChanged; begin InheritMsg(Self, CM_ENABLEDCHANGED); end; ! procedure TJvExStatusBar.TextChanged; begin InheritMsg(Self, CM_TEXTCHANGED); end; ! procedure TJvExStatusBar.FontChanged; begin InheritMsg(Self, CM_FONTCHANGED); end; ! procedure TJvExStatusBar.ColorChanged; begin InheritMsg(Self, CM_COLORCHANGED); end; ! procedure TJvExStatusBar.ParentColorChanged; begin InheritMsg(Self, CM_PARENTCOLORCHANGED); end; ! procedure TJvExStatusBar.ParentFontChanged; begin InheritMsg(Self, CM_PARENTFONTCHANGED); end; ! procedure TJvExStatusBar.ParentShowHintChanged; begin InheritMsg(Self, CM_PARENTSHOWHINTCHANGED); end; ! function TJvExStatusBar.WantKey(Key: Integer; Shift: TShiftState; const KeyText: WideString): Boolean; begin --- 2010,2058 ---- end; {$ENDIF VCL} + {$IFDEF VCL} // // ----------------------------------------------------------------------------- {$IFDEF VCL} ! procedure TJvExProgressBar.VisibleChanged; begin InheritMsg(Self, CM_VISIBLECHANGED); end; ! procedure TJvExProgressBar.EnabledChanged; begin InheritMsg(Self, CM_ENABLEDCHANGED); end; ! procedure TJvExProgressBar.TextChanged; begin InheritMsg(Self, CM_TEXTCHANGED); end; ! procedure TJvExProgressBar.FontChanged; begin InheritMsg(Self, CM_FONTCHANGED); end; ! procedure TJvExProgressBar.ColorChanged; begin InheritMsg(Self, CM_COLORCHANGED); end; ! procedure TJvExProgressBar.ParentColorChanged; begin InheritMsg(Self, CM_PARENTCOLORCHANGED); end; ! procedure TJvExProgressBar.ParentFontChanged; begin InheritMsg(Self, CM_PARENTFONTCHANGED); end; ! procedure TJvExProgressBar.ParentShowHintChanged; begin InheritMsg(Self, CM_PARENTSHOWHINTCHANGED); end; ! function TJvExProgressBar.WantKey(Key: Integer; Shift: TShiftState; const KeyText: WideString): Boolean; begin *************** *** 2057,2071 **** end; ! function TJvExStatusBar.HintShow(var HintInfo: THintInfo): Boolean; begin Result := InheritMsg(Self, CM_HINTSHOW, 0, Integer(@HintInfo)) <> 0; end; ! function TJvExStatusBar.HitTest(X, Y: Integer): Boolean; begin Result := InheritMsg(Self, CM_HITTEST, 0, Integer(PointToSmallPoint(Point(X, Y)))) <> 0; end; ! procedure TJvExStatusBar.MouseEnter(Control: TControl); begin InheritMsg(Self, CM_MOUSEENTER, 0, Integer(Control)); --- 2060,2074 ---- end; ! function TJvExProgressBar.HintShow(var HintInfo: THintInfo): Boolean; begin Result := InheritMsg(Self, CM_HINTSHOW, 0, Integer(@HintInfo)) <> 0; end; ! function TJvExProgressBar.HitTest(X, Y: Integer): Boolean; begin Result := InheritMsg(Self, CM_HITTEST, 0, Integer(PointToSmallPoint(Point(X, Y)))) <> 0; end; ! procedure TJvExProgressBar.MouseEnter(Control: TControl); begin InheritMsg(Self, CM_MOUSEENTER, 0, Integer(Control)); *************** *** 2074,2078 **** end; ! procedure TJvExStatusBar.MouseLeave(Control: TControl); begin InheritMsg(Self, CM_MOUSELEAVE, 0, Integer(Control)); --- 2077,2081 ---- end; ! procedure TJvExProgressBar.MouseLeave(Control: TControl); begin InheritMsg(Self, CM_MOUSELEAVE, 0, Integer(Control)); *************** *** 2083,2087 **** {$IFDEF VisualCLX} {$IF not declared(PatchedVCLX)} ! procedure TJvExStatusBar.MouseEnter(Control: TControl); begin inherited MouseEnter(Control); --- 2086,2090 ---- {$IFDEF VisualCLX} {$IF not declared(PatchedVCLX)} ! procedure TJvExProgressBar.MouseEnter(Control: TControl); begin inherited MouseEnter(Control); *************** *** 2090,2094 **** end; ! procedure TJvExStatusBar.MouseLeave(Control: TControl); begin inherited MouseLeave(Control); --- 2093,2097 ---- end; ! procedure TJvExProgressBar.MouseLeave(Control: TControl); begin inherited MouseLeave(Control); *************** *** 2099,2118 **** {$ENDIF VisualCLX} {$IFDEF VCL} ! procedure TJvExStatusBar.CursorChanged; begin InheritMsg(Self, CM_CURSORCHANGED); end; ! procedure TJvExStatusBar.ShowHintChanged; begin InheritMsg(Self, CM_SHOWHINTCHANGED); end; ! procedure TJvExStatusBar.ShowingChanged; begin InheritMsg(Self, CM_SHOWINGCHANGED); end; ! procedure TJvExStatusBar.ControlsListChanging(Control: TControl; Inserting: Boolean); begin if Inserting then --- 2102,2121 ---- {$ENDIF VisualCLX} {$IFDEF VCL} ! procedure TJvExProgressBar.CursorChanged; begin InheritMsg(Self, CM_CURSORCHANGED); end; ! procedure TJvExProgressBar.ShowHintChanged; begin InheritMsg(Self, CM_SHOWHINTCHANGED); end; ! procedure TJvExProgressBar.ShowingChanged; begin InheritMsg(Self, CM_SHOWINGCHANGED); end; ! procedure TJvExProgressBar.ControlsListChanging(Control: TControl; Inserting: Boolean); begin if Inserting then *************** *** 2122,2126 **** end; ! procedure TJvExStatusBar.ControlsListChanged(Control: TControl; Inserting: Boolean); begin if not Inserting then --- 2125,2129 ---- end; ! procedure TJvExProgressBar.ControlsListChanged(Control: TControl; Inserting: Boolean); begin if not Inserting then *************** *** 2131,2135 **** {$ENDIF VCL} {$IFDEF VCL} ! procedure TJvExStatusBar.Dispatch(var Message); begin if not DispatchMsg(Self, Message) then --- 2134,2236 ---- {$ENDIF VCL} {$IFDEF VCL} ! procedure TJvExProgressBar.Dispatch(var Message); ! begin ! if not DispatchMsg(Self, Message) then ! inherited Dispatch(Message); ! end; ! {$ENDIF VCL} ! {$ELSE} ! // ! // ----------------------------------------------------------------------------- ! {$IFDEF VCL} ! procedure TJvExProgressBar.VisibleChanged; ! begin ! InheritMsg(Self, CM_VISIBLECHANGED); ! end; ! ! procedure TJvExProgressBar.EnabledChanged; ! begin ! InheritMsg(Self, CM_ENABLEDCHANGED); ! end; ! ! procedure TJvExProgressBar.TextChanged; ! begin ! InheritMsg(Self, CM_TEXTCHANGED); ! end; ! ! procedure TJvExProgressBar.FontChanged; ! begin ! InheritMsg(Self, CM_FONTCHANGED); ! end; ! ! procedure TJvExProgressBar.ColorChanged; ! begin ! InheritMsg(Self, CM_COLORCHANGED); ! end; ! ! procedure TJvExProgressBar.ParentColorChanged; ! begin ! InheritMsg(Self, CM_PARENTCOLORCHANGED); ! end; ! ! procedure TJvExProgressBar.ParentFontChanged; ! begin ! InheritMsg(Self, CM_PARENTFONTCHANGED); ! end; ! ! procedure TJvExProgressBar.ParentShowHintChanged; ! begin ! InheritMsg(Self, CM_PARENTSHOWHINTCHANGED); ! end; ! ! function TJvExProgressBar.WantKey(Key: Integer; Shift: TShiftState; ! const KeyText: WideString): Boolean; ! begin ! Result := InheritMsg(Self, CM_DIALOGCHAR, Word(Key), ShiftStateToKeyData(Shift)) <> 0; ! end; ! ! function TJvExProgressBar.HintShow(var HintInfo: THintInfo): Boolean; ! begin ! Result := InheritMsg(Self, CM_HINTSHOW, 0, Integer(@HintInfo)) <> 0; ! end; ! ! function TJvExProgressBar.HitTest(X, Y: Integer): Boolean; ! begin ! Result := InheritMsg(Self, CM_HITTEST, 0, Integer(PointToSmallPoint(Point(X, Y)))) <> 0; ! end; ! ! procedure TJvExProgressBar.MouseEnter(Control: TControl); ! begin ! InheritMsg(Self, CM_MOUSEENTER, 0, Integer(Control)); ! if Assigned(FOnMouseEnter) then ! FOnMouseEnter(Self); ! end; ! ! procedure TJvExProgressBar.MouseLeave(Control: TControl); ! begin ! InheritMsg(Self, CM_MOUSELEAVE, 0, Integer(Control)); ! if Assigned(FOnMouseLeave) then ! FOnMouseLeave(Self); ! end; ! {$ENDIF VCL} ! {$IFDEF VisualCLX} ! {$IF not declared(PatchedVCLX)} ! procedure TJvExProgressBar.MouseEnter(Control: TControl); ! begin ! inherited MouseEnter(Control); ! if Assigned(FOnMouseEnter) then ! FOnMouseEnter(Self); ! end; ! ! procedure TJvExProgressBar.MouseLeave(Control: TControl); ! begin ! inherited MouseLeave(Control); ! if Assigned(FOnMouseLeave) then ! FOnMouseLeave(Self); ! end; ! {$IFEND} ! {$ENDIF VisualCLX} ! {$IFDEF VCL} ! procedure TJvExProgressBar.Dispatch(var Message); begin if not DispatchMsg(Self, Message) then *************** *** 2137,2140 **** --- 2238,2242 ---- end; {$ENDIF VCL} + {$ENDIF VCL} {$IFDEF COMPILER6_UP} // *************** *** 2267,2270 **** --- 2369,2373 ---- end; {$ENDIF VCL} + {$IFDEF VCL} // // ----------------------------------------------------------------------------- *************** *** 2396,2399 **** --- 2499,2503 ---- end; {$ENDIF VCL} + {$ENDIF VCL} {$ENDIF COMPILER6_UP} // *************** *** 3043,3178 **** {$ENDIF VCL} ! {$IFDEF COMPILER7_UP} ! // ! // ----------------------------------------------------------------------------- ! {$IFDEF VCL} ! procedure TJvExAnimate.VisibleChanged; ! begin ! InheritMsg(Self, CM_VISIBLECHANGED); ! end; ! ! procedure TJvExAnimate.EnabledChanged; ! begin ! InheritMsg(Self, CM_ENABLEDCHANGED); ! end; ! ! procedure TJvExAnimate.TextChanged; ! begin ! InheritMsg(Self, CM_TEXTCHANGED); ! end; ! ! procedure TJvExAnimate.FontChanged; ! begin ! InheritMsg(Self, CM_FONTCHANGED); ! end; ! ! procedure TJvExAnimate.ColorChanged; ! begin ! InheritMsg(Self, CM_COLORCHANGED); ! end; ! ! procedure TJvExAnimate.ParentColorChanged; ! begin ! InheritMsg(Self, CM_PARENTCOLORCHANGED); ! end; ! ! procedure TJvExAnimate.ParentFontChanged; ! begin ! InheritMsg(Self, CM_PARENTFONTCHANGED); ! end; ! ! procedure TJvExAnimate.ParentShowHintChanged; ! begin ! InheritMsg(Self, CM_PARENTSHOWHINTCHANGED); ! end; ! ! function TJvExAnimate.WantKey(Key: Integer; Shift: TShiftState; ! const KeyText: WideString): Boolean; ! begin ! Result := InheritMsg(Self, CM_DIALOGCHAR, Word(Key), ShiftStateToKeyData(Shift)) <> 0; ! end; ! ! function TJvExAnimate.HintShow(var HintInfo: THintInfo): Boolean; ! begin ! Result := InheritMsg(Self, CM_HINTSHOW, 0, Integer(@HintInfo)) <> 0; ! end; ! ! function TJvExAnimate.HitTest(X, Y: Integer): Boolean; ! begin ! Result := InheritMsg(Self, CM_HITTEST, 0, Integer(PointToSmallPoint(Point(X, Y)))) <> 0; ! end; ! ! procedure TJvExAnimate.MouseEnter(Control: TControl); ! begin ! InheritMsg(Self, CM_MOUSEENTER, 0, Integer(Control)); ! if Assigned(FOnMouseEnter) then ! FOnMouseEnter(Self); ! end; ! ! procedure TJvExAnimate.MouseLeave(Control: TControl); ! begin ! InheritMsg(Self, CM_MOUSELEAVE, 0, Integer(Control)); ! if Assigned(FOnMouseLeave) then ! FOnMouseLeave(Self); ! end; ! {$ENDIF VCL} ! {$IFDEF VisualCLX} ! {$IF not declared(PatchedVCLX)} ! procedure TJvExAnimate.MouseEnter(Control: TControl); ! begin ! inherited MouseEnter(Control); ! if Assigned(FOnMouseEnter) then ! FOnMouseEnter(Self); ! end; ! ! procedure TJvExAnimate.MouseLeave(Control: TControl); ! begin ! inherited MouseLeave(Control); ! if Assigned(FOnMouseLeave) then ! FOnMouseLeave(Self); ! end; ! {$IFEND} ! {$ENDIF VisualCLX} ! {$IFDEF VCL} ! procedure TJvExAnimate.CursorChanged; ! begin ! InheritMsg(Self, CM_CURSORCHANGED); ! end; ! ! procedure TJvExAnimate.ShowHintChanged; ! begin ! InheritMsg(Self, CM_SHOWHINTCHANGED); ! end; ! ! procedure TJvExAnimate.ShowingChanged; ! begin ! InheritMsg(Self, CM_SHOWINGCHANGED); ! end; ! ! procedure TJvExAnimate.ControlsListChanging(Control: TControl; Inserting: Boolean); ! begin ! if Inserting then ! InheritMsg(Self, CM_CONTROLLISTCHANGE, Integer(Control), Integer(Inserting)) ! else ! InheritMsg(Self, CM_CONTROLCHANGE, Integer(Control), Integer(Inserting)) ! end; ! ! procedure TJvExAnimate.ControlsListChanged(Control: TControl; Inserting: Boolean); ! begin ! if not Inserting then ! InheritMsg(Self, CM_CONTROLLISTCHANGE, Integer(Control), Integer(Inserting)) ! else ! InheritMsg(Self, CM_CONTROLCHANGE, Integer(Control), Integer(Inserting)) ! end; ! {$ENDIF VCL} ! {$IFDEF VCL} ! procedure TJvExAnimate.Dispatch(var Message); ! begin ! if not DispatchMsg(Self, Message) then ! inherited Dispatch(Message); ! end; ! {$ENDIF VCL} ! {$ELSE} ! {$IFDEF VCL} // // ----------------------------------------------------------------------------- --- 3147,3151 ---- {$ENDIF VCL} ! {$IFDEF ANIMATE} // // ----------------------------------------------------------------------------- *************** *** 3304,3309 **** end; {$ENDIF VCL} ! {$ENDIF VCL} ! {$ENDIF COMPILER7_UP} // // ----------------------------------------------------------------------------- --- 3277,3281 ---- end; {$ENDIF VCL} ! {$ENDIF ANIMATE} // // ----------------------------------------------------------------------------- Index: JvExExtCtrls.pas =================================================================== RCS file: /cvsroot/jvcl/dev/JVCL3/run/JvExExtCtrls.pas,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** JvExExtCtrls.pas 5 Jan 2004 14:28:18 -0000 1.1 --- JvExExtCtrls.pas 5 Jan 2004 18:22:31 -0000 1.2 *************** *** 427,430 **** --- 427,432 ---- {$ENDIF} end; + + {$IFDEF VCL} // // -------------------------------------- *************** *** 521,526 **** {$ENDIF} end; - - {$IFDEF VCL} // // -------------------------------------- --- 523,526 ---- *************** *** 1899,1902 **** --- 1899,1904 ---- end; {$ENDIF VCL} + + {$IFDEF VCL} // // ----------------------------------------------------------------------------- *************** *** 2157,2162 **** end; {$ENDIF VCL} - - {$IFDEF VCL} // // ----------------------------------------------------------------------------- --- 2159,2162 ---- |