globally renamed TFTextFlags to TfpgTextFlags

Somehow I forgot to rename this type when we introduced the 'fpg' prefix years ago.

15 files changed, 46 insertions, 46 deletions

diff --git a/extras/contributed/report_tool/reportengine/u_commande.pas b/extras/contributed/report_tool/reportengine/u_commande.pas
index 84280bf6..527b08db 100644
--- a/extras/contributed/report_tool/reportengine/u_commande.pas
+++ b/extras/contributed/report_tool/reportengine/u_commande.pas
@@ -128,9 +128,9 @@ type
       constructor Create; virtual;
       destructor Destroy; override;
       procedure LoadTexte(APosX,APosY: Single; AColonne,ATexte,AFonte,AHeight,AFond,ABord,AInterL: Integer;
-                ACurFont: Boolean; AFlags: TFTextFlags);
+                ACurFont: Boolean; AFlags: TfpgTextFlags);
       procedure LoadNumero(APosX,APosY: Single; AColonne,ATexteNum,ATexteTot,AFonte,AHeight,AFond,ABord,AInterL: Integer;
-                ACurFont: Boolean; AFlags: TFTextFlags; ATotal,AAlpha: Boolean; ATypeNum: TSectPageNum);
+                ACurFont: Boolean; AFlags: TfpgTextFlags; ATotal,AAlpha: Boolean; ATypeNum: TSectPageNum);
       property Commandes: TList read FCommandes;
       property LineHeight: Integer read FHeight;
     end;
@@ -157,9 +157,9 @@ type
       FBord: Integer;
       FInterL: Integer;
       FCurFont: Boolean;
-      FFlags: TFTextFlags;
+      FFlags: TfpgTextFlags;
     public
-      constructor Create(APosX,APosY: Single; AColonne,ATexte,AFonte,AFond,ABord,AInterL: Integer; ACurFont: Boolean; AFlags: TFTextFlags); virtual;
+      constructor Create(APosX,APosY: Single; AColonne,ATexte,AFonte,AFond,ABord,AInterL: Integer; ACurFont: Boolean; AFlags: TfpgTextFlags); virtual;
       procedure SetPosY(const AValue: Single);
       property GetPosX: Single read FPosX;
       property GetPosY: Single read FPosY;
@@ -170,7 +170,7 @@ type
       property GetBord: Integer read FBord;
       property GetInterL: Integer read FInterL;
       property GetCurFont: Boolean read FCurFont;
-      property GetFlags: TFTextFlags read FFlags;
+      property GetFlags: TfpgTextFlags read FFlags;
     end;
 
   T_Numero = class(T_Commande)
@@ -185,13 +185,13 @@ type
       FBord: Integer;
       FInterL: Integer;
       FCurFont: Boolean;
-      FFlags: TFTextFlags;
+      FFlags: TfpgTextFlags;
       FTotal: Boolean;
       FAlpha: Boolean;
       FTypeNum: TSectPageNum;
     public
       constructor Create(APosX,APosY: Single; AColonne,ATexteNum,ATexteTot,AFonte,AFond,ABord,AInterL: Integer;
-                  ACurFont: Boolean; AFlags: TFTextFlags; ATotal,AAlpha: Boolean; ATypeNum: TSectPageNum); virtual;
+                  ACurFont: Boolean; AFlags: TfpgTextFlags; ATotal,AAlpha: Boolean; ATypeNum: TSectPageNum); virtual;
       procedure SetPosY(const AValue: Single);
       property GetPosX: Single read FPosX;
       property GetPosY: Single read FPosY;
@@ -203,7 +203,7 @@ type
       property GetBord: Integer read FBord;
       property GetInterL: Integer read FInterL;
       property GetCurFont: Boolean read FCurFont;
-      property GetFlags: TFTextFlags read FFlags;
+      property GetFlags: TfpgTextFlags read FFlags;
       property GetTotal: Boolean read FTotal;
       property GetAlpha: Boolean read FAlpha;
       property GetTypeNum: TSectPageNum read FTypeNum;
@@ -582,7 +582,7 @@ inherited Destroy;
 end;
 
 procedure T_Ligne.LoadTexte(APosX,APosY: Single; AColonne,ATexte,AFonte,AHeight,AFond,ABord,AInterL: Integer;
-          ACurFont: Boolean; AFlags: TFTextFlags);
+          ACurFont: Boolean; AFlags: TfpgTextFlags);
 begin
 if FHeight< AHeight
 then
@@ -592,7 +592,7 @@ Commandes.Add(ACommande);
 end;
 
 procedure T_Ligne.LoadNumero(APosX,APosY: Single; AColonne,ATexteNum,ATexteTot,AFonte,AHeight,AFond,ABord,AInterL: Integer;
-          ACurFont: Boolean; AFlags: TFTextFlags; ATotal,AAlpha: Boolean; ATypeNum: TSectPageNum);
+          ACurFont: Boolean; AFlags: TfpgTextFlags; ATotal,AAlpha: Boolean; ATypeNum: TSectPageNum);
 begin
 if FHeight< AHeight
 then
@@ -610,7 +610,7 @@ then
   FPosY:= AValue;
 end;
 
-constructor T_EcritTexte.Create(APosX,APosY: Single; AColonne,ATexte,AFonte,AFond,ABord,AInterL: Integer; ACurFont: Boolean; AFlags: TFTextFlags);
+constructor T_EcritTexte.Create(APosX,APosY: Single; AColonne,ATexte,AFonte,AFond,ABord,AInterL: Integer; ACurFont: Boolean; AFlags: TfpgTextFlags);
 begin
 inherited Create;
 FPosX:= APosX;
@@ -633,7 +633,7 @@ then
 end;
 
 constructor T_Numero.Create(APosX,APosY: Single; AColonne,ATexteNum,ATexteTot,AFonte,AFond,ABord,AInterL: Integer;
-            ACurFont: Boolean; AFlags: TFTextFlags; ATotal,AAlpha: Boolean; ATypeNum: TSectPageNum);
+            ACurFont: Boolean; AFlags: TfpgTextFlags; ATotal,AAlpha: Boolean; ATypeNum: TSectPageNum);
 begin
 inherited Create;
 FPosX:= APosX;
diff --git a/extras/contributed/report_tool/reportengine/u_imprime.pas b/extras/contributed/report_tool/reportengine/u_imprime.pas
index 1cced2b4..7f66272d 100644
--- a/extras/contributed/report_tool/reportengine/u_imprime.pas
+++ b/extras/contributed/report_tool/reportengine/u_imprime.pas
@@ -71,9 +71,9 @@ type
       procedure DecaleLigne(Decalage: Single);
       procedure DecaleGroupe(Decalage: Single);
       function EcritLigne(PosX,PosY: Single; Colonne,Texte,FonteNum,FondNum,BordNum,InterL: Integer;
-                TxtFlags: TFTextFlags; Zone: TZone): Single;
+                TxtFlags: TfpgTextFlags; Zone: TZone): Single;
       function EcritNum(PosX,PosY: Single; Colonne,TexteNum,TexteTot,FonteNum,FondNum,BordNum,InterL: Integer;
-                TxtFlags: TFTextFlags; Total,Alpha: Boolean; Zone: TZone; SPNum: TSectPageNum): Single;
+                TxtFlags: TfpgTextFlags; Total,Alpha: Boolean; Zone: TZone; SPNum: TSectPageNum): Single;
       function InsereEspace(PosY: Single; Colonne: Integer; EspHeight: Single; FondNum: Integer; Zone: TZone): Single;
       procedure FinLigne(Zone: TZone);
       procedure TraceCadre(StTrait: Integer; Zone: TZone);
@@ -915,7 +915,7 @@ with AGroupe do
 end;
 
 function T_Imprime.EcritLigne(PosX,PosY: Single; Colonne,Texte,FonteNum,FondNum,BordNum,InterL: Integer;
-          TxtFlags: TFTextFlags; Zone: TZone): Single;
+          TxtFlags: TfpgTextFlags; Zone: TZone): Single;
 var
   PosH,PosV,IntlInt,IntLSup,IntLInf,EpaisTrait: Single;
   HTxt,HautTxt,Half,CoulTrait,Cpt: Integer;
@@ -1345,7 +1345,7 @@ with T_Section(Sections[Pred(NumeroSection)]) do
 end;
 
 function T_Imprime.EcritNum(PosX,PosY: Single; Colonne,TexteNum,TexteTot,FonteNum,FondNum,BordNum,InterL: Integer;
-          TxtFlags: TFTextFlags; Total,Alpha: Boolean; Zone: TZone; SPNum: TSectPageNum): Single;
+          TxtFlags: TfpgTextFlags; Total,Alpha: Boolean; Zone: TZone; SPNum: TSectPageNum): Single;
 
   function BuildChaine: string;
   var
@@ -2359,7 +2359,7 @@ procedure T_Imprime.EcritEnTete(Horiz,Verti: Single; Texte: string; ColNum: Inte
           InterNum: Integer= 0; CoulFdNum: Integer= -1; BordNum: Integer= -1);
 var
   RefTexte: Integer;
-  Flags: TFTextFlags;
+  Flags: TfpgTextFlags;
 begin
 Flags:= [];
 if Horiz< 0
@@ -2391,7 +2391,7 @@ function T_Imprime.EcritPage(Horiz,Verti: Single; Texte: string; ColNum: Integer
           InterNum: Integer= 0; CoulFdNum: Integer= -1; BordNum: Integer= -1): Single;
 var
   RefTexte: Integer;
-  Flags: TFTextFlags;
+  Flags: TfpgTextFlags;
 begin
 Flags:= [];
 if Horiz< 0
@@ -2423,7 +2423,7 @@ procedure T_Imprime.EcritPied(Horiz,Verti: Single; Texte: string; ColNum: Intege
           InterNum: Integer= 0; CoulFdNum: Integer= -1; BordNum: Integer= -1);
 var
   RefTexte: Integer;
-  Flags: TFTextFlags;
+  Flags: TfpgTextFlags;
 begin
 Flags:= [];
 if Horiz< 0
@@ -2456,7 +2456,7 @@ procedure T_Imprime.NumSectionEnTete(Horiz,Verti: Single; TexteSect: string= '';
           InterNum: Integer= 0; CoulFdNum: Integer= -1; BordNum: Integer= -1);
 var
   RefTextePage,RefTexteTot: Integer;
-  Flags: TFTextFlags;
+  Flags: TfpgTextFlags;
 begin
 Flags:= [];
 if Horiz< 0
@@ -2493,7 +2493,7 @@ procedure T_Imprime.NumSectionPied(Horiz,Verti: Single; TexteSect: string= ''; T
           InterNum: Integer= 0;CoulFdNum: Integer= -1; BordNum: Integer= -1);
 var
   RefTextePage,RefTexteTot: Integer;
-  Flags: TFTextFlags;
+  Flags: TfpgTextFlags;
 begin
 Flags:= [];
 if Horiz< 0
@@ -2530,7 +2530,7 @@ procedure T_Imprime.NumPageEnTete(Horiz,Verti: Single; TextePage: string= ''; Te
           CoulFdNum: Integer= -1; BordNum: Integer= -1);
 var
   RefTextePage,RefTexteTot: Integer;
-  Flags: TFTextFlags;
+  Flags: TfpgTextFlags;
 begin
 Flags:= [];
 if Horiz< 0
@@ -2567,7 +2567,7 @@ procedure T_Imprime.NumPagePied(Horiz,Verti: Single; TextePage: string= ''; Text
           CoulFdNum: Integer= -1; BordNum: Integer= -1);
 var
   RefTextePage,RefTexteTot: Integer;
-  Flags: TFTextFlags;
+  Flags: TfpgTextFlags;
 begin
 Flags:= [];
 if Horiz< 0
@@ -2604,7 +2604,7 @@ procedure T_Imprime.NumPageSectionEnTete(Horiz,Verti: Single; TexteSect: string=
           InterNum: Integer= 0; CoulFdNum: Integer= -1; BordNum: Integer= -1);
 var
   RefTextePage,RefTexteTot: Integer;
-  Flags: TFTextFlags;
+  Flags: TfpgTextFlags;
 begin
 Flags:= [];
 if Horiz< 0
@@ -2641,7 +2641,7 @@ procedure T_Imprime.NumPageSectionPied(Horiz,Verti: Single; TexteSect: string= '
           InterNum: Integer= 0; CoulFdNum: Integer= -1; BordNum: Integer= -1);
 var
   RefTextePage,RefTexteTot: Integer;
-  Flags: TFTextFlags;
+  Flags: TfpgTextFlags;
 begin
 Flags:= [];
 if Horiz< 0
diff --git a/prototypes/fpgui2/tests/themetest.lpr b/prototypes/fpgui2/tests/themetest.lpr
index 7ebf320f..c9ec5c19 100644
--- a/prototypes/fpgui2/tests/themetest.lpr
+++ b/prototypes/fpgui2/tests/themetest.lpr
@@ -131,7 +131,7 @@ var
   offset: integer;
   img: TfpgImage;
   r: TfpgRect;
-  lTextFlags: TFTextFlags;
+  lTextFlags: TfpgTextFlags;
 begin
   writeln('TStyledButton.HandlePaint');
   Canvas.BeginDraw;
diff --git a/prototypes/textedit/fpg_textedit.pas b/prototypes/textedit/fpg_textedit.pas
index 73c30b47..fbcf2d46 100644
--- a/prototypes/textedit/fpg_textedit.pas
+++ b/prototypes/textedit/fpg_textedit.pas
@@ -257,7 +257,7 @@ var
   r: TfpgRect;
   I, MaxI, W, H, ZeroL: Integer;
   s: TfpgString;
-  ltxtflags: TFTextFlags;
+  ltxtflags: TfpgTextFlags;
 begin
   if not FShowNum then
     Exit; //==>
diff --git a/src/corelib/fpg_main.pas b/src/corelib/fpg_main.pas
index 76ae537e..f5f2a844 100644
--- a/src/corelib/fpg_main.pas
+++ b/src/corelib/fpg_main.pas
@@ -47,8 +47,8 @@ type
 
   TfpgMenuItemFlags = set of (mifSelected, mifHasFocus, mifSeparator, mifEnabled, mifChecked, mifSubMenu);
     
-  TFTextFlags = set of (txtLeft, txtHCenter, txtRight, txtTop, txtVCenter, txtBottom, txtWrap, txtDisabled,
-    txtAutoSize);
+  TfpgTextFlags = set of (txtLeft, txtHCenter, txtRight, txtTop, txtVCenter,
+    txtBottom, txtWrap, txtDisabled, txtAutoSize);
 
   TMouseButton = (mbLeft, mbRight, mbMiddle);
 
@@ -185,9 +185,9 @@ type
     procedure   DrawDirectionArrow(x, y, w, h: TfpgCoord; direction: TArrowDirection); overload;
     procedure   DrawDirectionArrow(r: TfpgRect; direction: TArrowDirection); overload;
     procedure   DrawFocusRect(r: TfpgRect);
-    function    DrawText(x, y, w, h: TfpgCoord; const AText: TfpgString; AFlags: TFTextFlags = TextFlagsDflt; ALineSpace: integer = 2): integer; overload;
-    function    DrawText(x, y: TfpgCoord; const AText: TfpgString; AFlags: TFTextFlags = TextFlagsDflt; ALineSpace: integer = 2): integer; overload;
-    function    DrawText(r: TfpgRect; const AText: TfpgString; AFlags: TFTextFlags = TextFlagsDflt; ALineSpace: integer = 2): integer; overload;
+    function    DrawText(x, y, w, h: TfpgCoord; const AText: TfpgString; AFlags: TfpgTextFlags = TextFlagsDflt; ALineSpace: integer = 2): integer; overload;
+    function    DrawText(x, y: TfpgCoord; const AText: TfpgString; AFlags: TfpgTextFlags = TextFlagsDflt; ALineSpace: integer = 2): integer; overload;
+    function    DrawText(r: TfpgRect; const AText: TfpgString; AFlags: TfpgTextFlags = TextFlagsDflt; ALineSpace: integer = 2): integer; overload;
   end;
 
 
@@ -1846,7 +1846,7 @@ begin
 end;
 
 function TfpgCanvas.DrawText(x, y, w, h: TfpgCoord; const AText: TfpgString;
-                AFlags: TFTextFlags; ALineSpace: integer): integer;
+    AFlags: TfpgTextFlags; ALineSpace: integer): integer;
 var
   wtxt, htxt, i, nw, nx, ny, l: integer;
   buf: TfpgString;
@@ -1913,12 +1913,12 @@ begin
 end;
 
 function TfpgCanvas.DrawText(x, y: TfpgCoord; const AText: TfpgString;
-    AFlags: TFTextFlags; ALineSpace: integer): integer;
+    AFlags: TfpgTextFlags; ALineSpace: integer): integer;
 begin
   Result := DrawText(x, y, 0, 0, AText, AFlags, ALineSpace);
 end;
 
-function TfpgCanvas.DrawText(r: TfpgRect; const AText: TfpgString; AFlags: TFTextFlags;
+function TfpgCanvas.DrawText(r: TfpgRect; const AText: TfpgString; AFlags: TfpgTextFlags;
     ALineSpace: integer): integer;
 begin
   Result := DrawText(r.Left, r.Top, r.Width, r.Height, AText, AFlags, ALineSpace);
diff --git a/src/gui/fpg_button.pas b/src/gui/fpg_button.pas
index 621b9e33..0ce2df8e 100644
--- a/src/gui/fpg_button.pas
+++ b/src/gui/fpg_button.pas
@@ -524,7 +524,7 @@ var
   lBtnFlags: TfpgButtonFlags;
   clr: TfpgColor;
   img: TfpgImage;
-  lTextFlags: TFTextFlags;
+  lTextFlags: TfpgTextFlags;
 begin
 //  inherited HandlePaint;
   Canvas.ClearClipRect;
diff --git a/src/gui/fpg_checkbox.pas b/src/gui/fpg_checkbox.pas
index 8968477a..55c9a3a8 100644
--- a/src/gui/fpg_checkbox.pas
+++ b/src/gui/fpg_checkbox.pas
@@ -163,7 +163,7 @@ var
   r: TfpgRect;
   ix: integer;
   img: TfpgImage;
-  LFlags: TFTextFlags;
+  LFlags: TfpgTextFlags;
 begin
   inherited HandlePaint;
   Canvas.ClearClipRect;
diff --git a/src/gui/fpg_combobox.pas b/src/gui/fpg_combobox.pas
index aab6923e..ba23a0cf 100644
--- a/src/gui/fpg_combobox.pas
+++ b/src/gui/fpg_combobox.pas
@@ -585,7 +585,7 @@ end;
 
 procedure TfpgBaseStaticCombo.DoDrawText(const ARect: TfpgRect);
 var
-  flags: TFTextFlags;
+  flags: TfpgTextFlags;
 begin
   // Draw select item's text
   flags := [txtLeft, txtVCenter];
diff --git a/src/gui/fpg_edit.pas b/src/gui/fpg_edit.pas
index 91ec2494..eaca5d40 100644
--- a/src/gui/fpg_edit.pas
+++ b/src/gui/fpg_edit.pas
@@ -1415,7 +1415,7 @@ end;
 procedure TfpgBaseTextEdit.HandlePaint;
 var
   r: TfpgRect;
-  flags: TFTextFlags;
+  flags: TfpgTextFlags;
 begin
   inherited HandlePaint;
   r := Canvas.GetClipRect;    // contains adjusted size based on borders
diff --git a/src/gui/fpg_grid.pas b/src/gui/fpg_grid.pas
index 320c2408..9b3d6f20 100644
--- a/src/gui/fpg_grid.pas
+++ b/src/gui/fpg_grid.pas
@@ -465,7 +465,7 @@ end;
 procedure TfpgCustomStringGrid.DrawCell(ARow, ACol: Integer; ARect: TfpgRect;
     AFlags: TfpgGridDrawState);
 var
-  Flags: TFTextFlags;
+  Flags: TfpgTextFlags;
   txt: string;
   r: TfpgRect;
 begin
diff --git a/src/gui/fpg_label.pas b/src/gui/fpg_label.pas
index 75269246..5bae18ad 100644
--- a/src/gui/fpg_label.pas
+++ b/src/gui/fpg_label.pas
@@ -233,7 +233,7 @@ end;
 procedure TfpgCustomLabel.HandlePaint;
 var
   r: TfpgRect;
-  lTxtFlags: TFTextFlags;
+  lTxtFlags: TfpgTextFlags;
 begin
   inherited HandlePaint;
   Canvas.ClearClipRect;
diff --git a/src/gui/fpg_panel.pas b/src/gui/fpg_panel.pas
index 112ca0ea..9a67cee3 100644
--- a/src/gui/fpg_panel.pas
+++ b/src/gui/fpg_panel.pas
@@ -608,7 +608,7 @@ begin
 end;
 procedure TfpgPanel.HandlePaint;
 var
-  lTxtFlags: TFTextFlags;
+  lTxtFlags: TfpgTextFlags;
 begin
   inherited HandlePaint;
 
@@ -762,7 +762,7 @@ procedure TfpgGroupBox.HandlePaint;
 var
   r: TfpgRect;
   w: integer;
-  lTxtFlags: TFTextFlags;
+  lTxtFlags: TfpgTextFlags;
 begin
   inherited HandlePaint;
 
diff --git a/src/gui/fpg_popupcalendar.pas b/src/gui/fpg_popupcalendar.pas
index a0eb0f72..2b248723 100644
--- a/src/gui/fpg_popupcalendar.pas
+++ b/src/gui/fpg_popupcalendar.pas
@@ -1510,7 +1510,7 @@ procedure TfpgCalendarCheckCombo.DoDrawText(const ARect: TfpgRect);
 var
   lRect: TfpgRect;
 var
-  flags: TFTextFlags;
+  flags: TfpgTextFlags;
 begin
   lRect := ARect;
   lRect.Left := lRect.Left+FCheckBoxRect.Width + 1;
diff --git a/src/gui/fpg_radiobutton.pas b/src/gui/fpg_radiobutton.pas
index 8047fc25..2ce8d566 100644
--- a/src/gui/fpg_radiobutton.pas
+++ b/src/gui/fpg_radiobutton.pas
@@ -187,7 +187,7 @@ var
   r: TfpgRect;
   img: TfpgImage;
   ix: integer;
-  LFlags: TFTextFlags;
+  LFlags: TfpgTextFlags;
 begin
   inherited HandlePaint;
   Canvas.ClearClipRect;
diff --git a/src/gui/fpg_tab.pas b/src/gui/fpg_tab.pas
index 57aac086..5cdb7396 100644
--- a/src/gui/fpg_tab.pas
+++ b/src/gui/fpg_tab.pas
@@ -774,7 +774,7 @@ var
   toffset: integer;
   TextLeft, TextTop: Integer;
   dx: integer;
-  lTxtFlags: TFTextFlags;
+  lTxtFlags: TfpgTextFlags;
   ActivePageVisible: Boolean;
 begin
   if not HasHandle then