Bladeren bron

fixed compile

mattias 1 jaar geleden
bovenliggende
commit
2676294145
2 gewijzigde bestanden met toevoegingen van 17 en 17 verwijderingen
  1. 3 3
      design/fresnel.register.pas
  2. 14 14
      src/base/fresnel.forms.pas

+ 3 - 3
design/fresnel.register.pas

@@ -114,7 +114,7 @@ implementation
 procedure Register;
 begin
   FormEditingHook.RegisterDesignerMediator(TFresnelFormMediator);
-  FormEditingHook.SetDesignerBaseClassCanAppCreateForm(TCustomFresnelForm,true);
+  FormEditingHook.SetDesignerBaseClassCanAppCreateForm(TFresnelCustomForm,true);
 
   RegisterComponents('Fresnel',[TDiv,TSpan,TLabel,TBody]);
 
@@ -125,8 +125,8 @@ begin
   RegisterProjectDescriptor(ProjDescFresnelApplication);
 
   RegisterPropertyEditor(TypeInfo(String), TFresnelElement, 'Style', TFresnelStylePropertyEditor);
-  RegisterPropertyEditor(TypeInfo(String), TCustomFresnelForm, 'Style', THiddenPropertyEditor);
-  RegisterPropertyEditor(TypeInfo(TStrings), TCustomFresnelForm, 'Stylesheet', TFresnelStyleSheetPropertyEditor);
+  RegisterPropertyEditor(TypeInfo(String), TFresnelCustomForm, 'Style', THiddenPropertyEditor);
+  RegisterPropertyEditor(TypeInfo(TStrings), TFresnelCustomForm, 'Stylesheet', TFresnelStyleSheetPropertyEditor);
 end;
 
 { TFresnelFormMediator }

+ 14 - 14
src/base/fresnel.forms.pas

@@ -344,7 +344,7 @@ begin
   if AValue.Bottom<AValue.Top then
     AValue.Bottom:=AValue.Top;
   if FFormBounds=AValue then exit;
-  FLLog(etDebug,['TCustomFresnelForm.SetFormBounds ',Self.ToString,' ',AValue.ToString]);
+  FLLog(etDebug,['TFresnelCustomForm.SetFormBounds ',Self.ToString,' ',AValue.ToString]);
   FFormBounds:=AValue;
   if Designer<>nil then
     Designer.SetDesignerFormBounds(Self,FFormBounds.GetRect)
@@ -390,7 +390,7 @@ end;
 
 procedure TFresnelCustomForm.Loaded;
 begin
-  FLLog(etDebug,['TCustomFresnelForm.Loaded ',Self.ToString]);
+  FLLog(etDebug,['TFresnelCustomForm.Loaded ',Self.ToString]);
   inherited Loaded;
   if Visible then
     Show
@@ -422,13 +422,13 @@ end;
 
 procedure TFresnelCustomForm.OnQueuedLayout(Data: Pointer);
 begin
-  //debugln(['TCustomFresnelForm.OnQueuedLayout ',DbgSName(Self),' ',LayoutQueued]);
+  //debugln(['TFresnelCustomForm.OnQueuedLayout ',DbgSName(Self),' ',LayoutQueued]);
   if not LayoutQueued then exit;
   try
     ApplyCSS;
     //Layouter.WriteLayoutTree;
     Layouter.Apply(Self);
-    //debugln(['TCustomFresnelForm.OnQueuedLayout ',DbgSName(Self),' After Layouter.Apply, Invalidate...']);
+    //debugln(['TFresnelCustomForm.OnQueuedLayout ',DbgSName(Self),' After Layouter.Apply, Invalidate...']);
     Invalidate;
   finally
     Exclude(FFormStates,fsLayoutQueued);
@@ -496,7 +496,7 @@ end;
 
 procedure TFresnelCustomForm.Hide;
 begin
-  FLLog(etDebug,'TCustomFresnelForm.Hide '+Self.ToString);
+  FLLog(etDebug,'TFresnelCustomForm.Hide '+Self.ToString);
   if (Designer<>nil)
       or ([csLoading,csDesigning]*ComponentState<>[])
       or not WSFormAllocated then
@@ -507,7 +507,7 @@ end;
 
 procedure TFresnelCustomForm.Show;
 begin
-  FLLog(etDebug,'TCustomFresnelForm.Show '+Self.ToString);
+  FLLog(etDebug,'TFresnelCustomForm.Show '+Self.ToString);
   if (Designer<>nil) or ([csLoading,csDesigning,csDestroying]*ComponentState<>[]) then
     FVisible:=true
   else
@@ -540,13 +540,13 @@ begin
   if csDestroying in ComponentState then exit;
 
   // consistency checks
-  FLLog(etDebug,['TCustomFresnelForm.CreateWSForm ',Self.ToString]);
+  FLLog(etDebug,['TFresnelCustomForm.CreateWSForm ',Self.ToString]);
   if Designer<>nil then
-    raise Exception.Create('TCustomFresnelForm.CreateWSForm Designer<>nil');
+    raise Exception.Create('TFresnelCustomForm.CreateWSForm Designer<>nil');
   if Parent = Self then
-    raise Exception.Create('TCustomFresnelForm.CreateWSForm Parent = Self')
+    raise Exception.Create('TFresnelCustomForm.CreateWSForm Parent = Self')
   else if (Parent <> nil) then
-    raise Exception.Create('TCustomFresnelForm.CreateWSForm ToDo 20230915221832');
+    raise Exception.Create('TFresnelCustomForm.CreateWSForm ToDo 20230915221832');
 
   // create
   WidgetSet.CreateWSForm(Self);
@@ -561,8 +561,8 @@ end;
 
 procedure TFresnelCustomForm.WSDraw;
 begin
-  FLLog(etDebug,'TCustomFresnelForm.WSDraw (%s)',[ToString]);
-  FLLog(etDebug,'TCustomFresnelForm.WSDraw Have renderer: %b',[Assigned(Renderer)]);
+  FLLog(etDebug,'TFresnelCustomForm.WSDraw (%s)',[ToString]);
+  FLLog(etDebug,'TFresnelCustomForm.WSDraw Have renderer: %b',[Assigned(Renderer)]);
   Renderer.Draw(Self);
 end;
 
@@ -570,7 +570,7 @@ procedure TFresnelCustomForm.WSResize(const NewFormBounds: TFresnelRect;
   NewWidth, NewHeight: TFresnelLength);
 begin
   if (FFormBounds=NewFormBounds) and (Width=NewWidth) and (Height=NewHeight) then exit;
-  FLLog(etDebug,['TCustomFresnelForm.WSResize ',Self.ToString,' OldForm=',FFormBounds.ToString,' NewForm=',NewFormBounds.ToString,' OldWH=',FloatToStr(Width),',',FloatToStr(Height),' NewWH=',FloatToStr(NewWidth),',',FloatToStr(NewHeight)]);
+  FLLog(etDebug,['TFresnelCustomForm.WSResize ',Self.ToString,' OldForm=',FFormBounds.ToString,' NewForm=',NewFormBounds.ToString,' OldWH=',FloatToStr(Width),',',FloatToStr(Height),' NewWH=',FloatToStr(NewWidth),',',FloatToStr(NewHeight)]);
   FFormBounds:=NewFormBounds;
   Width:=NewWidth;
   Height:=NewHeight;
@@ -595,7 +595,7 @@ begin
   end else begin
     WSData.ControlPos:=PageToContentPos(El,X,Y);
   end;
-  FLLog(etDebug,'TCustomFresnelForm.WSMouseXY El=%s PagePos=%s ControlPos=%s',[el.ToString, WSData.PagePos.ToString, WSData.ControlPos.ToString]);
+  FLLog(etDebug,'TFresnelCustomForm.WSMouseXY El=%s PagePos=%s ControlPos=%s',[el.ToString, WSData.PagePos.ToString, WSData.ControlPos.ToString]);
   case MouseEventId of
   evtMouseDown:
     fMouseDownElement:=El;