RxFPC:fix compile with lcl 1.9

git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@6395 8e941d3f-bd1b-0410-a28a-d453659cc2b4

components/rx/trunk/rxcontrols/rxmdi.pas

@@ -439,7 +439,8 @@ begin
   F.Parent:=Self;
   F.Visible:=true;
   F.BringToFront;
-  Application.MainForm.ActiveControl:=F;
+  if Assigned(Application) and Assigned(Application.MainForm) then
+    Application.MainForm.ActiveControl:=F;
 
   B:=TRxMDIButton.CreateButton(TaskPanel, F);
   DoOnChangeCurrentChild(F);

components/rx/trunk/rxdb/rxdbgrid.pas

@@ -4526,7 +4526,7 @@ var
   C: TRxColumn;
   j, DataCol, L, R: integer;
   FIsMerged: Boolean;
-
+(*
 function CheckBoxHeight(const aState: TCheckboxState):integer;
 const
   arrtb:array[TCheckboxState] of TThemedButton = (tbCheckBoxUncheckedNormal, tbCheckBoxCheckedNormal, tbCheckBoxMixedNormal);
@@ -4551,7 +4551,7 @@ begin
       Result:=DefaultRowHeight;
   end;
 end;
-
+*)
 begin
   FIsMerged:=false;
 
@@ -4586,14 +4586,17 @@ begin
     else
     begin
       case ColumnEditorStyle(aCol, F) of
-        cbsCheckBoxColumn:begin
+        cbsCheckBoxColumn:
+(*        begin
           if C.Layout = tlTop then
             aRect.Bottom:=aRect.Top + CheckBoxHeight(cbChecked) + varCellPadding + 1
           else
           if C.Layout = tlBottom then
             aRect.Top:=aRect.Bottom - CheckBoxHeight(cbChecked) - varCellPadding - 1;
           DrawCheckBoxBitmaps(aCol, aRect, F);
-        end
+        end*)
+        DrawCheckBoxBitmaps(aCol, aRect, F);
+        //DrawGridCheckboxBitmaps(aCol, aRect, F);
       else
         S:=GetFieldDisplayText(F, C);
         if ((rdgWordWrap in FOptionsRx) and Assigned(C) and (C.WordWrap)) or (FIsMerged) then

components/rx/trunk/rxdb/rxdbutils.pas

@@ -128,7 +128,7 @@ procedure CloneRecord(DataSet: TDataSet; IgnoreFields: array of const);
 function FieldValueToStrings(const DataSet: TDataSet; const FieldName: string; List:TStrings = nil):TStrings;
 
 procedure AddSQLExpressionAnd(var MacroStr:string; const MacroWhere:string); overload;
-procedure AddSQLExpressionAnd(var MacroStr:string; const MacroWhere:string; Params:array of const); overload; inline;
+procedure AddSQLExpressionAnd(var MacroStr:string; const MacroWhere:string; Params:array of const); overload;
 procedure AddSQLExpressionOr(var MacroStr:string; const MacroWhere:string);
 
 { SQL expressions }

components/rx/trunk/rxdb/rxdbverticalgrid.pas

@@ -1378,6 +1378,7 @@ begin
   end
   else
   begin
+    {$IF lcl_fullversion < 01090000}
     ChkBitmap := GetImageForCheckBox(aCol, Row, AState);
     if ChkBitmap<>nil then
     begin
@@ -1389,6 +1390,9 @@ begin
       YPos := Trunc((aRect.Top+aRect.Bottom-ChkBitmap.Height)/2);
       Canvas.Draw(XPos, YPos, ChkBitmap);
     end;
+    {$ELSE}
+    DrawGridCheckboxBitmaps(aCol, Row, aRect, aState);
+    {$ENDIF}
   end;
 end;