From 3779b4022966ffd7fe5ea3dd29a9b1b6fe4e07cf Mon Sep 17 00:00:00 2001
From: david <darranz@rodax-software.com>
Date: Mon, 29 Jun 2009 15:03:54 +0000
Subject: [PATCH] =?UTF-8?q?Actualizaci=C3=B3n=20oficial=20con=20arreglos?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

git-svn-id: https://192.168.0.254/svn/Componentes.Terceros.cxIntl5@17 153d478c-8cf9-1c4a-9078-3a687f347812
---
 official/6.0.0/Readme.txt        |  7 +++++--
 official/6.0.0/Source/cxVer.inc  | 23 ++++++++++++++++++++++-
 official/6.0.0/Source/cxintl.pas | 16 ++++++++++++++--
 3 files changed, 41 insertions(+), 5 deletions(-)

diff --git a/official/6.0.0/Readme.txt b/official/6.0.0/Readme.txt
index 5436c1a..96ca8e2 100644
--- a/official/6.0.0/Readme.txt
+++ b/official/6.0.0/Readme.txt
@@ -10,8 +10,8 @@ Installation Instruction (until Dephi 7)
 7. Press OK
 
 
-Installation Instruction (Delphi 2005, 2006)
---------------------------------------------
+Installation Instruction (Delphi 2005, 2006, 2007)
+--------------------------------------------------
 
 1. Start Delphi and close all projects
 2. Choose File -> New -> Package - Delphi for Win32
@@ -34,6 +34,9 @@ and disable {$DEFINE USEPAGECONTROL}.
 Version History
 ---------------
 
+09.02.2008	Fixed: GridFilterRowInfoText and GridNewItemRowInfoText
+		will now be translated correctly
+
 01.11.2007	updated with the following new strings
 
 		NavigatorHint_Append
diff --git a/official/6.0.0/Source/cxVer.inc b/official/6.0.0/Source/cxVer.inc
index 486ca12..19f45cc 100644
--- a/official/6.0.0/Source/cxVer.inc
+++ b/official/6.0.0/Source/cxVer.inc
@@ -12,7 +12,6 @@
 {$DEFINE DXVER500}
 
 {$IFNDEF CLR}
-  {$DEFINE OLEDRAGANDDROP}
   {$IFNDEF DONTUSEJPEGIMAGE}
     {$DEFINE USEJPEGIMAGE}
   {$ENDIF}
@@ -151,6 +150,28 @@
   {$ENDIF}
 {$ENDIF}
 
+{$IFDEF VER200} { Borland Delphi 12 //CodeGear/Tiburon}
+  {$DEFINE DELPHI4}
+  {$DEFINE DELPHI5}
+  {$DEFINE DELPHI6}
+  {$DEFINE DELPHI7}
+  {$DEFINE DELPHI8}
+  {$DEFINE DELPHI9}
+  {$DEFINE DELPHI10}
+  {$DEFINE DELPHI11}
+  {$DEFINE DELPHI12}
+  {$IFDEF BCB}  { Borland C++Builder 12 }
+    {$DEFINE CBUILDER3}
+    {$DEFINE CBUILDER4}
+    {$DEFINE CBUILDER5}
+    {$DEFINE CBUILDER6}
+    {$DEFINE CBUILDER10}
+    {$DEFINE CBUILDER11}
+    {$DEFINE CBUILDER12}
+    {$ObjExportAll On}
+  {$ENDIF}
+{$ENDIF}
+
 {$IFNDEF CLR}
   {$IFNDEF BCB}
     {$IFDEF DELPHI6}
diff --git a/official/6.0.0/Source/cxintl.pas b/official/6.0.0/Source/cxintl.pas
index 428f76d..6f0ee00 100644
--- a/official/6.0.0/Source/cxintl.pas
+++ b/official/6.0.0/Source/cxintl.pas
@@ -1028,6 +1028,9 @@ var cxInternational: TcxIntl;
 
 implementation
 
+uses
+  cxGridCustomView, cxGridCustomTableView, cxGridTableView, cxGridDBTableView;
+
 constructor TcxIntl.Create(AOwner: TComponent);
 begin
   inherited Create(AOwner);
@@ -2526,7 +2529,7 @@ begin
 end;
 
 Procedure TcxIntl.Connect;
-var intI, intJ : Integer;
+var intI, intJ, intK : Integer;
 begin
   if self=cxInternational then exit;
 
@@ -3014,8 +3017,17 @@ begin
   for intJ:= 0 to Application.ComponentCount-1 do begin
     if Application.Components[intJ] is TForm then begin
       for intI := 0 to Application.Components[intJ].ComponentCount-1 do begin
-        if Application.Components[intJ].Components[intI] is TcxGrid then
+        if Application.Components[intJ].Components[intI] is TcxGrid then begin
           (Application.Components[intJ].Components[intI] as TcxGrid).LayoutChanged;
+          for intK := 0 to (Application.Components[intJ].Components[intI] as TcxGrid).ViewCount-1 do
+          begin
+            if (Application.Components[intJ].Components[intI] as TcxGrid).Views[intK] is TcxGridTableView then
+            begin
+              ((Application.Components[intJ].Components[intI] as TcxGrid).Views[intK] as TcxGridTableView).FilterRow.InfoText := QuantumGrid.FscxGridFilterRowInfoText;
+              ((Application.Components[intJ].Components[intI] as TcxGrid).Views[intK] as TcxGridTableView).NewItemRow.InfoText := QuantumGrid.FscxGridNewItemRowInfoText;
+            end;  
+          end;
+        end;
         if Application.Components[intJ].Components[intI] is TcxFilterControl then
           (Application.Components[intJ].Components[intI] as TcxFilterControl).Localize;
         if Application.Components[intJ].Components[intI] is TcxDBFilterControl then