From 29be3030dfdf720e27aa6ff87aae8d925a26300e Mon Sep 17 00:00:00 2001
From: macpgmr <macpgmr@8e941d3f-bd1b-0410-a28a-d453659cc2b4>
Date: Mon, 17 Jan 2011 02:33:03 +0000
Subject: [PATCH] Added support to DfmToLfm for converting a Lazarus form file
 too.

git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@1451 8e941d3f-bd1b-0410-a28a-d453659cc2b4
---
 components/xdev_toolkit/XDevStatus.html |  18 +-
 components/xdev_toolkit/dfmtolfm.ini    |  43 ++--
 components/xdev_toolkit/dfmtolfm.pas    | 267 +++++++++++++++---------
 3 files changed, 205 insertions(+), 123 deletions(-)

diff --git a/components/xdev_toolkit/XDevStatus.html b/components/xdev_toolkit/XDevStatus.html
index fa2d1b45b..9d682f37d 100644
--- a/components/xdev_toolkit/XDevStatus.html
+++ b/components/xdev_toolkit/XDevStatus.html
@@ -32,7 +32,21 @@
 <A name="Whats_New"></A><H3>What's New</H3>
 
 <UL>
-<LI><B>20101230 release:</B>
+<LI><B>20110116 release:</B>
+<UL>
+<LI>DfmToLfm now supports converting a Lazarus form file too, as a way
+to create more than one version of the same form, for example to conditionally
+include a different version based on widgetset target. For example, you could
+do this in a form's unit:
+<PRE>
+{$IFNDEF LCLCarbon}
+ {$R *.lfm}  //include generic form with Windows and Linux
+{$ELSE}
+ {$R *.mac.lfm}  //include prettied form with Mac (-m -s switches)
+{$ENDIF}
+</PRE>
+</UL>
+<LI>20101230 release:
 <UL>
 <LI>Added -s switch to DfmToLfm (substitutes fonts).
 </UL>
@@ -355,7 +369,7 @@ also be able to output version information to a Lazarus .lpi file.<P>
 <A HREF="http://wiki.lazarus.freepascal.org/Deploying_Your_Application">http://wiki.lazarus.freepascal.org/Deploying_Your_Application</A><P>
 <P>
 <HR>
-Last updated: Jan 2, 2011
+Last updated: Jan 16, 2011
 <P>
 
 </BODY>
diff --git a/components/xdev_toolkit/dfmtolfm.ini b/components/xdev_toolkit/dfmtolfm.ini
index d11c41188..e326620fc 100644
--- a/components/xdev_toolkit/dfmtolfm.ini
+++ b/components/xdev_toolkit/dfmtolfm.ini
@@ -1,10 +1,12 @@
 ; DfmToLfm program configuration file.
-; Be sure to add "=" after each key you add. The key's value can be omitted
-;  as it has no meaning to DfmToLfm.
+; Be sure to add "=" after each key you add to [DeleteProps], [NoFont] and
+;  [MacNoFocus]. The key's value can be omitted as it has no meaning to
+;  DfmToLfm.
 
 
 ; DfmToLfm deletes these .dfm properties when creating .lfm file.
 ; Note: If no class is specified, deletes that property from all classes.
+; Commented properties have been added to LCL since converter was written.
 
 [DeleteProps]
 IsControl=
@@ -17,10 +19,10 @@ OnClickCheck=
 Flat=
 IntegralHeight=
 DesignSize=
-AutoSelect=
-BiDiMode=
-ParentBiDiMode=
-HideSelection=
+;AutoSelect=
+;BiDiMode=
+;ParentBiDiMode=
+;HideSelection=
 ImeMode=
 ImeName=
 OEMConvert=
@@ -62,22 +64,22 @@ TBevel.Font.Color=
 TBevel.Font.Height=
 TBevel.Font.Name=
 TBevel.Font.Style=
-TTabSheet.Font.Charset=
-TTabSheet.Font.Color=
-TTabSheet.Font.Height=
-TTabSheet.Font.Name=
-TTabSheet.Font.Style=
+;TTabSheet.Font.Charset=
+;TTabSheet.Font.Color=
+;TTabSheet.Font.Height=
+;TTabSheet.Font.Name=
+;TTabSheet.Font.Style=
 TNotebook.Font.Charset=
 TNotebook.Font.Color=
 TNotebook.Font.Height=
 TNotebook.Font.Name=
 TNotebook.Font.Style=
 TNotebook.ParentFont=
-TLabeledEdit.Font.Charset=
-TLabeledEdit.Font.Color=
-TLabeledEdit.Font.Height=
-TLabeledEdit.Font.Name=
-TLabeledEdit.Font.Style=
+;TLabeledEdit.Font.Charset=
+;TLabeledEdit.Font.Color=
+;TLabeledEdit.Font.Height=
+;TLabeledEdit.Font.Name=
+;TLabeledEdit.Font.Style=
 TListBox.ScrollWidth=
 TDBImage.TabOrder=
 TScrollBox.HorzScrollBar.Tracking=
@@ -86,6 +88,8 @@ TScrollBox.VertScrollBar.Tracking=
 
 ; When -p switch is used with DfmToLfm, don't try to add parent's font
 ;  properties to these classes since they don't have font in LCL.
+; Commented classes have had font properties added in LCL since converter 
+;  was written.
 
 [NoFont]
 TMainMenu=
@@ -93,7 +97,7 @@ TMenuItem=
 TPopupMenu=
 TScrollBar=
 TImage=
-TTabSheet=
+;TTabSheet=
 ;TCheckBox=
 ;TCheckGroup=
 ;TCheckListBox=
@@ -103,7 +107,7 @@ TActionList=
 TShape=
 TBevel=
 TNotebook=
-TLabeledEdit=
+;TLabeledEdit=
 TProgressBar=
 TSplitter=
 TTimer=
@@ -145,6 +149,8 @@ System=Arial
 [MacFontSubstitutes]
 Arial=Lucida Grande
 ;Arial=Helvetica
+MS Sans Serif=Lucida Grande
+System=Lucida Grande
 
 
 ; These controls cannot receive focus on Mac, so with -m switch
@@ -158,3 +164,4 @@ TCheckBox=
 TRadioGroup=
 TListBox=
 TPageControl=
+
diff --git a/components/xdev_toolkit/dfmtolfm.pas b/components/xdev_toolkit/dfmtolfm.pas
index 8a8945352..844ee46d0 100644
--- a/components/xdev_toolkit/dfmtolfm.pas
+++ b/components/xdev_toolkit/dfmtolfm.pas
@@ -3,22 +3,45 @@ program DfmToLfm;
 {
   Converts Delphi form design file to a Lazarus form file by
    deleting properties that are not supported by LCL and 
-   optionally making changes to font properties. The resulting
+   optionally making changes to font properties. (The resulting
    Lazarus form file can then be converted to a Lazarus resource
-   file with LazRes.
+   file with LazRes, although this second step is only needed
+   now with Lazarus 0.9.28 and earlier.)
+
   Note that the Delphi form file must be a text file.
+
   List of properties to delete and other configuration settings
-   are read from DfmToLfm.ini.
-  This utility (and Lazarus LazRes) can be used whenever design 
-   changes are made to the form in Delphi. 
-  Note: Use MakePasX to make the form's code file cross-platform
-   (a one-time conversion).
-   
+   are read from dfmtolfm.ini.
+
+  This utility (and Lazarus LazRes, if needed) can be used whenever 
+   design changes are made to the form in Delphi. 
+
+  Note: You can use MakePasX to make the form's code file
+   cross-platform (a one-time conversion).
+
   Author:    Phil Hess.
-  Copyright: Copyright (C) 2007-2010 Phil Hess. All rights reserved.
+  Copyright: Copyright (C) 2007-2011 Phil Hess. All rights reserved.
   License:   Modified LGPL.
 }
 
+(*
+  Note: This converter can also convert a Lazarus form file to
+   another Lazarus form file (.lfm -->.lfm). This can be useful
+   if you need to conditionally include a different form depending 
+   on widgetset target. Example:
+
+  {$IFNDEF LCLCarbon}
+   {$R *.lfm}  //include generic form with Windows and Linux
+  {$ELSE}
+   {$R *.mac.lfm}  //include prettied form with Mac (-m -s switches)
+  {$ENDIF}
+  
+  In this case, you would make changes in Lazarus only to the 
+   generic form file, then convert it to use with Mac:
+     dfmtolfm myform.lfm myform.mac.lfm -m -s
+*)
+
+
 {$IFDEF FPC}
  {$MODE Delphi}
 {$ELSE}
@@ -32,7 +55,7 @@ uses
 
 const
   ProgramName    = 'DfmToLfm';
-  ProgramVersion = '0.03';
+  ProgramVersion = '0.04';
   
   DfmFileExt     = '.dfm';  {Delphi form file extension}
   LfmFileExt     = '.lfm';  {Lazarus form file extension}
@@ -42,6 +65,7 @@ const
   NoFontChanges  = 0;       {No font switch on command line}
   UseParentFont  = 1;       {-p font switch on command line}
   DeleteFontName = 2;       {-d font switch on command line}
+  SubstFontName  = 3;       {-s font switch on command line}
   
   MaxNestedObjs  = 20;      {Maximum depth of nested controls on form}
   MaxFontProps   = 5;       {Maximum font properties that can be saved}          
@@ -60,13 +84,13 @@ var
   MatchFound  : TFilenameCaseMatch;
 {$ENDIF}
   FontSwitch  : Integer;
-  SubstFonts  : Boolean;
   MacSwitch   : Boolean;
   CfgFileObj  : TMemIniFile;
-  DfmFileName : string;
-  LfmFileName : string;
-  DfmFileVar  : TextFile;
-  LfmFileVar  : TextFile;
+  InFileName  : string;
+  IsDfmInFile : Boolean;
+  OutFileName : string;
+  InFileVar   : TextFile;
+  OutFileVar  : TextFile;
   StackLevel  : Integer;
   StackRec    : array [1..MaxNestedObjs] of TStackRec;
   DeleteLine  : Boolean;
@@ -87,18 +111,31 @@ begin
 
   if ParamCount = 0 then  {List program syntax and exit?}
     begin
-    WriteLn(ProgramName, ', version ', ProgramVersion,
-            ' - converts a Delphi form file to a Lazarus form file.');
-    WriteLn('Usage: ', ProgramName, ' filename', DfmFileExt, 
-            ' [-p|-d][-s][-m]');
+    WriteLn(ProgramName, ', version ', ProgramVersion);
+    WriteLn('Converts a Delphi (or Lazarus) form file to a Lazarus form file.');
+    WriteLn;
+    WriteLn('Usage: ', LowerCase(ProgramName), ' infile[', DfmFileExt, '|',
+            LfmFileExt, '] [outfile.lfm] [-p|-d|-s][-m]');
+    WriteLn;
     WriteLn('Switches:');
     WriteLn('  -p  Add parent''s font to controls with no font ',
             '(useful with Windows).');
     WriteLn('  -d  Delete font name from controls ',
             '(useful with GTK and GTK2).');
-    WriteLn('  -s  Substitute font names.');
+    WriteLn('  -s  Substitute font names (useful with non-Windows targets).');
     WriteLn('  -m  Mac prettifier.');
-    WriteLn('Looks for configuration data in file ', CfgFileName); 
+    WriteLn;
+    WriteLn('Example:');
+    WriteLn('  ', LowerCase(ProgramName),
+            ' MainForm.dfm -s -m  (Creates MainForm.lfm, substituting fonts');
+    WriteLn('    and prettying form for use on Mac.)');
+    WriteLn;
+    WriteLn('Notes:');
+    WriteLn('  ', ProgramName, ' will look for its configuration data here:');
+    WriteLn('    ', CfgFileName);
+    WriteLn;
+    WriteLn('  See also the comments at top of ', LowerCase(ProgramName), 
+            '.pas.');
     Halt;
     end;
 
@@ -107,8 +144,9 @@ begin
   if FindCmdLineSwitch('p', ['-'], True) then
     FontSwitch := UseParentFont
   else if FindCmdLineSwitch('d', ['-'], True) then
-    FontSwitch := DeleteFontName;
-  SubstFonts := FindCmdLineSwitch('s', ['-'], True);
+    FontSwitch := DeleteFontName
+  else if FindCmdLineSwitch('s', ['-'], True) then
+    FontSwitch := SubstFontName;
   MacSwitch := FindCmdLineSwitch('m', ['-'], True);
 
    {Load configuration file}
@@ -119,52 +157,75 @@ begin
     end;
   CfgFileObj := TMemIniFile.Create(CfgFileName);
   
-   {Get name of Delphi form file from command line}
-  DfmFileName := ParamStr(1);
-  if ExtractFileExt(DfmFileName) = '' then
-    DfmFileName := DfmFileName + DfmFileExt;
+   {Get name of input form file from command line}
+  InFileName := ParamStr(1);
+  if ExtractFileExt(InFileName) = '' then  {No extension?}
+    InFileName := InFileName + DfmFileExt;  {Assume it's a Delphi form file}
 {$IFNDEF FPC}
-  DfmFileName := ExpandFileNameCase(DfmFileName, MatchFound);
+  InFileName := ExpandFileNameCase(InFileName, MatchFound);
 {$ELSE}
-  DfmFileName := ExpandFileName(DfmFileName);
+  InFileName := ExpandFileName(InFileName);
 {$ENDIF}
-    
-   {Base Lazarus form file name on Delphi form file name}
-  LfmFileName := ChangeFileExt(DfmFileName, LfmFileExt);
-  
-   {Open Delphi form file}
-  AssignFile(DfmFileVar, DfmFileName);
+  IsDfmInFile := SameText(ExtractFileExt(InFileName), DfmFileExt);
+
+   {Get name of output form file from command line or generate it}
+  OutFileName := '';
+  if (ParamStr(2) <> '') and (Copy(ParamStr(2), 1, 1) <> '-') then
+    OutFileName := ParamStr(2)  {Output file specified}
+  else if IsDfmInFile then
+    OutFileName := ChangeFileExt(InFileName, LfmFileExt);
+     {Base Lazarus form file name on Delphi form file name}
+  if OutFileName = '' then
+    begin
+    WriteLn('No output file specified');
+    Halt;  {If converting a Lazarus form file, have to specify output file}
+    end;
+
+{$IFNDEF FPC}
+  OutFileName := ExpandFileNameCase(OutFileName, MatchFound);
+{$ELSE}
+  OutFileName := ExpandFileName(OutFileName);
+{$ENDIF}
+
+  if SameText(InFileName, OutFileName) then
+    begin
+    WriteLn('Output file is same as input file');
+    Halt;
+    end;
+
+   {Open input form file}
+  AssignFile(InFileVar, InFileName);
   try
-    Reset(DfmFileVar);
+    Reset(InFileVar);
   except
     on EInOutError do
       begin
-      WriteLn('Can''t open Delphi form file ', DfmFileName);
+      WriteLn('Can''t open input form file ', InFileName);
       Halt;
       end;
     end;
 
-   {Create Lazarus form file}
-  AssignFile(LfmFileVar, LfmFileName);
+   {Create output form file}
+  AssignFile(OutFileVar, OutFileName);
   try 
-    Rewrite(LfmFileVar);
+    Rewrite(OutFileVar);
   except
     on EInOutError do
       begin
-      WriteLn('Can''t create Lazarus form file ', LfmFileName);
+      WriteLn('Can''t create output form file ', OutFileName);
       Halt;
       end;
     end;
 
   StackLevel := 0;
-  while not Eof(DfmFileVar) do  {Read and process Delphi form file}
+  while not Eof(InFileVar) do  {Read and process input form file}
     begin
     DeleteLine := False;
-    ReadLn(DfmFileVar, InStr);  {Read property from form file}
+    ReadLn(InFileVar, InStr);  {Read property from form file}
     StripStr := StringReplace(InStr, ' ', '', [rfReplaceAll]); {Strip spaces}
 
-    if ((CompareText('object ', Copy(Trim(InStr), 1, 7)) = 0) or
-        (CompareText('end', StripStr) = 0)) and {End of object's props reached?}
+    if (SameText('object ', Copy(Trim(InStr), 1, 7)) or
+        SameText('end', StripStr)) and  {End of object's props reached?}
        (StackLevel > 1) and  {Object is nested?} 
        (not CfgFileObj.ValueExists(
              'NoFont', StackRec[StackLevel].ClassName)) and  {Class has font?}
@@ -181,14 +242,14 @@ begin
         begin  {Add font properties to current object}
         for FontPropNum := 1 to StackRec[ParentLevel].FontPropCnt do
           begin
-          WriteLn(LfmFileVar, StringOfChar(' ', (StackLevel-ParentLevel)*2), 
+          WriteLn(OutFileVar, StringOfChar(' ', (StackLevel-ParentLevel)*2), 
                   StackRec[ParentLevel].FontProps[FontPropNum]);
           end;
         end;
       StackRec[StackLevel].FontAdded := True;
       end;
 
-    if CompareText('object ', Copy(Trim(InStr), 1, 7)) = 0 then
+    if SameText('object ', Copy(Trim(InStr), 1, 7)) then
       begin  {Push object's class name on stack}
       Inc(StackLevel);
       if Pos(': ', InStr) > 0 then  {Named control?}
@@ -200,32 +261,30 @@ begin
       StackRec[StackLevel].FontAdded := False;
       end
 
-    else if CompareText('end', StripStr) = 0 then
+    else if SameText('end', StripStr) then
       begin  {Pop current class from stack}
       Dec(StackLevel);
       end
 
-    else if CompareText('font.', Copy(Trim(InStr), 1, 5)) = 0 then
+    else if SameText('font.', Copy(Trim(InStr), 1, 5)) then
       begin  {Font property}
-      if FontSwitch <> NoFontChanges then
-        begin
-        if FontSwitch = UseParentFont then
-          begin  {Save font property in case need it for child objects}
-          if StackRec[StackLevel].FontPropCnt < MaxFontProps then
-            begin
-            Inc(StackRec[StackLevel].FontPropCnt);
-            StackRec[StackLevel].FontProps[StackRec[StackLevel].FontPropCnt] :=
-             InStr;
-            end;
-          end
-        else  {FontSwitch = DeleteFontName}
+      if FontSwitch = UseParentFont then
+        begin  {Save font property in case need it for child objects}
+        if StackRec[StackLevel].FontPropCnt < MaxFontProps then
           begin
-          if CompareText('font.name', Copy(Trim(InStr), 1, 9)) = 0 then
-            DeleteLine := True;
+          Inc(StackRec[StackLevel].FontPropCnt);
+          StackRec[StackLevel].FontProps[StackRec[StackLevel].FontPropCnt] :=
+          InStr;
           end;
+        end
+      else if FontSwitch = DeleteFontName then
+        begin
+        if SameText('font.name', Copy(Trim(InStr), 1, 9)) then
+          DeleteLine := True;
         end;
        {Check if font property should be deleted from current object}
-      if CfgFileObj.ValueExists('DeleteProps',
+      if IsDfmInFile and
+         CfgFileObj.ValueExists('DeleteProps',
                                 StackRec[StackLevel].ClassName + '.' +
                                 Copy(StripStr, 1, Pos('=', StripStr)-1)) then
         DeleteLine := True;
@@ -234,53 +293,53 @@ begin
     else if Copy(StripStr, Length(StripStr), 1) = '<' then  {Skip to end>?}
       begin
       repeat
-        WriteLn(LfmFileVar, InStr);
-        ReadLn(DfmFileVar, InStr);
+        WriteLn(OutFileVar, InStr);
+        ReadLn(InFileVar, InStr);
       until Trim(InStr) = 'end>';
       end
 
     else if Pos('=', StripStr) > 0 then  {Other property?}
       begin  {Check if property should be deleted from current object}
-      if CfgFileObj.ValueExists('DeleteProps', 
-                                Copy(StripStr, 1, Pos('=', StripStr)-1)) or
-         CfgFileObj.ValueExists('DeleteProps',
-                                StackRec[StackLevel].ClassName + '.' +
-                                Copy(StripStr, 1, Pos('=', StripStr)-1)) then
+      if IsDfmInFile and
+         (CfgFileObj.ValueExists('DeleteProps', 
+                                 Copy(StripStr, 1, Pos('=', StripStr)-1)) or
+          CfgFileObj.ValueExists('DeleteProps',
+                                 StackRec[StackLevel].ClassName + '.' +
+                                 Copy(StripStr, 1, Pos('=', StripStr)-1))) then
         begin  {Property or class.property in list of props to delete?} 
         DeleteLine := True;
         if Copy(StripStr, Length(StripStr), 1) = '(' then  {Delete > 1 line?}
           begin
           repeat
-            ReadLn(DfmFileVar, SkipStr);
+            ReadLn(InFileVar, SkipStr);
             SkipStr := Trim(SkipStr);
           until Copy(SkipStr, Length(SkipStr), 1) = ')';
           end;
         end;
       end;  
 
-    if not DeleteLine then  {Include line in Lazarus form file?}
+    if not DeleteLine then  {Include line in output form file?}
       begin
       try
          {If Delphi form file does have Height and Width, reduce
            to size of its ClientHeight or ClientWidth.}
-        if ((StackLevel = 1) and
-                 (CompareText('Height=', Copy(StripStr, 1, 7)) = 0)) then
-          WriteLn(LfmFileVar,
+        if IsDfmInFile and (StackLevel = 1) and
+           SameText('Height=', Copy(StripStr, 1, 7)) then
+          WriteLn(OutFileVar,
                   '  Height = ', 
                   IntToStr(StrToInt(Copy(StripStr, 8, MaxInt)) - 34))
-        else if ((StackLevel = 1) and
-                 (CompareText('Width=', Copy(StripStr, 1, 6)) = 0)) then
-          WriteLn(LfmFileVar,
+        else if IsDfmInFile and (StackLevel = 1) and
+                SameText('Width=', Copy(StripStr, 1, 6)) then
+          WriteLn(OutFileVar,
                   '  Width = ', 
                   IntToStr(StrToInt(Copy(StripStr, 7, MaxInt)) - 8))
 
          {LCL TGroupBox child controls' Top measures from a lower position
            within group box than with VCL, so reduce Top value}
-        else if (StackLevel > 1) and
-                (CompareText('Top=', Copy(StripStr, 1, 4)) = 0) and
-                (CompareText('TGroupBox', 
-                             StackRec[Pred(StackLevel)].ClassName) = 0) then
-          WriteLn(LfmFileVar,
+        else if IsDfmInFile and (StackLevel > 1) and
+                SameText('Top=', Copy(StripStr, 1, 4)) and
+                SameText('TGroupBox', StackRec[Pred(StackLevel)].ClassName) then
+          WriteLn(OutFileVar,
                   Copy(InStr, 1, Succ(Pos('=', InStr))),
                   IntToStr(StrToInt(Copy(StripStr, 5, MaxInt)) - 16))
 
@@ -297,32 +356,32 @@ begin
                               StackRec[StackLevel].ClassName) = 0)) then
           begin
           if CompareText('Top=', Copy(StripStr, 1, 4)) = 0 then
-            WriteLn(LfmFileVar, 
+            WriteLn(OutFileVar, 
                     StringReplace(InStr, 'Top', 'Left', [rfIgnoreCase]))
           else
-            WriteLn(LfmFileVar,
+            WriteLn(OutFileVar,
                     StringReplace(InStr, 'Left', 'Top', [rfIgnoreCase]));
           end
 *)
   
-        else if SubstFonts and
+        else if (FontSwitch = SubstFontName) and
                 SameText('font.name', Copy(StripStr, 1, 9)) then
           begin
           StripStr := Copy(InStr, Pos('=', InStr)+3, MaxInt); {Name after quote}
           Delete(StripStr, Length(StripStr), 1);  {Delete closing quote}
           if MacSwitch and
              CfgFileObj.ValueExists('MacFontSubstitutes', StripStr) then
-            WriteLn(LfmFileVar,
+            WriteLn(OutFileVar,
                     Copy(InStr, 1, Succ(Pos('=', InStr))), '''',
                     CfgFileObj.ReadString('MacFontSubstitutes', StripStr, ''), 
                     '''')
           else if CfgFileObj.ValueExists('FontSubstitutes', StripStr) then
-            WriteLn(LfmFileVar,
+            WriteLn(OutFileVar,
                     Copy(InStr, 1, Succ(Pos('=', InStr))), '''',
                     CfgFileObj.ReadString('FontSubstitutes', StripStr, ''), 
                     '''')
           else
-            WriteLn(LfmFileVar, InStr);
+            WriteLn(OutFileVar, InStr);
           end
 
         else if MacSwitch and
@@ -331,9 +390,10 @@ begin
                  SameText('TBitBtn', StackRec[StackLevel].ClassName)) and
                 SameText('Height=', Copy(StripStr, 1, 7)) and
                 (StrToInt(Copy(StripStr, 8, MaxInt)) > 22) then
-          WriteLn(LfmFileVar,
+          WriteLn(OutFileVar,
                   Copy(InStr, 1, Succ(Pos('=', InStr))), '22')
-           {Reduce button height so it's displayed as oval on Mac}
+           {Reduce button height so it's displayed as oval on Mac.
+            TODO: TSpeedButton too?}
            
         else if MacSwitch and
                 (StackLevel > 1) and
@@ -341,45 +401,46 @@ begin
                 CfgFileObj.ValueExists('MacNoFocus',
                                        StackRec[StackLevel].ClassName) then
           begin
-          WriteLn(LfmFileVar, InStr);  {No change to TabOrder property}
-          WriteLn(LfmFileVar,
+          WriteLn(OutFileVar, InStr);  {No change to TabOrder property}
+          WriteLn(OutFileVar,
                   Copy(InStr, 1, Length(InStr)-Length(Trim(InStr))), {Spaces}
                   'TabStop = False');  {Control can't receive focus}
           end
 
         else  {No change to property}
-          WriteLn(LfmFileVar, InStr);
+          WriteLn(OutFileVar, InStr);
 
          {Delphi form files don't always include Height or Width properties,
            which are required by Lazarus, so add them based on ClientHeight 
            and ClientWidth properties, which apparently act the same as
            Height and Width in Lazarus (unlike Delphi).}
-        if (CompareText('ClientHeight=', Copy(StripStr, 1, 13)) = 0) or
-           (CompareText('ClientWidth=', Copy(StripStr, 1, 12)) = 0) then
-          WriteLn(LfmFileVar, 
+        if IsDfmInFile and
+           (SameText('ClientHeight=', Copy(StripStr, 1, 13)) or
+            SameText('ClientWidth=', Copy(StripStr, 1, 12))) then
+          WriteLn(OutFileVar, 
                   StringReplace(InStr, 'Client', '',  [rfIgnoreCase]));
       except
         on EInOutError do
           begin
-          WriteLn('Can''t write to Lazarus form file ', LfmFileName);
+          WriteLn('Can''t write to output form file ', OutFileName);
           Halt;
           end; 
         end;
       end;
     end;  {while not Eof}  
 
-  CloseFile(DfmFileVar);
+  CloseFile(InFileVar);
   try   
-    CloseFile(LfmFileVar);
+    CloseFile(OutFileVar);
   except
     on EInOutError do
       begin
-      WriteLn('Can''t close Lazarus form file ', LfmFileName);
+      WriteLn('Can''t close output form file ', OutFileName);
       Halt;
       end;
     end;
   CfgFileObj.Free;
-  WriteLn(LfmFileName, ' successfully created');
+  WriteLn(OutFileName, ' successfully created');
 
 end.