Merge branch hyperlink into develop

Small branch that contained some improvements to the TfpgHyperLink widget.

3 files changed, 9 insertions, 7 deletions

diff --git a/src/corelib/fpg_main.pas b/src/corelib/fpg_main.pas
index a5eb98cc..5b22f666 100644
--- a/src/corelib/fpg_main.pas
+++ b/src/corelib/fpg_main.pas
@@ -2089,6 +2089,7 @@ begin
   fpgSetNamedColor(clGridInactiveSel, $FF99A6BF);         // same as clInactiveSel
   fpgSetNamedColor(clGridInactiveSelText, $FF000000);     // same as clInactiveSelText
   fpgSetNamedColor(clSplitterGrabBar, $FF839EFE);         // pale blue
+  fpgSetNamedColor(clHyperLink, clBlue);
 
 
   // Global Font Objects
diff --git a/src/corelib/predefinedcolors.inc b/src/corelib/predefinedcolors.inc
index 130cdd9f..7ad000d4 100644
--- a/src/corelib/predefinedcolors.inc
+++ b/src/corelib/predefinedcolors.inc
@@ -69,6 +69,7 @@
   clGridInactiveSel     = TfpgColor(cl_BaseNamedColor + 30);
   clGridInactiveSelText = TfpgColor(cl_BaseNamedColor + 31);
   clSplitterGrabBar     = TfpgColor(cl_BaseNamedColor + 32);
+  clHyperLink           = TfpgColor(cl_BaseNamedColor + 33);
 
 
 
diff --git a/src/gui/fpg_hyperlink.pas b/src/gui/fpg_hyperlink.pas
index 2fb7bdbc..0f0e0896 100644
--- a/src/gui/fpg_hyperlink.pas
+++ b/src/gui/fpg_hyperlink.pas
@@ -1,7 +1,7 @@
 {
     fpGUI  -  Free Pascal GUI Toolkit
 
-    Copyright (C) 2006 - 2013 See the file AUTHORS.txt, included in this
+    Copyright (C) 2006 - 2014 See the file AUTHORS.txt, included in this
     distribution, for details of the copyright.
 
     See the file COPYING.modifiedLGPL, included in this distribution,
@@ -58,7 +58,7 @@ type
     property    FontDesc;
     property    Height;
     property    Hint;
-    property    HotTrackColor: TfpgColor read FHotTrackColor write SetHotTrackColor default clBlue;
+    property    HotTrackColor: TfpgColor read FHotTrackColor write SetHotTrackColor default clHyperLink;
     property    HotTrackFont: TfpgString read FHTFont write SetHotTrackFont;
     property    Layout;
     property    Left;
@@ -66,7 +66,7 @@ type
     property    ParentShowHint;
     property    ShowHint;
     property    Text;
-    property    TextColor default clBlue;
+    property    TextColor default clHyperLink;
     property    URL: TfpgString read FUrl write SetURL;
     property    Top;
     property    Width;
@@ -91,12 +91,12 @@ constructor TfpgHyperlink.Create(AOwner: TComponent);
 begin
   inherited Create(AOwner);
   Width           := 120;
-  FHotTrackColor  := clBlue;
-  TextColor       := clBlue;
+  FHotTrackColor  := clHyperLink;
+  TextColor       := clHyperLink;
   FUrl            := fpGUIWebsite;
   FText           := 'fpGUI website';
-  FHTFont         := 'Arial-8:antialias=true:underline:bold';
-  FontDesc        := 'Arial-8:antialias=true:underline';
+  FHTFont         := FPG_DEFAULT_SANS + '-8:antialias=true:underline:bold';
+  FontDesc        := FPG_DEFAULT_SANS + '-8:antialias=true:underline';
 end;
 
 procedure TfpgHyperlink.SetURL(const Value: TfpgString);