* fpGUI should now compile under FPC 2.3.1 but it's untested.

5 files changed, 22 insertions, 10 deletions

diff --git a/examples/gui/filegrid/filegrid.lpi b/examples/gui/filegrid/filegrid.lpi
index e3cf7a0a..16e88b3c 100644
--- a/examples/gui/filegrid/filegrid.lpi
+++ b/examples/gui/filegrid/filegrid.lpi
@@ -46,7 +46,8 @@
       <Generate Value="Faster"/>
     </CodeGeneration>
     <Other>
-      <CustomOptions Value="-FUunits"/>
+      <CustomOptions Value="-FUunits
+"/>
       <CompilerPath Value="$(CompPath)"/>
     </Other>
   </CompilerOptions>
diff --git a/src/corelib/gfx_constants.pas b/src/corelib/gfx_constants.pas
index e64cf448..9d07d1c3 100644
--- a/src/corelib/gfx_constants.pas
+++ b/src/corelib/gfx_constants.pas
@@ -60,11 +60,14 @@ resourcestring
 
 
 const
-  {$IFDEF UNIX}
-  AllFilesMask    = '*';
-  {$ELSE}
-  AllFilesMask    = '*.*';
-  {$ENDIF UNIX}
+  // FPC 2.2.0 and earlier only
+  {$if defined(VER2_0) or defined(VER2_2_0)}
+    {$IFDEF UNIX}
+    AllFilesMask    = '*';
+    {$ELSE}
+    AllFilesMask    = '*.*';
+    {$ENDIF UNIX}
+  {$endif}
 
 
 { This is so that when we support LTR and RTL languages, the colon will be
diff --git a/src/corelib/gfx_widget.pas b/src/corelib/gfx_widget.pas
index 638d7c33..0662b646 100644
--- a/src/corelib/gfx_widget.pas
+++ b/src/corelib/gfx_widget.pas
@@ -233,7 +233,13 @@ constructor TfpgWidget.Create(AOwner: TComponent);
 begin
   { TODO: -oGraeme -cRelease_Blocker ComponentState is read-only. I'm
     exploiting a FPC <= 2.2.0 bug. I need to fix this! }
-  Include(ComponentState, csLoading);
+//  {$if defined(VER2_0) or defined(VER2_2_0)}
+//  Include(ComponentState, csLoading);
+//  {$else}
+//  Loading;    // ????
+//  {$endif}
+  Include(FComponentState, csLoading);
+
   FOnScreen   := False;
   FVisible    := True;
   FActiveWidget := nil;
diff --git a/src/corelib/gfxbase.pas b/src/corelib/gfxbase.pas
index d7d525f9..dd713ebf 100644
--- a/src/corelib/gfxbase.pas
+++ b/src/corelib/gfxbase.pas
@@ -313,6 +313,8 @@ type
   TfpgComponent = class(TComponent)
   private
     FTagPointer: Pointer;
+  protected
+    FComponentState: TComponentState; // because FPC developers don't want to give me a TComponent.Loading function
   public
     property    TagPointer: Pointer read FTagPointer write FTagPointer;
   end;
diff --git a/src/gui/gui_hyperlink.pas b/src/gui/gui_hyperlink.pas
index d2a0f5f0..3295ff3f 100644
--- a/src/gui/gui_hyperlink.pas
+++ b/src/gui/gui_hyperlink.pas
@@ -50,13 +50,13 @@ type
     constructor Create(AOwner: TComponent); override;
     procedure   GoHyperLink;
   published
-    property    URL: TfpgString read FUrl write SetURL;
     property    Autosize;
     property    FontDesc;
+    property    HotTrackColor: TfpgColor read fHotTrackColor write SetHotTrackColor;
+    property    HotTrackFont: TfpgString read fHTFont write SetHotTrackFont;
     property    Text;
     property    TextColor;
-    property    HotTrackFont: TfpgString read fHTFont write SetHotTrackFont;
-    property    HotTrackColor: TfpgColor read fHotTrackColor write SetHotTrackColor;
+    property    URL: TfpgString read FUrl write SetURL;
 end;