docking examples: fixed unit search paths

git-svn-id: trunk@23034 -

examples/dockmanager/elasticsite/MakeSite.lpi

@@ -69,7 +69,6 @@
     </Target>
     <SearchPaths>
       <IncludeFiles Value="$(ProjOutDir)\"/>
-      <OtherUnitFiles Value="..\..\..\components\synedit\"/>
       <UnitOutputDirectory Value="lib\$(TargetCPU)-$(TargetOS)"/>
     </SearchPaths>
     <Other>

examples/dockmanager/package/easydockmgr.lpk

@@ -58,7 +58,7 @@
       </Item2>
     </RequiredPkgs>
     <UsageOptions>
-      <UnitPath Value="$(PkgOutDir)\;..\package\"/>
+      <UnitPath Value="$(PkgOutDir)\"/>
     </UsageOptions>
     <PublishOptions>
       <Version Value="2"/>

examples/dockmanager/package/easydocksite.pas

@@ -177,16 +177,16 @@ type
     FDockSite: TWinControl;
     FReplacingControl: TControl;
     FUpdateCount: integer;
-    procedure BeginUpdate; override;
-    procedure EndUpdate; override;
     procedure Update; virtual;
-    procedure SetReplacingControl(Control: TControl); override; //unused
     property  DockSite: TWinControl read FDockSite;
   public
     constructor Create(ADockSite: TWinControl); override;
     class function  DetectAlign(ZoneRect: TRect; MousePos: TPoint): TAlign;
     procedure PositionDockRect(Client, DropCtl: TControl; DropAlign: TAlign;
       var DockRect: TRect);  override;
+    procedure SetReplacingControl(Control: TControl); override; //unused
+    procedure BeginUpdate; override;
+    procedure EndUpdate; override;
   end;
 
   { TEasyTree }
@@ -209,20 +209,11 @@ type
   {$ELSE}
     //in base class
   {$ENDIF}
-    procedure SetReplacingControl(Control: TControl); override;
   //extended interface
     //procedure ControlVisibilityChanged(Control: TControl; Visible: Boolean);  override;
     function  ZoneFromPoint(SitePos: TPoint): TEasyZone;
-    procedure GetControlBounds(Control: TControl; out CtlBounds: TRect);  override;
-    procedure InsertControl(Control: TControl; InsertAt: TAlign;
-      DropCtl: TControl);  override;
-    procedure RemoveControl(Control: TControl);  override;
-    procedure ResetBounds(Force: Boolean);  override; //site resized
     function  ReloadDockedControl(const AName: string): TControl; virtual;
-    procedure LoadFromStream(Stream: TStream);  override;
-    procedure SaveToStream(Stream: TStream);  override;
   protected //added
-    procedure PositionDockRect(ADockObject: TDragDockObject); override;
     function  FindControlZone(zone: TEasyZone; Control: TControl): TEasyZone;
     procedure RemoveZone(Zone: TEasyZone);
   //Lazarus extension
@@ -236,6 +227,14 @@ type
     procedure SetSingleCaption(Value: boolean);
   public
     procedure MessageHandler(Sender: TControl; var Message: TLMessage); override;
+    procedure GetControlBounds(Control: TControl; out CtlBounds: TRect);  override;
+    procedure InsertControl(Control: TControl; InsertAt: TAlign;
+      DropCtl: TControl);  override;
+    procedure RemoveControl(Control: TControl);  override;
+    procedure ResetBounds(Force: Boolean);  override; //site resized
+    procedure LoadFromStream(Stream: TStream);  override;
+    procedure SaveToStream(Stream: TStream);  override;
+    procedure SetReplacingControl(Control: TControl); override;
   public
   {$IFDEF singleTab}
     SingleTab: boolean; //always create notebook for alCustom?
@@ -246,6 +245,7 @@ type
     procedure PaintSite(DC: HDC); override;
     procedure SetStyle(NewStyle: TEasyHeaderStyle);
     function  GetEffectiveStyle: TEasyHeaderStyle;
+    procedure PositionDockRect(ADockObject: TDragDockObject); override;
     property HideSingleCaption: boolean read FHideSingleCaption write SetSingleCaption;
   end;
 
@@ -1030,6 +1030,7 @@ begin
 end;
 {$ELSE}
 begin
+  Result:=nil;
   TWinControlAccess(DockSite).ReloadDockedControl(AName, Result);
 end;
 {$ENDIF}

examples/dockmanager/package/umakesite.pas

@@ -328,6 +328,7 @@ begin
           ctl := FOnRestore(AName, nb);
         if ctl = nil then
           ctl := ReloadForm(s, True); //try both multi and single instance
+        DebugLn(['TDockMaster.ReloadDockedControl ',DbgSName(ctl)]);
         ctl.ManualDock(nb);
       end;
     finally
@@ -661,7 +662,7 @@ begin
   if ssLeft in Shift then begin
     ctl := Sender as TControl;
     if ForIDE then
-      TControlAccess(ctl.Parent).DragKind := dkDock;
+      TWinControlAccess(ctl.Parent).DragKind := dkDock;
     ctl.Parent.BeginDrag(ForIDE); //start immediately?
   end;
 end;