* Implemented and added a new unit that will handle command line parameters.

* Implemented and added a new CheckBox widget. (needs testing under Windows).
* Made some timer changes for Windows (needs testing).
* Moved the global variable for the MainForm into the TfpgApplication class. I can almost remove the gui_form requirement from GFX.

17 files changed, 693 insertions, 49 deletions

diff --git a/examples/corelib/canvastest/fpgcanvas.lpi b/examples/corelib/canvastest/fpgcanvas.lpi
index 7f1c6c21..71f908fb 100644
--- a/examples/corelib/canvastest/fpgcanvas.lpi
+++ b/examples/corelib/canvastest/fpgcanvas.lpi
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <CONFIG>
   <ProjectOptions>
-    <PathDelim Value="\"/>
+    <PathDelim Value="/"/>
     <Version Value="5"/>
     <General>
       <Flags>
@@ -9,7 +9,7 @@
       </Flags>
       <SessionStorage Value="InProjectDir"/>
       <MainUnit Value="0"/>
-      <IconPath Value=".\"/>
+      <IconPath Value="./"/>
       <TargetFileExt Value=""/>
       <Title Value="fpcanvas"/>
     </General>
@@ -24,7 +24,7 @@
     <RunParams>
       <local>
         <FormatVersion Value="1"/>
-        <LaunchingApplication PathPlusParams="\usr\X11R6\bin\xterm -T 'Lazarus Run Output' -e $(LazarusDir)\tools\runwait.sh $(TargetCmdLine)"/>
+        <LaunchingApplication PathPlusParams="/usr/X11R6/bin/xterm -T 'Lazarus Run Output' -e $(LazarusDir)/tools/runwait.sh $(TargetCmdLine)"/>
       </local>
     </RunParams>
     <RequiredPackages Count="1">
@@ -43,7 +43,6 @@
   </ProjectOptions>
   <CompilerOptions>
     <Version Value="5"/>
-    <PathDelim Value="\"/>
     <CodeGeneration>
       <Generate Value="Faster"/>
     </CodeGeneration>
diff --git a/examples/corelib/canvastest/fpgcanvas.lpr b/examples/corelib/canvastest/fpgcanvas.lpr
index b77c9a80..2f9c37c4 100644
--- a/examples/corelib/canvastest/fpgcanvas.lpr
+++ b/examples/corelib/canvastest/fpgcanvas.lpr
@@ -10,7 +10,7 @@ uses
   fpgfx,
   gfxbase,
   gui_form,
-  gfx_imgfmt_bmp, math;
+  gfx_imgfmt_bmp;
 
 
 type
diff --git a/examples/gui/timertest/timertest.lpi b/examples/gui/timertest/timertest.lpi
index a3a2caea..32287328 100644
--- a/examples/gui/timertest/timertest.lpi
+++ b/examples/gui/timertest/timertest.lpi
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <CONFIG>
   <ProjectOptions>
-    <PathDelim Value="\"/>
+    <PathDelim Value="/"/>
     <Version Value="5"/>
     <General>
       <Flags>
@@ -9,7 +9,7 @@
       </Flags>
       <SessionStorage Value="InProjectDir"/>
       <MainUnit Value="0"/>
-      <IconPath Value=".\"/>
+      <IconPath Value="./"/>
       <TargetFileExt Value=""/>
     </General>
     <VersionInfo>
@@ -17,14 +17,13 @@
     </VersionInfo>
     <PublishOptions>
       <Version Value="2"/>
-      <DestinationDirectory Value="$(TestDir)\publishedproject\"/>
       <IncludeFileFilter Value="*.(pas|pp|inc|lfm|lpr|lrs|lpi|lpk|sh|xml)"/>
       <ExcludeFileFilter Value="*.(bak|ppu|ppw|o|so);*~;backup"/>
     </PublishOptions>
     <RunParams>
       <local>
         <FormatVersion Value="1"/>
-        <LaunchingApplication PathPlusParams="\usr\X11R6\bin\xterm -T 'Lazarus Run Output' -e $(LazarusDir)\tools\runwait.sh $(TargetCmdLine)"/>
+        <LaunchingApplication PathPlusParams="/usr/X11R6/bin/xterm -T 'Lazarus Run Output' -e $(LazarusDir)/tools/runwait.sh $(TargetCmdLine)"/>
       </local>
     </RunParams>
     <RequiredPackages Count="1">
@@ -43,7 +42,6 @@
   </ProjectOptions>
   <CompilerOptions>
     <Version Value="5"/>
-    <PathDelim Value="\"/>
     <CodeGeneration>
       <Generate Value="Faster"/>
     </CodeGeneration>
diff --git a/examples/gui/timertest/timertest.lpr b/examples/gui/timertest/timertest.lpr
index 7c4209df..dab53ad2 100644
--- a/examples/gui/timertest/timertest.lpr
+++ b/examples/gui/timertest/timertest.lpr
@@ -28,6 +28,7 @@ type
     procedure   btnStopStartClick(Sender: TObject);
   public
     constructor Create(AOwner: TComponent); override;
+    destructor  Destroy; override;
   end;
 
 
@@ -107,6 +108,14 @@ begin
   timer3.Enabled  := True;
 end;
 
+destructor TMainForm.Destroy;
+begin
+  timer3.Free;
+  timer2.Free;
+  timer1.Free;
+  inherited Destroy;
+end;
+
 
 procedure MainProc;
 var
diff --git a/prototypes/fpgui2/tests/edittest.dpr b/prototypes/fpgui2/tests/edittest.dpr
index c9b33b22..54dc2188 100644
--- a/prototypes/fpgui2/tests/edittest.dpr
+++ b/prototypes/fpgui2/tests/edittest.dpr
@@ -16,7 +16,8 @@ uses
   gui_scrollbar,
   gui_memo,
   gui_dialogs,
-  gui_listbox;
+  gui_listbox,
+  gui_checkbox;
 
 type
 
@@ -68,6 +69,7 @@ type
     xpluna: TXPButton;
     xp2: TXPButton;
     xpsilver: TXPButton;
+    checkbox: TfpgCheckBox;
     procedure AfterCreate; override;
   end;
 
@@ -368,6 +370,8 @@ end;
     bmp.CreateMaskFromSample(0, 0);
     bmp.UpdateImage;
     xpsilver.ThemeImage := bmp;
+    
+    checkbox := CreateCheckBox(self, 10, 220, 'Checkbox One');
   end;
 
 procedure MainProc;
diff --git a/prototypes/fpgui2/tests/edittest.lpi b/prototypes/fpgui2/tests/edittest.lpi
index b609d403..1ecb384f 100644
--- a/prototypes/fpgui2/tests/edittest.lpi
+++ b/prototypes/fpgui2/tests/edittest.lpi
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <CONFIG>
   <ProjectOptions>
-    <PathDelim Value="\"/>
+    <PathDelim Value="/"/>
     <Version Value="5"/>
     <General>
       <Flags>
@@ -9,7 +9,7 @@
       </Flags>
       <SessionStorage Value="InProjectDir"/>
       <MainUnit Value="0"/>
-      <IconPath Value=".\"/>
+      <IconPath Value="./"/>
       <TargetFileExt Value=""/>
     </General>
     <VersionInfo>
@@ -23,7 +23,7 @@
     <RunParams>
       <local>
         <FormatVersion Value="1"/>
-        <LaunchingApplication PathPlusParams="\usr\X11R6\bin\xterm -T 'Lazarus Run Output' -e $(LazarusDir)\tools\runwait.sh $(TargetCmdLine)"/>
+        <LaunchingApplication PathPlusParams="/usr/X11R6/bin/xterm -T 'Lazarus Run Output' -e $(LazarusDir)/tools/runwait.sh $(TargetCmdLine)"/>
       </local>
     </RunParams>
     <RequiredPackages Count="1">
@@ -42,7 +42,6 @@
   </ProjectOptions>
   <CompilerOptions>
     <Version Value="5"/>
-    <PathDelim Value="\"/>
     <CodeGeneration>
       <Generate Value="Faster"/>
     </CodeGeneration>
diff --git a/src/corelib/fpgfx.pas b/src/corelib/fpgfx.pas
index e38c8700..434b5e40 100644
--- a/src/corelib/fpgfx.pas
+++ b/src/corelib/fpgfx.pas
@@ -184,7 +184,7 @@ type
   end;
 
 
-  TfpgTimer = class
+  TfpgTimer = class(TObject)
   private
     FEnabled: boolean;
     FNextAlarm: TDateTime;
@@ -323,18 +323,21 @@ begin
   for n := 1 to fpgTimers.Count do
   begin
     t := TfpgTimer(fpgTimers[n - 1]);
-    if t.Enabled and (t.NextAlarm < dt) then begin
+    if t.Enabled and (t.NextAlarm < dt) then
+    begin
       dt := t.NextAlarm;
       tb := True;
     end;
   end;
 
-  if tb then begin
+  if tb then
+  begin
     Result := trunc(0.5 + (dt - ctime) / ONE_MILISEC);
     if Result < 0 then
       Result := 0;
   end
-  else Result := -1;
+  else
+    Result := -1;
 end;
 
 procedure TfpgTimer.SetEnabled(const AValue: boolean);
@@ -371,7 +374,7 @@ end;
 procedure TfpgTimer.CheckAlarm(ctime: TDateTime);
 begin
   if not FEnabled then
-    Exit;
+    Exit; //==>
 
   if FNextAlarm <= ctime then
   begin
@@ -380,8 +383,8 @@ begin
       while FNextAlarm <= ctime do
         FNextAlarm := FNextAlarm + interval * ONE_MILISEC;
 
-    if Assigned(OnTimer) then
-      OnTimer(self);
+    if Assigned(FOnTimer) then
+      FOnTimer(self);
   end;
 end;
 
@@ -526,7 +529,7 @@ end;
 
 procedure TfpgApplication.Initialize;
 begin
-  {$Note remember to process parameter!! }
+  {$Note Remember to process parameters!! }
   if IsInitialized then
     InternalInit
   else
diff --git a/src/corelib/gdi/gfx_gdi.pas b/src/corelib/gdi/gfx_gdi.pas
index 5e53cf56..b49367a4 100644
--- a/src/corelib/gdi/gfx_gdi.pas
+++ b/src/corelib/gdi/gfx_gdi.pas
@@ -160,7 +160,6 @@ type
     FFocusedWindow: THANDLE;
     LastClickWindow: TfpgWinHandle; // double click generation
     LastWinClickTime: longword;
-    FTimerWnd: HWND;
   public
     constructor Create(const aparams: string); override;
     function    DoMessagesPending: boolean;
@@ -742,19 +741,19 @@ procedure TfpgApplicationImpl.DoWaitWindowMessage(atimeoutms: integer);
 var
   Msg: TMsg;
   timerid: longword;
-  timerwnd: HWND;
+  ltimerWnd: HWND;
   mp: boolean;
 begin
   timerid  := 0;
-  timerwnd := 0;
+  ltimerWnd := TfpgWindomImpl(wapplication.MainForm).WinHandle;
 
   if (atimeoutms >= 0) and (not DoMessagesPending) then
+  begin
     if atimeoutms > 0 then
-      timerid := Windows.SetTimer(timerwnd, 1, atimeoutms, nil)
-      {$Note This needs to be enabled again, but find a butter solution.}
-      // timerwnd := fpgMainForm.WinHandle;
+      timerid := Windows.SetTimer(ltimerWnd, 1, atimeoutms, nil)
     else
       Exit;  // handling waiting timeout
+  end;
 
   {$Note Incorporate Felipe's code from previous fpGUI in here. It handles WinCE and Windows just fine. }
   if (GetVersion() < $80000000) then
@@ -764,8 +763,8 @@ begin
 
   Windows.DispatchMessage(@msg);
 
-  if timerid > 0 then
-    Windows.KillTimer(timerwnd, 1);
+  if timerid <> 0 then
+    Windows.KillTimer(ltimerWnd, 1);  // same IDEvent as used in SetTimer
 end;
 
 procedure TfpgApplicationImpl.DoFlush;
diff --git a/src/corelib/gfx_cmdlineparams.pas b/src/corelib/gfx_cmdlineparams.pas
new file mode 100644
index 00000000..1e833f81
--- /dev/null
+++ b/src/corelib/gfx_cmdlineparams.pas
@@ -0,0 +1,432 @@
+{
+    fpGUI  -  Free Pascal GUI Library
+
+    Unit to handle command line processing
+
+    Copyright (C) 2007 See the file AUTHORS.txt, included in this
+    distribution, for details of the copyright.
+
+    See the file COPYING.modifiedLGPL, included in this distribution,
+    for details about redistributing fpGUI.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+}
+
+unit gfx_cmdlineparams;
+
+{$mode objfpc}{$H+}
+
+interface
+uses
+  Classes;
+
+const
+  ctiCommandLineParamPrefix = '-';
+
+type
+
+  TGfxCommandLineParams = class(TObject)
+  private
+    FsParams: string;
+    FslParams: TStringList;
+    procedure   ReadParams;
+    function    WordExtract(const AInput: string; const APos: integer; const ADelims: string): string;
+    function    WordCount(const AStrToProcess: string; ADelims: string): integer;
+    function    WordPosition(const AN: integer; const AStr: string; ADelims: string): integer;
+    function    ExtractChar(const AValue: string; const APos: integer): char;
+    function    CharInStr(const AChr: char; const AStr: string): boolean;
+    function    StripLeadingDelims(const AStrToProcess: string; ADelims: string): string;
+    function    StripTrailingDelims(const AStrToProcess: string; ADelims: string): string;
+    function    NumToken(const AValue, AToken: string): integer;
+    function    Token(const AValue, AToken: string; const APos: integer): string;
+    function    StrTran(AValue, ADel, AIns: string): string;
+  public
+    constructor Create;
+    destructor  Destroy; override;
+    function    IsParam(const AParam: string): boolean; overload;
+    function    IsParam(const AParams: array of string): boolean; overload;
+    function    GetParam(const AParam: string): string;
+    property    Params: TStringList read FslParams;
+    property    AsString: string read FsParams;
+  end;
+
+
+// Singleton
+function gCommandLineParams: TGfxCommandLineParams;
+
+
+implementation
+
+uses
+  SysUtils;
+
+var
+  uCommandLineParams: TGfxCommandLineParams;
+
+// Singleton
+function gCommandLineParams: TGfxCommandLineParams;
+begin
+  if uCommandLineParams = nil then
+    uCommandLineParams := TGfxCommandLineParams.Create;
+  result := uCommandLineParams;
+end;
+
+{ TGfxCommandLineParams }
+
+constructor TGfxCommandLineParams.Create;
+begin
+  inherited;
+  FslParams := TStringList.Create;
+  ReadParams;
+end;
+
+destructor TGfxCommandLineParams.destroy;
+begin
+  FslParams.Free;
+  inherited;
+end;
+
+function TGfxCommandLineParams.GetParam(const AParam: string): string;
+begin
+  result := FslParams.Values[ upperCase(AParam)];
+end;
+
+function TGfxCommandLineParams.IsParam(const AParam: string): boolean;
+var
+  i: integer;
+begin
+  result := false;
+  for i := 0 to FslParams.Count - 1 do begin
+    if FslParams.Names[i] = upperCase(AParam) then begin
+      result := true;
+      break; //==>
+    end;
+  end;
+end;
+
+function TGfxCommandLineParams.IsParam(const AParams: array of string): boolean;
+var
+  i: integer;
+begin
+  result := false;
+  for i := Low(AParams) to High(AParams) do
+    if IsParam(AParams[i]) then
+    begin
+      result := true;
+      Exit; //==>
+    end;
+end;
+
+procedure TGfxCommandLineParams.ReadParams;
+var
+  i: integer;
+  j: integer;
+  lsNameValue: string;
+  lsValue: string;
+  lsName: string;
+const
+  cDelim = ' ';
+begin
+  lsValue := '';
+  FsParams := '';
+  j := ParamCount;
+  for i := 1 to j do begin
+    if FsParams <> '' then FsParams := FsParams + cDelim;
+    FsParams := FsParams + ParamStr(i);
+  end ;
+
+  j := WordCount(FsParams, ctiCommandLineParamPrefix);
+  for i := 1 to j do begin
+    lsNameValue := WordExtract(FsParams, i, ctiCommandLineParamPrefix);
+    lsName := Token(lsNameValue, cDelim, 1);
+    lsValue := copy(lsNameValue, length(lsName) + 1,
+                     length(FsParams) - length(lsValue));
+
+    lsValue := Trim(lsValue);
+    lsName := StrTran(lsName, ctiCommandLineParamPrefix, '');
+    lsName := upperCase(lsName);
+
+    FslParams.Add(lsName + '=' + lsValue);
+  end;
+end;
+
+function TGfxCommandLineParams.StrTran(AValue, ADel, AIns: string): string;
+var
+  i: integer;
+  sToChange: string;
+begin
+  result := '';
+  sToChange := AValue;
+  i := pos(ADel, sToChange);
+  while i <> 0 do
+  begin
+    result := result + copy(sToChange, 1, i-1) + AIns;
+    delete(sToChange, 1, i+length(ADel)-1);
+    i := pos(ADel, sToChange);
+  end;
+  result := result + sToChange;
+end;
+
+function TGfxCommandLineParams.NumToken(const AValue, AToken: string): integer;
+var
+  i, iCount: integer;
+  lsValue: string;
+begin
+  result := 0;
+  if AValue = '' then
+    Exit; //==>
+
+  iCount := 0;
+  lsValue := AValue;
+  i := pos(AToken, lsValue);
+  while i <> 0 do
+  begin
+    delete(lsValue, i, length(AToken));
+    inc(iCount);
+    i := pos(AToken, lsValue);
+  end;
+  result := iCount + 1;
+end;
+
+function TGfxCommandLineParams.Token(const AValue, AToken: string;
+    const APos: integer): string;
+var
+  i, iCount, iNumToken: integer;
+  lsValue: string;
+begin
+  result := '';
+
+  iNumToken := NumToken(AValue, AToken);
+  if APos = 1 then
+  begin
+    if pos(AToken, AValue) = 0 then
+      result := AValue
+    else
+      result := copy(AValue, 1, pos(AToken, AValue)-1);
+  end
+  else if (iNumToken < APos-1) or (APos<1) then
+  begin
+    result := '';
+  end
+  else
+  begin
+    { Remove leading blocks }
+    iCount := 1;
+    lsValue := AValue;
+    i := pos(AToken, lsValue);
+    while (i<>0) and (iCount<APos) do
+    begin
+      delete(lsValue, 1, i + length(AToken) - 1);
+      inc(iCount);
+      i := pos(AToken, lsValue);
+    end;
+
+    if (i=0) and (iCount=APos) then
+      result := lsValue
+    else if (i=0) and (iCount<>APos) then
+      result := ''
+    else
+      result := copy(lsValue, 1, i-1);
+  end;
+end;
+
+function TGfxCommandLineParams.WordExtract(const AInput: string;
+    const APos: integer; const ADelims: string): string;
+var
+  iStart: integer;
+  i: integer;
+	iLen: integer;
+begin
+  result := '';
+
+  // Find the starting pos of the Nth word
+  iStart := WordPosition(APos, AInput, ADelims);
+
+  if iStart <> 0 then
+  begin
+    i := iStart;
+    iLen := length(AInput);
+    // Build up result until we come to our next wordDelim
+    // while (i <= iLen) and not(S[i] in ADelims) do begin
+    while (i <= iLen) and not(CharInStr(ExtractChar(AInput, i), ADelims)) do
+    begin
+      result := result + ExtractChar(AInput, i);
+      inc(i);
+    end;
+  end;
+end;
+
+function TGfxCommandLineParams.WordPosition(const AN: integer;
+    const AStr: string; ADelims: string): integer;
+var
+  lCount: integer;
+  lI: Word;
+  lSLen: integer;
+begin
+  lCount  := 0;
+  lI      := 1;
+  Result  := 0;
+  lSLen   := length(AStr);
+
+  while (lI <= lSLen) and (lCount <> AN) do
+  begin
+    while (lI <= lSLen) and (CharInStr(ExtractChar(AStr, lI), ADelims)) do
+    begin
+      Inc(lI);
+    end;
+
+    // if we're not beyond end of S, we're at the start of a word
+    if lI <= lSLen then
+    begin
+      Inc(lCount);
+    end;
+
+    // if not finished, find the end of the current word
+    if lCount <> AN then
+    begin
+      while (lI <= lSLen) and not(CharInStr(ExtractChar(AStr, lI), ADelims)) do
+      begin
+        Inc(lI);
+      end;
+    end
+    else
+    begin
+      Result := lI;
+    end;
+  end;
+end;
+
+function TGfxCommandLineParams.ExtractChar(const AValue: string;
+    const APos: integer): char;
+var
+  lResult: string;
+begin
+  if APos > length(AValue) then
+  begin
+    result := ' ';
+    exit;
+   end;
+  lResult := copy(AValue, APos, 1);
+  result := lResult[1];
+end;
+
+function TGfxCommandLineParams.StripLeadingDelims(const AStrToProcess: string;
+    ADelims: string): string;
+var
+  i: integer;
+  lCharCurrent: char;
+begin
+  result := AStrToProcess;
+  // Loop through each char in the string
+  for i := 1 to length(AStrToProcess) do
+  begin
+    // Extract the current character
+    lCharCurrent := ExtractChar(AStrToProcess, i);
+
+    // Is this character a NON word delim?, then we have found the body of the string.
+    if not CharInStr(lCharCurrent, ADelims) then
+    begin
+      result := copy(AStrToProcess, i,
+                      length(AStrToProcess) - i + 1);
+      exit; //==>
+    // The current char is a word delim, but we are at the end of the string -
+    // so no words
+    end
+    else
+    begin
+      if i = length(AStrToProcess) then
+      begin
+        result := '';
+      end;
+    end;
+  end;
+end;
+
+// Strip any trailing ADelims
+function TGfxCommandLineParams.StripTrailingDelims(const AStrToProcess: string;
+    ADelims: string): string;
+var
+  i: integer;
+  lCharCurrent: char;
+begin
+  result := AStrToProcess;
+  // Loop through each char in the string
+  for i := length(AStrToProcess) downto 1 do
+  begin
+    // Extract the current character
+    lCharCurrent := ExtractChar(AStrToProcess, i);
+
+    // Is this character a NON word delim?, then we have found the body of the string.
+    if not CharInStr(lCharCurrent, ADelims) then
+    begin
+      result := copy(AStrToProcess, 1, i);
+      exit; //==>
+    // The current char is a word delim, but we are at the beginning of the string -
+    // so no words
+    end
+    else
+    begin
+      if i = length(AStrToProcess) then
+      begin
+        result := '';
+      end;
+    end;
+  end;
+end;
+
+// Given a set of word delimiters, return number of words in S
+function TGfxCommandLineParams.WordCount(const AStrToProcess: string;
+    ADelims: string): integer;
+var
+  i: integer;
+  lCharLast: char;
+  lCharCurrent: char;
+  lStrToProcess: string;
+begin
+  // Strip any leading ADelims
+  lStrToProcess := StripLeadingDelims(AStrToProcess, ADelims);
+  lStrToProcess := StripTrailingDelims(lStrToProcess, ADelims);
+
+  // If lStrToProcess is empty, then there are no words
+  if lStrToProcess = '' then
+  begin
+    result := 0;
+    Exit; //==>
+  end;
+
+  // lStrToProcess is not empty, therefore there must be at least one word
+  // Every wordDelim we find equals another word:
+  // 0 word delim := 1 word
+  // 1 word delim := 2 words...
+  result := 1;
+
+  // lCharLast is used to check for more than 1 wordDelim together
+  lCharLast := #0;
+
+  for i := 1 to length(lStrToProcess) do
+  begin
+    lCharCurrent := ExtractChar(lStrToProcess, i);
+    if CharInStr(lCharCurrent, ADelims) and not(CharInStr(lCharLast, ADelims)) then
+    begin
+      inc(result);
+    end;
+    lCharLast := lCharCurrent;
+  end;
+end;
+
+// Is AChr in the string AStr ?
+function TGfxCommandLineParams.CharInStr(const AChr: char; const AStr: string): boolean;
+begin
+  result := pos(AChr, AStr) <> 0;
+end;
+
+
+initialization
+
+finalization
+  uCommandLineParams.Free;
+
+end.
+
diff --git a/src/corelib/gfxbase.pas b/src/corelib/gfxbase.pas
index 5add81ad..28149f8f 100644
--- a/src/corelib/gfxbase.pas
+++ b/src/corelib/gfxbase.pas
@@ -349,6 +349,7 @@ type
 
   TfpgApplicationBase = class(TObject)
   private
+    FMainForm: TfpgWindowBase;
     FTopModalForm: TfpgWindowBase;
   protected
     FIsInitialized: Boolean;
@@ -356,6 +357,7 @@ type
     constructor Create(const AParams: string); virtual; abstract;
     property    IsInitialized: boolean read FIsInitialized;
     property    TopModalForm: TfpgWindowBase read FTopModalForm write FTopModalForm;
+    property    MainForm: TfpgWindowBase read FMainForm write FMainForm;
   end;
 
 
diff --git a/src/corelib/x11/fpgfx_package.lpk b/src/corelib/x11/fpgfx_package.lpk
index 1521ea5a..77167bd2 100644
--- a/src/corelib/x11/fpgfx_package.lpk
+++ b/src/corelib/x11/fpgfx_package.lpk
@@ -24,7 +24,7 @@
     <License Value="Modified LGPL
 "/>
     <Version Minor="5"/>
-    <Files Count="10">
+    <Files Count="11">
       <Item1>
         <Filename Value="x11_xft.pas"/>
         <UnitName Value="x11_xft"/>
@@ -65,6 +65,10 @@
         <Filename Value="../gfx_extinterpolation.pas"/>
         <UnitName Value="gfx_extinterpolation"/>
       </Item10>
+      <Item11>
+        <Filename Value="../gfx_cmdlineparams.pas"/>
+        <UnitName Value="gfx_cmdlineparams"/>
+      </Item11>
     </Files>
     <RequiredPkgs Count="1">
       <Item1>
diff --git a/src/corelib/x11/fpgfx_package.pas b/src/corelib/x11/fpgfx_package.pas
index 0fc83352..7fa2a8c3 100644
--- a/src/corelib/x11/fpgfx_package.pas
+++ b/src/corelib/x11/fpgfx_package.pas
@@ -8,7 +8,7 @@ interface
 
 uses
   x11_xft, x11_keyconv, gfxbase, gfx_x11, fpgfx, gfx_stdimages, gfx_imgfmt_bmp, 
-    gfx_widget, gfx_UTF8utils, gfx_extinterpolation; 
+    gfx_widget, gfx_UTF8utils, gfx_extinterpolation, gfx_cmdlineparams; 
 
 implementation
 
diff --git a/src/corelib/x11/gfx_x11.pas b/src/corelib/x11/gfx_x11.pas
index 1935ff57..35564db6 100644
--- a/src/corelib/x11/gfx_x11.pas
+++ b/src/corelib/x11/gfx_x11.pas
@@ -621,10 +621,9 @@ begin
   repeat
     if (atimeoutms >= 0) and (XPending(display) <= 0) then
     begin
-      // waiting some event for the given timeout
-
-      // this Select handles only the first 256 file descriptors
-      // poll would be better but FPC has no official poll interface (if I'm right)
+      // Some event is waiting for the given timeout.
+      // This Select handles only the first 256 file descriptors.
+      // Poll would be better but FPC has no official poll interface (if I'm right)
       fpFD_ZERO(rfds);
       fpFD_SET(xfd, rfds);
       r := fpSelect(xfd + 1, @rfds, nil, nil, atimeoutms);
diff --git a/src/gui/fpgui_package.lpk b/src/gui/fpgui_package.lpk
index 5ad6031a..cbd1dbe6 100644
--- a/src/gui/fpgui_package.lpk
+++ b/src/gui/fpgui_package.lpk
@@ -18,7 +18,7 @@
     <Description Value="fpGUI - multi-handle redesign"/>
     <License Value="Modified LGPL"/>
     <Version Minor="5"/>
-    <Files Count="11">
+    <Files Count="12">
       <Item1>
         <Filename Value="gui_button.pas"/>
         <UnitName Value="gui_button"/>
@@ -63,6 +63,10 @@
         <Filename Value="gui_bevel.pas"/>
         <UnitName Value="gui_bevel"/>
       </Item11>
+      <Item12>
+        <Filename Value="gui_checkbox.pas"/>
+        <UnitName Value="gui_checkbox"/>
+      </Item12>
     </Files>
     <RequiredPkgs Count="2">
       <Item1>
diff --git a/src/gui/fpgui_package.pas b/src/gui/fpgui_package.pas
index a6b53cdc..0c9d2c4d 100644
--- a/src/gui/fpgui_package.pas
+++ b/src/gui/fpgui_package.pas
@@ -8,7 +8,8 @@ interface
 
 uses
   gui_button, gui_combobox, gui_dialogs, gui_edit, gui_form, gui_label, 
-    gui_listbox, gui_memo, gui_popupwindow, gui_scrollbar, gui_bevel; 
+    gui_listbox, gui_memo, gui_popupwindow, gui_scrollbar, gui_bevel, 
+    gui_checkbox; 
 
 implementation
 
diff --git a/src/gui/gui_checkbox.pas b/src/gui/gui_checkbox.pas
new file mode 100644
index 00000000..85149b71
--- /dev/null
+++ b/src/gui/gui_checkbox.pas
@@ -0,0 +1,198 @@
+unit gui_checkbox;
+
+{$mode objfpc}{$H+}
+
+interface
+
+uses
+  Classes,
+  SysUtils,
+  fpgfx,
+  gfxbase,
+  gfx_widget;
+  
+type
+
+  TfpgCheckBox = class(TfpgWidget)
+  private
+    FBackgroundColor: TfpgColor;
+    FChecked: boolean;
+    FOnChange: TNotifyEvent;
+    FText: string;
+    FFont: TfpgFont;
+    FBoxSize: integer;
+    function    GetFontName: string;
+    procedure   SetBackgroundColor(const AValue: TfpgColor);
+    procedure   SetChecked(const AValue: boolean);
+    procedure   SetFontName(const AValue: string);
+    procedure   SetText(const AValue: string);
+  protected
+    procedure   HandlePaint; override;
+    procedure   HandleLMouseUp(x, y: integer; shiftstate: TShiftState); override;
+    procedure   HandleKeyPress(var keycode: word; var shiftstate: TShiftState; var consumed: boolean); override;
+  public
+    constructor Create(AOwner: TComponent); override;
+    destructor  Destroy; override;
+    property    Font: TfpgFont read FFont;
+  published
+    property    Checked: boolean read FChecked write SetChecked;
+    property    Text: string read FText write SetText;
+    property    FontName: string read GetFontName write SetFontName;
+    property    BackgroundColor: TfpgColor read FBackgroundColor write SetBackgroundColor;
+    property    OnChange: TNotifyEvent read FOnChange write FOnChange;
+  end;
+
+
+function CreateCheckBox(AOwner: TComponent; x, y: TfpgCoord; AText: string): TfpgCheckBox;
+
+implementation
+
+function CreateCheckBox(AOwner: TComponent; x, y: TfpgCoord; AText: string): TfpgCheckBox;
+begin
+  Result := TfpgCheckBox.Create(AOwner);
+  Result.Top := y;
+  Result.Left := x;
+  Result.Text := AText;
+  Result.Width := Result.Font.TextWidth(Result.Text) + 24;
+end;
+
+{ TfpgCheckBox }
+
+procedure TfpgCheckBox.SetChecked(const AValue: boolean);
+begin
+  if FChecked = AValue then
+    Exit; //==>
+  FChecked := AValue;
+  RePaint;
+end;
+
+function TfpgCheckBox.GetFontName: string;
+begin
+  Result := FFont.FontDesc;
+end;
+
+procedure TfpgCheckBox.SetBackgroundColor(const AValue: TfpgColor);
+begin
+  if FBackgroundColor = AValue then
+    Exit; //==>
+  FBackgroundColor := AValue;
+  RePaint;
+end;
+
+procedure TfpgCheckBox.SetFontName(const AValue: string);
+begin
+  FFont.Free;
+  FFont := fpgGetFont(AValue);
+  RePaint;
+end;
+
+procedure TfpgCheckBox.SetText(const AValue: string);
+begin
+  if FText = AValue then
+    Exit; //==>
+  FText := AValue;
+  RePaint;
+end;
+
+procedure TfpgCheckBox.HandlePaint;
+var
+  r: TfpgRect;
+  ty: integer;
+  tx: integer;
+begin
+  Canvas.BeginDraw;
+  inherited HandlePaint;
+  
+  Canvas.SetColor(FBackgroundColor);
+  Canvas.FillRectangle(0, 0, Width, Height);
+  Canvas.SetFont(Font);
+
+  if FFocused then
+  begin
+    Canvas.SetColor(clText1);
+    Canvas.SetLineStyle(1, lsDot);
+    Canvas.DrawRectangle(1, 1, Width-1, Height-1);
+  end;
+  Canvas.SetLineStyle(1, lsSolid);
+
+  r.SetRect(2, (Height div 2) - (FBoxSize div 2), FBoxSize, FBoxSize);
+  if r.top < 0 then
+    r.top := 0;
+
+  // paint box for check mark
+  Canvas.SetColor(clBoxColor);
+  Canvas.FillRectangle(r);
+  Canvas.DrawControlFrame(r.Left, r.Top, r.width, r.height);
+
+  // set colors and paint the check (in this case a X)
+  Canvas.SetColor(clText1);
+  tx := r.right + 8;
+  inc(r.left, 3);
+  inc(r.top, 3);
+  dec(r.width, 6);
+  dec(r.height, 6);
+  Canvas.SetLineStyle(2, lsSolid);
+  if FChecked then
+  begin
+    {$Note We will replace this with a image soon. }
+    Canvas.DrawLine(r.left, r.top, r.right, r.bottom);
+    Canvas.DrawLine(r.Right, r.top, r.left, r.bottom);
+  end;
+
+  Canvas.SetLineStyle(1, lsSolid);
+  ty := (Height div 2) - (Font.Height div 2);
+  if ty < 0 then
+    ty := 0;
+  Canvas.DrawString(tx, ty, FText);
+
+  Canvas.EndDraw;
+end;
+
+procedure TfpgCheckBox.HandleLMouseUp(x, y: integer; shiftstate: TShiftState);
+begin
+  inherited HandleLMouseUp(x, y, shiftstate);
+  Checked := not FChecked;
+  if Assigned(FOnChange) then
+    FOnChange(self);
+end;
+
+procedure TfpgCheckBox.HandleKeyPress(var keycode: word;
+  var shiftstate: TShiftState; var consumed: boolean);
+begin
+  if (keycode = keySpace) or (keycode = keyReturn) then
+  begin
+    consumed := True;
+    Checked := not FChecked;
+    if Assigned(FOnChange) then
+      FOnChange(self);
+  end;
+
+  if consumed then
+    Exit; //==>
+
+  inherited HandleKeyPress(keycode, shiftstate, consumed);
+end;
+
+constructor TfpgCheckBox.Create(AOwner: TComponent);
+begin
+  inherited Create(AOwner);
+  FText     := 'CheckBox';
+  FFont     := fpgGetFont('#Label1');
+  FHeight   := FFont.Height + 4;
+  FWidth    := 120;
+
+  FBackgroundColor := clWindowBackground;
+  FFocusable  := True;
+  FBoxSize    := 14;
+  FChecked    := False;
+  FOnChange   := nil;
+end;
+
+destructor TfpgCheckBox.Destroy;
+begin
+  FFont.Free;
+  inherited Destroy;
+end;
+
+end.
+
diff --git a/src/gui/gui_form.pas b/src/gui/gui_form.pas
index e45d856b..2e7472b7 100644
--- a/src/gui/gui_form.pas
+++ b/src/gui/gui_form.pas
@@ -66,11 +66,6 @@ type
   end;
 
 
-var
-  // Don't like this. It's a bit of a hack. Possibly move this into
-  // fpgApplication, but do we want fpgApplication to have that dependency??
-  fpgMainForm: TfpgForm;
-
 function WidgetParentForm(wg: TfpgWidget): TfpgForm;
 
 
@@ -136,8 +131,8 @@ end;
 
 procedure TfpgForm.AdjustWindowStyle;
 begin
-  if fpgMainForm = nil then
-    fpgMainForm := self;
+  if fpgApplication.MainForm = nil then
+    fpgApplication.MainForm := self;
 
   if FWindowPosition = wpAuto then
     Include(FWindowAttributes, waAutoPos)
@@ -257,12 +252,10 @@ end;
 procedure TfpgForm.Close;
 begin
   Hide;
-  if fpgMainForm = self then
+  if fpgApplication.MainForm = self then
     Halt(0);
 end;
 
-initialization
-  fpgMainForm     := nil;
 
 end.