Menu
▾
▴
[JVCL-Checkins] CVS: dev/JVCL3/run JvBDESecurity.pas,1.3,1.4 JvBandObject.pas,1.4,1.5 JvJCLUtils.pas,1.34,1.35 JvThumbViews.pas,1.4,1.5 - reduce custom IFDEFs
|
From: Robert M. <mar...@us...> - 2003-11-28 17:56:16
|
Update of /cvsroot/jvcl/dev/JVCL3/run
In directory sc8-pr-cvs1:/tmp/cvs-serv28220/JVCL3/run
Modified Files:
JvBDESecurity.pas JvBandObject.pas JvJCLUtils.pas
JvThumbViews.pas
Log Message:
reduce custom IFDEFs
Index: JvBDESecurity.pas
===================================================================
RCS file: /cvsroot/jvcl/dev/JVCL3/run/JvBDESecurity.pas,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** JvBDESecurity.pas 24 Jun 2003 16:14:47 -0000 1.3
--- JvBDESecurity.pas 28 Nov 2003 17:56:11 -0000 1.4
***************
*** 88,92 ****
inherited Create(AOwner);
FSelectAlias := False;
! FLoginNameField := EmptyStr;
end;
--- 88,92 ----
inherited Create(AOwner);
FSelectAlias := False;
! FLoginNameField := '';
end;
Index: JvBandObject.pas
===================================================================
RCS file: /cvsroot/jvcl/dev/JVCL3/run/JvBandObject.pas,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** JvBandObject.pas 19 Nov 2003 17:03:11 -0000 1.4
--- JvBandObject.pas 28 Nov 2003 17:56:11 -0000 1.5
***************
*** 30,35 ****
{$I JVCL.INC}
- {.$DEFINE DEBUG}
-
unit JvBandObject;
--- 30,33 ----
***************
*** 95,99 ****
TzCustomBandObject = class(TComObject, IDeskBand, IObjectWithSite, IPersist, IPersistStream, IInputObject)
private
! FBandForm: TjvBandForm;
FBandID: DWORD;
FViewMode: DWORD;
--- 93,97 ----
TzCustomBandObject = class(TComObject, IDeskBand, IObjectWithSite, IPersist, IPersistStream, IInputObject)
private
! FBandForm: TJvBandForm;
FBandID: DWORD;
FViewMode: DWORD;
***************
*** 168,174 ****
uses
! // (rom) debugging deactivated
! {$IFDEF Debug}
! //zTrace, JclStrings,
{$ENDIF}
Registry, SysUtils, Math, JvJVCLUtils;
--- 166,171 ----
uses
! {$IFDEF DEBUGINFO_ON}
! //zTrace,
{$ENDIF}
Registry, SysUtils, Math, JvJVCLUtils;
***************
*** 178,181 ****
--- 175,185 ----
cCLSID = 'CLSID\';
+ {$IFDEF DEBUGINFO_ON}
+ // (rom) debugging deactivated
+ procedure zTraceLog(const LogText: string);
+ begin
+ end;
+ {$ENDIF DEBUGINFO_ON}
+
function MakeHResult(Sev, Fac, Code: LongWord): HRESULT;
begin
***************
*** 375,381 ****
procedure TzCustomBandObject.AfterConstruction;
begin
! {$IFDEF Debug}
! //zTraceLog(ClassName + '.AfterConstruction()');
! {$ENDIF}
inherited AfterConstruction;
FBandForm := nil;
--- 379,385 ----
procedure TzCustomBandObject.AfterConstruction;
begin
! {$IFDEF DEBUGINFO_ON}
! zTraceLog(ClassName + '.AfterConstruction()');
! {$ENDIF DEBUGINFO_ON}
inherited AfterConstruction;
FBandForm := nil;
***************
*** 386,392 ****
procedure TzCustomBandObject.BeforeDestruction;
begin
! {$IFDEF Debug}
! //zTraceLog(ClassName + '.BeforeDestruction()');
! {$ENDIF}
if Assigned(FSite) then
FSite := nil; // implicit Release
--- 390,396 ----
procedure TzCustomBandObject.BeforeDestruction;
begin
! {$IFDEF DEBUGINFO_ON}
! zTraceLog(ClassName + '.BeforeDestruction()');
! {$ENDIF DEBUGINFO_ON}
if Assigned(FSite) then
FSite := nil; // implicit Release
***************
*** 395,401 ****
if Assigned(FBandForm) then
FreeAndNil(FBandForm);
! {$IFDEF Debug}
! //zTraceLog(ClassName + '.BeforeDestruction End()');
! {$ENDIF}
inherited BeforeDestruction;
end;
--- 399,405 ----
if Assigned(FBandForm) then
FreeAndNil(FBandForm);
! {$IFDEF DEBUGINFO_ON}
! zTraceLog(ClassName + '.BeforeDestruction End()');
! {$ENDIF DEBUGINFO_ON}
inherited BeforeDestruction;
end;
***************
*** 496,506 ****
var Dbi: TDeskBandInfo): HRESULT;
begin
! {$IFDEF Debug}
! //zTraceLog(ClassName + '.GetBandInfo()');
! //zTraceLog(' BandID=' + Format('0x%x', [BandID]));
! //zTraceLog(' ViewMode=' + Format('0x%x', [ViewMode]));
! //zTraceLog(' Dbi=' + Format('0x%p', [@Dbi]));
! //zTraceLog(' dwMask=' + Format('0x%x', [Dbi.dwMask]));
! {$ENDIF}
FBandID := BandID;
FViewMode := ViewMode;
--- 500,510 ----
var Dbi: TDeskBandInfo): HRESULT;
begin
! {$IFDEF DEBUGINFO_ON}
! zTraceLog(ClassName + '.GetBandInfo()');
! zTraceLog(' BandID=' + Format('0x%x', [BandID]));
! zTraceLog(' ViewMode=' + Format('0x%x', [ViewMode]));
! zTraceLog(' Dbi=' + Format('0x%p', [@Dbi]));
! zTraceLog(' dwMask=' + Format('0x%x', [Dbi.dwMask]));
! {$ENDIF DEBUGINFO_ON}
FBandID := BandID;
FViewMode := ViewMode;
***************
*** 515,549 ****
begin
ptMinSize := BandMinSize;
! {$IFDEF Debug}
! //zTraceLog(' Dbi.ptMinSize=' + Format('(%d,%d)', [ptMinSize.x, ptMinSize.y]));
! {$ENDIF}
end;
if (dwMask and DBIM_MAXSIZE) <> 0 then
begin
ptMaxSize := BandMaxSize;
! {$IFDEF Debug}
! //zTraceLog(' Dbi.ptMaxSize=' + Format('(%d,%d)', [ptMaxSize.x, ptMaxSize.y]));
! {$ENDIF}
end;
if (dwMask and DBIM_INTEGRAL) <> 0 then
begin
ptIntegral := BandIntegral;
! {$IFDEF Debug}
! //zTraceLog(' Dbi.ptIntegral=' + Format('(%d,%d)', [ptIntegral.x, ptIntegral.y]));
! {$ENDIF}
end;
if (dwMask and DBIM_ACTUAL) <> 0 then
begin
ptActual := BandActualSize;
! {$IFDEF Debug}
! //zTraceLog(' Dbi.ptActual=' + Format('(%d,%d)', [ptActual.x, ptActual.y]));
! {$ENDIF}
end;
if (dwMask and DBIM_TITLE) <> 0 then
begin
StringToWideChar(Caption, @wszTitle[0], Length(wszTitle));
! {$IFDEF Debug}
! //zTraceLog(' Dbi.wszTitle=' + Format('%s', [Caption]));
! {$ENDIF}
end;
if (dwMask and DBIM_MODEFLAGS) <> 0 then
--- 519,553 ----
begin
ptMinSize := BandMinSize;
! {$IFDEF DEBUGINFO_ON}
! zTraceLog(' Dbi.ptMinSize=' + Format('(%d,%d)', [ptMinSize.x, ptMinSize.y]));
! {$ENDIF DEBUGINFO_ON}
end;
if (dwMask and DBIM_MAXSIZE) <> 0 then
begin
ptMaxSize := BandMaxSize;
! {$IFDEF DEBUGINFO_ON}
! zTraceLog(' Dbi.ptMaxSize=' + Format('(%d,%d)', [ptMaxSize.x, ptMaxSize.y]));
! {$ENDIF DEBUGINFO_ON}
end;
if (dwMask and DBIM_INTEGRAL) <> 0 then
begin
ptIntegral := BandIntegral;
! {$IFDEF DEBUGINFO_ON}
! zTraceLog(' Dbi.ptIntegral=' + Format('(%d,%d)', [ptIntegral.x, ptIntegral.y]));
! {$ENDIF DEBUGINFO_ON}
end;
if (dwMask and DBIM_ACTUAL) <> 0 then
begin
ptActual := BandActualSize;
! {$IFDEF DEBUGINFO_ON}
! zTraceLog(' Dbi.ptActual=' + Format('(%d,%d)', [ptActual.x, ptActual.y]));
! {$ENDIF DEBUGINFO_ON}
end;
if (dwMask and DBIM_TITLE) <> 0 then
begin
StringToWideChar(Caption, @wszTitle[0], Length(wszTitle));
! {$IFDEF DEBUGINFO_ON}
! zTraceLog(' Dbi.wszTitle=' + Format('%s', [Caption]));
! {$ENDIF DEBUGINFO_ON}
end;
if (dwMask and DBIM_MODEFLAGS) <> 0 then
***************
*** 556,569 ****
if bmfBkColor in BandModeFlags then
dwModeFlags := dwModeFlags or DBIMF_BKCOLOR;
! {$IFDEF Debug}
! //zTraceLog(' Dbi.dwModeFlags=' + Format('0x%x', [dwModeFlags]));
! {$ENDIF}
end;
if (dwMask and DBIM_BKCOLOR) <> 0 then
begin
crBkgnd := Color;
! {$IFDEF Debug}
! //zTraceLog(' Dbi.crBkgnd=' + Format('0x%x', [crBkgnd]));
! {$ENDIF}
end;
end;
--- 560,573 ----
if bmfBkColor in BandModeFlags then
dwModeFlags := dwModeFlags or DBIMF_BKCOLOR;
! {$IFDEF DEBUGINFO_ON}
! zTraceLog(' Dbi.dwModeFlags=' + Format('0x%x', [dwModeFlags]));
! {$ENDIF DEBUGINFO_ON}
end;
if (dwMask and DBIM_BKCOLOR) <> 0 then
begin
crBkgnd := Color;
! {$IFDEF DEBUGINFO_ON}
! zTraceLog(' Dbi.crBkgnd=' + Format('0x%x', [crBkgnd]));
! {$ENDIF DEBUGINFO_ON}
end;
end;
***************
*** 575,582 ****
function TzCustomBandObject.ShowDW(AShow: BOOL): HRESULT;
begin
! {$IFDEF Debug}
! //zTraceLog(ClassName + '.ShowDW()');
! //zTraceLog(' Show=' + BooleanToStr(Show));
! {$ENDIF}
Result := NOERROR;
if not Assigned(FBandForm) then
--- 579,589 ----
function TzCustomBandObject.ShowDW(AShow: BOOL): HRESULT;
begin
! {$IFDEF DEBUGINFO_ON}
! zTraceLog(ClassName + '.ShowDW()');
! if AShow then
! zTraceLog(' Show=True')
! else
! zTraceLog(' Show=False');
! {$ENDIF DEBUGINFO_ON}
Result := NOERROR;
if not Assigned(FBandForm) then
***************
*** 591,604 ****
else
Hide;
! {$IFDEF Debug}
! //zTraceLog(ClassName + '.ShowDW() End');
! {$ENDIF}
end;
function TzCustomBandObject.CloseDW(dwReserved: DWORD): HRESULT;
begin
! {$IFDEF Debug}
! //zTraceLog(ClassName + '.CloseDW()');
! {$ENDIF}
Result := NOERROR;
try
--- 598,611 ----
else
Hide;
! {$IFDEF DEBUGINFO_ON}
! zTraceLog(ClassName + '.ShowDW() End');
! {$ENDIF DEBUGINFO_ON}
end;
function TzCustomBandObject.CloseDW(dwReserved: DWORD): HRESULT;
begin
! {$IFDEF DEBUGINFO_ON}
! zTraceLog(ClassName + '.CloseDW()');
! {$ENDIF DEBUGINFO_ON}
Result := NOERROR;
try
***************
*** 623,629 ****
ToolbarSite: IUnknown; Reserved: BOOL): HRESULT;
begin
! {$IFDEF Debug}
! //zTraceLog(ClassName + '.ResizeBorderDW()');
! {$ENDIF}
// Never called for band objects.
Result := E_NOTIMPL;
--- 630,636 ----
ToolbarSite: IUnknown; Reserved: BOOL): HRESULT;
begin
! {$IFDEF DEBUGINFO_ON}
! zTraceLog(ClassName + '.ResizeBorderDW()');
! {$ENDIF DEBUGINFO_ON}
// Never called for band objects.
Result := E_NOTIMPL;
***************
*** 634,647 ****
function TzCustomBandObject.GetWindow(out Wnd: HWND): HRESULT;
begin
! {$IFDEF Debug}
! //zTraceLog(ClassName + '.GetWindow()');
! {$ENDIF}
if Assigned(FBandForm) then
Wnd := FBandForm.Handle
else
Wnd := 0;
! {$IFDEF Debug}
! //zTraceLog(' Wnd=' + Format('0x%x', [Wnd]));
! {$ENDIF}
Result := S_OK;
end;
--- 641,654 ----
function TzCustomBandObject.GetWindow(out Wnd: HWND): HRESULT;
begin
! {$IFDEF DEBUGINFO_ON}
! zTraceLog(ClassName + '.GetWindow()');
! {$ENDIF DEBUGINFO_ON}
if Assigned(FBandForm) then
Wnd := FBandForm.Handle
else
Wnd := 0;
! {$IFDEF DEBUGINFO_ON}
! zTraceLog(' Wnd=' + Format('0x%x', [Wnd]));
! {$ENDIF DEBUGINFO_ON}
Result := S_OK;
end;
***************
*** 649,655 ****
function TzCustomBandObject.ContextSensitiveHelp(EnterMode: BOOL): HRESULT;
begin
! {$IFDEF Debug}
! //zTraceLog(ClassName + '.ContextSensitiveHelp()');
! {$ENDIF}
Result := E_NOTIMPL;
end;
--- 656,662 ----
function TzCustomBandObject.ContextSensitiveHelp(EnterMode: BOOL): HRESULT;
begin
! {$IFDEF DEBUGINFO_ON}
! zTraceLog(ClassName + '.ContextSensitiveHelp()');
! {$ENDIF DEBUGINFO_ON}
Result := E_NOTIMPL;
end;
***************
*** 662,669 ****
ParentWnd: HWND;
begin
! {$IFDEF Debug}
! //zTraceLog(ClassName + '.SetSite()');
! //zTraceLog(' Site=' + iif(Assigned(Site), 'not nil', 'nil'));
! {$ENDIF}
if Assigned(FSite) then
FSite := nil; // implicit Release
--- 669,679 ----
ParentWnd: HWND;
begin
! {$IFDEF DEBUGINFO_ON}
! zTraceLog(ClassName + '.SetSite()');
! if Assigned(Site) then
! zTraceLog(' Site=not nil')
! else
! zTraceLog(' Site=nil');
! {$ENDIF DEBUGINFO_ON}
if Assigned(FSite) then
FSite := nil; // implicit Release
***************
*** 684,690 ****
OleWindow := nil;
end;
! {$IFDEF Debug}
! //zTraceLog(' ParentWnd=' + Format('0x%x', [ParentWnd]));
! {$ENDIF}
if ParentWnd = 0 then
begin
--- 694,700 ----
OleWindow := nil;
end;
! {$IFDEF DEBUGINFO_ON}
! zTraceLog(' ParentWnd=' + Format('0x%x', [ParentWnd]));
! {$ENDIF DEBUGINFO_ON}
if ParentWnd = 0 then
begin
***************
*** 705,711 ****
Exit;
end;
! {$IFDEF Debug}
! //zTraceLog(' FSite assigned.');
! {$ENDIF}
if FSite.QueryInterface(IOleCommandTarget, FOleCommandTarget) <> S_OK then
FOleCommandTarget := nil;
--- 715,721 ----
Exit;
end;
! {$IFDEF DEBUGINFO_ON}
! zTraceLog(' FSite assigned.');
! {$ENDIF DEBUGINFO_ON}
if FSite.QueryInterface(IOleCommandTarget, FOleCommandTarget) <> S_OK then
FOleCommandTarget := nil;
***************
*** 717,724 ****
out Site: IUnknown): HRESULT;
begin
! {$IFDEF Debug}
! //zTraceLog(ClassName + '.GetSite()');
! //zTraceLog(' Riid=' + GUIDToString(Riid));
! {$ENDIF}
if not Assigned(FSite) then
begin
--- 727,734 ----
out Site: IUnknown): HRESULT;
begin
! {$IFDEF DEBUGINFO_ON}
! zTraceLog(ClassName + '.GetSite()');
! zTraceLog(' Riid=' + GUIDToString(Riid));
! {$ENDIF DEBUGINFO_ON}
if not Assigned(FSite) then
begin
***************
*** 728,734 ****
end;
Result := FSite.QueryInterface(Riid, Site);
! {$IFDEF Debug}
! //zTraceLog(' Result=' + IntToStr(Result));
! {$ENDIF}
end;
--- 738,744 ----
end;
Result := FSite.QueryInterface(Riid, Site);
! {$IFDEF DEBUGINFO_ON}
! zTraceLog(' Result=' + IntToStr(Result));
! {$ENDIF DEBUGINFO_ON}
end;
***************
*** 737,743 ****
function TzCustomBandObject.IsDirty: HRESULT;
begin
! {$IFDEF Debug}
! //zTraceLog(ClassName + '.IsDirty()');
! {$ENDIF}
Result := S_FALSE;
end;
--- 747,753 ----
function TzCustomBandObject.IsDirty: HRESULT;
begin
! {$IFDEF DEBUGINFO_ON}
! zTraceLog(ClassName + '.IsDirty()');
! {$ENDIF DEBUGINFO_ON}
Result := S_FALSE;
end;
***************
*** 745,751 ****
function TzCustomBandObject.Load(const Strm: IStream): HRESULT;
begin
! {$IFDEF Debug}
! //zTraceLog(ClassName + '.Load()');
! {$ENDIF}
Result := S_OK;
end;
--- 755,761 ----
function TzCustomBandObject.Load(const Strm: IStream): HRESULT;
begin
! {$IFDEF DEBUGINFO_ON}
! zTraceLog(ClassName + '.Load()');
! {$ENDIF DEBUGINFO_ON}
Result := S_OK;
end;
***************
*** 753,759 ****
function TzCustomBandObject.Save(const Strm: IStream; ClearDirty: BOOL): HRESULT;
begin
! {$IFDEF Debug}
! //zTraceLog(ClassName + '.Save()');
! {$ENDIF}
Result := S_OK;
end;
--- 763,769 ----
function TzCustomBandObject.Save(const Strm: IStream; ClearDirty: BOOL): HRESULT;
begin
! {$IFDEF DEBUGINFO_ON}
! zTraceLog(ClassName + '.Save()');
! {$ENDIF DEBUGINFO_ON}
Result := S_OK;
end;
***************
*** 761,767 ****
function TzCustomBandObject.GetSizeMax(out Size: Largeint): HRESULT;
begin
! {$IFDEF Debug}
! //zTraceLog(ClassName + '.GetSizeMax()');
! {$ENDIF}
Size := 0;
Result := S_OK;
--- 771,777 ----
function TzCustomBandObject.GetSizeMax(out Size: Largeint): HRESULT;
begin
! {$IFDEF DEBUGINFO_ON}
! zTraceLog(ClassName + '.GetSizeMax()');
! {$ENDIF DEBUGINFO_ON}
Size := 0;
Result := S_OK;
***************
*** 772,782 ****
function TzCustomBandObject.GetClassID(out ClassID: TCLSID): HRESULT;
begin
! {$IFDEF Debug}
! //zTraceLog(ClassName + '.GetClassID()');
! {$ENDIF}
ClassID := Factory.ClassID;
! {$IFDEF Debug}
! //zTraceLog(' ClassID=' + GUIDToString(ClassID));
! {$ENDIF}
Result := S_OK;
end;
--- 782,792 ----
function TzCustomBandObject.GetClassID(out ClassID: TCLSID): HRESULT;
begin
! {$IFDEF DEBUGINFO_ON}
! zTraceLog(ClassName + '.GetClassID()');
! {$ENDIF DEBUGINFO_ON}
ClassID := Factory.ClassID;
! {$IFDEF DEBUGINFO_ON}
! zTraceLog(' ClassID=' + GUIDToString(ClassID));
! {$ENDIF DEBUGINFO_ON}
Result := S_OK;
end;
***************
*** 787,794 ****
var Msg: TMsg): HRESULT;
begin
! {$IFDEF Debug}
! //zTraceLog(ClassName + '.UIActivateIO()');
! //zTraceLog(' Activate=' + BooleanToStr(Activate));
! {$ENDIF}
Result := S_OK;
FHasFocus := Activate;
--- 797,807 ----
var Msg: TMsg): HRESULT;
begin
! {$IFDEF DEBUGINFO_ON}
! zTraceLog(ClassName + '.UIActivateIO()');
! if Activate then
! zTraceLog(' Activate=True')
! else
! zTraceLog(' Activate=False');
! {$ENDIF DEBUGINFO_ON}
Result := S_OK;
FHasFocus := Activate;
***************
*** 801,820 ****
function TzCustomBandObject.HasFocusIO: HRESULT;
begin
! {$IFDEF Debug}
! //zTraceLog(ClassName + '.HasFocusIO()');
! {$ENDIF}
! Result := Integer(not FHasFocus);
// Result := iif(Assigned(FBandForm) and FBandForm.Focused,
// S_OK, S_FALSE);
! {$IFDEF Debug}
! //zTraceLog(' Result=' + IntToStr(Result));
! {$ENDIF}
end;
function TzCustomBandObject.TranslateAcceleratorIO(var Msg: TMsg): HRESULT;
begin
! {$IFDEF Debug}
! //zTraceLog(ClassName + '.TranslateAcceleratorIO()');
! {$ENDIF}
Result := S_FALSE;
end;
--- 814,833 ----
function TzCustomBandObject.HasFocusIO: HRESULT;
begin
! {$IFDEF DEBUGINFO_ON}
! zTraceLog(ClassName + '.HasFocusIO()');
! {$ENDIF DEBUGINFO_ON}
! Result := Ord(not FHasFocus);
// Result := iif(Assigned(FBandForm) and FBandForm.Focused,
// S_OK, S_FALSE);
! {$IFDEF DEBUGINFO_ON}
! zTraceLog(' Result=' + IntToStr(Result));
! {$ENDIF DEBUGINFO_ON}
end;
function TzCustomBandObject.TranslateAcceleratorIO(var Msg: TMsg): HRESULT;
begin
! {$IFDEF DEBUGINFO_ON}
! zTraceLog(ClassName + '.TranslateAcceleratorIO()');
! {$ENDIF DEBUGINFO_ON}
Result := S_FALSE;
end;
***************
*** 935,945 ****
end;
Result := InsertMenuItem(AMenu, DWORD(-1), True, MenuItemInfo);
! {$IFDEF Debug}
! //if not Result then
! // Exit;
! //zTraceLog(' Menu item added, MenuItem.Command=' + IntToStr(MenuItem.Command));
! //zTraceLog(' Count=' + IntToStr(MenuItem.Count));
! //zTraceLog(' Handle=' + Format('0x%x', [MenuItemInfo.hSubMenu]));
! {$ENDIF}
end;
*)
--- 948,958 ----
end;
Result := InsertMenuItem(AMenu, DWORD(-1), True, MenuItemInfo);
! {$IFDEF DEBUGINFO_ON}
! if not Result then
! Exit;
! zTraceLog(' Menu item added, MenuItem.Command=' + IntToStr(MenuItem.Command));
! zTraceLog(' Count=' + IntToStr(MenuItem.Count));
! zTraceLog(' Handle=' + Format('0x%x', [MenuItemInfo.hSubMenu]));
! {$ENDIF DEBUGINFO_ON}
end;
*)
***************
*** 1006,1016 ****
begin
! {$IFDEF Debug}
! //zTraceLog(ClassName + '.QueryContextMenu()');
! //zTraceLog(' IndexMenu: ' + IntToStr(IndexMenu));
! //zTraceLog(' idCmdFirst: ' + IntToStr(idCmdFirst));
! //zTraceLog(' idCmdLast: ' + IntToStr(idCmdLast));
! //zTraceLog(' uFlags: ' + Format('0x%x', [uFlags]));
! {$ENDIF}
if not Assigned(FMenuItemLink) then
--- 1019,1029 ----
begin
! {$IFDEF DEBUGINFO_ON}
! zTraceLog(ClassName + '.QueryContextMenu()');
! zTraceLog(' IndexMenu: ' + IntToStr(IndexMenu));
! zTraceLog(' idCmdFirst: ' + IntToStr(idCmdFirst));
! zTraceLog(' idCmdLast: ' + IntToStr(idCmdLast));
! zTraceLog(' uFlags: ' + Format('0x%x', [uFlags]));
! {$ENDIF DEBUGINFO_ON}
if not Assigned(FMenuItemLink) then
***************
*** 1058,1068 ****
ci: Integer;
begin
! {$IFDEF Debug}
! //zTraceLog(ClassName + '.InvokeCommand()');
! {$ENDIF}
idCmd := LoWord(Ici.lpVerb);
! {$IFDEF Debug}
! //zTraceLog(' idCmd=' + IntToStr(idCmd));
! {$ENDIF}
Result := E_INVALIDARG;
if not Assigned(FBandForm) then
--- 1071,1081 ----
ci: Integer;
begin
! {$IFDEF DEBUGINFO_ON}
! zTraceLog(ClassName + '.InvokeCommand()');
! {$ENDIF DEBUGINFO_ON}
idCmd := LoWord(Ici.lpVerb);
! {$IFDEF DEBUGINFO_ON}
! zTraceLog(' idCmd=' + IntToStr(idCmd));
! {$ENDIF DEBUGINFO_ON}
Result := E_INVALIDARG;
if not Assigned(FBandForm) then
***************
*** 1083,1091 ****
MenuItem: TMenuItem;
begin
! {$IFDEF Debug}
! //zTraceLog(ClassName + '.GetCommandString()');
! //zTraceLog(' idCmd=' + IntToStr(idCmd));
! //zTraceLog(' uType=' + Format('0x%x', [uType]));
! {$ENDIF}
Result := E_INVALIDARG;
if not Assigned(FBandForm) then
--- 1096,1104 ----
MenuItem: TMenuItem;
begin
! {$IFDEF DEBUGINFO_ON}
! zTraceLog(ClassName + '.GetCommandString()');
! zTraceLog(' idCmd=' + IntToStr(idCmd));
! zTraceLog(' uType=' + Format('0x%x', [uType]));
! {$ENDIF DEBUGINFO_ON}
Result := E_INVALIDARG;
if not Assigned(FBandForm) then
Index: JvJCLUtils.pas
===================================================================
RCS file: /cvsroot/jvcl/dev/JVCL3/run/JvJCLUtils.pas,v
retrieving revision 1.34
retrieving revision 1.35
diff -C2 -d -r1.34 -r1.35
*** JvJCLUtils.pas 28 Nov 2003 11:37:37 -0000 1.34
--- JvJCLUtils.pas 28 Nov 2003 17:56:11 -0000 1.35
***************
*** 479,484 ****
function StrToDateFmt(const DateFormat, S: string): TDateTime;
function StrToDateFmtDef(const DateFormat, S: string; Default: TDateTime): TDateTime;
! function DefDateFormat(FourDigitYear: Boolean): string;
! function DefDateMask(BlanksChar: Char; FourDigitYear: Boolean): string;
function FormatLongDate(Value: TDateTime): string;
--- 479,484 ----
function StrToDateFmt(const DateFormat, S: string): TDateTime;
function StrToDateFmtDef(const DateFormat, S: string; Default: TDateTime): TDateTime;
! function DefDateFormat(AFourDigitYear: Boolean): string;
! function DefDateMask(BlanksChar: Char; AFourDigitYear: Boolean): string;
function FormatLongDate(Value: TDateTime): string;
***************
*** 695,704 ****
function PtInRectExclusive(R:TRect;Pt:TPoint):boolean;
- {$IFDEF USE_FOUR_DIGIT_YEAR}
- var
- FourDigitYear: Boolean = true;
- {$ELSE}
function FourDigitYear: Boolean;
- {$ENDIF USE_FOUR_DIGIT_YEAR}
{ moved from JvJVCLUTils }
--- 695,699 ----
***************
*** 4595,4601 ****
end;
! function DefDateFormat(FourDigitYear: Boolean): string;
begin
! if FourDigitYear then
begin
case GetDateOrder(ShortDateFormat) of
--- 4590,4596 ----
end;
! function DefDateFormat(AFourDigitYear: Boolean): string;
begin
! if AFourDigitYear then
begin
case GetDateOrder(ShortDateFormat) of
***************
*** 4621,4627 ****
end;
! function DefDateMask(BlanksChar: Char; FourDigitYear: Boolean): string;
begin
! if FourDigitYear then
begin
case GetDateOrder(ShortDateFormat) of
--- 4616,4622 ----
end;
! function DefDateMask(BlanksChar: Char; AFourDigitYear: Boolean): string;
begin
! if AFourDigitYear then
begin
case GetDateOrder(ShortDateFormat) of
***************
*** 4664,4674 ****
end;
- {$IFNDEF USE_FOUR_DIGIT_YEAR}
-
function FourDigitYear: Boolean;
begin
Result := Pos('YYYY', AnsiUpperCase(ShortDateFormat)) > 0;
end;
- {$ENDIF}
{ end JvDateUtil }
--- 4659,4666 ----
***************
*** 8068,8078 ****
Clip.PixelFormat := OPF;
end;
-
- initialization
- { begin JvDateUtil }
- {$IFDEF USE_FOUR_DIGIT_YEAR}
- FourDigitYear := Pos('YYYY', AnsiUpperCase(ShortDateFormat)) > 0;
- {$ENDIF}
- { end JvDateUtil }
end.
--- 8060,8063 ----
Index: JvThumbViews.pas
===================================================================
RCS file: /cvsroot/jvcl/dev/JVCL3/run/JvThumbViews.pas,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** JvThumbViews.pas 10 Oct 2003 21:40:17 -0000 1.4
--- JvThumbViews.pas 28 Nov 2003 17:56:11 -0000 1.5
***************
*** 121,127 ****
// Procedure WMLoadWhenReady(var Msg:TMessage); message WM_LoadWhenReady;
protected
- // {$IFDEF DEBUG}
- // procedure WndProc(var Msg: TMessage); Override;
- // {$ENDIF}
procedure SetScrollMode(AMode: TscrollMode);
procedure SetSelected(Number: Longint);
--- 121,124 ----
***************
*** 955,975 ****
end
end;
-
- //{$IFDEF DEBUG}
- //procedure TJvThumbView.WndProc(var Msg: TMessage);
- //Var
- // Test : TStringList;
- //begin
- // Test:= TStringList.Create;
- // try
- // Test.LoadFromFile('c:\Log.Tx');
- // Test.Add(IntTostr(Msg.Msg) +','+IntToStr(Msg.LParam)+','+IntToStr(Msg.WParam));
- // Test.SaveToFile('C:]Log.txt');
- // Finally
- // Test.free;
- // end;
- // Inherited
- //end;
- //{$ENDIF}
procedure TJvThumbView.KeyUp(var Key: Word; Shift: TShiftState);
--- 952,955 ----
|