1. Fix compile RxDBGrid on Lazarus 1.0

2. Fix Replace AnsiUpperCase to UTF8UpperCase in FolderList
3. Fix OnChange event in TRxDBLockup on destroy component


git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@2763 8e941d3f-bd1b-0410-a28a-d453659cc2b4
This commit is contained in:
alexs75
2013-07-11 16:28:38 +00:00
parent 491d1802c7
commit ab407ba4e7
3 changed files with 16 additions and 7 deletions

View File

@ -146,7 +146,7 @@ begin
AFolderList.Add(S+Rec.Name) AFolderList.Add(S+Rec.Name)
else else
begin begin
if AnsiLowerCase(ExtractFileExt(Rec.Name))=AnsiLowerCase(FDefaultExt) then if UTF8LowerCase(ExtractFileExt(Rec.Name))=UTF8LowerCase(FDefaultExt) then
AFileList.Add(S+Rec.Name); AFileList.Add(S+Rec.Name);
end; end;
R:=FindNextUTF8(Rec); R:=FindNextUTF8(Rec);

View File

@ -29,18 +29,21 @@
Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
} }
{$I rx.inc}
unit rxdbgrid; unit rxdbgrid;
{$I rx.inc}
interface interface
uses uses
Classes, SysUtils, LResources, LCLType, LCLIntf, Forms, Controls, Buttons, Classes, SysUtils, LResources, LCLVersion, LCLType, LCLIntf, Forms, Controls, Buttons,
Graphics, Dialogs, Grids, dbutils, DBGrids, DB, PropertyStorage, vclutils, Graphics, Dialogs, Grids, dbutils, DBGrids, DB, PropertyStorage, vclutils,
LMessages, types, StdCtrls, Menus; LMessages, types, StdCtrls, Menus;
{$if ((lcl_major = 1) and (lcl_minor = 1))}
{$DEFINE RX_USE_LCL_DEVEL}
{$ENDIF}
const const
CBadQuickSearchSymbols = [VK_UNKNOWN..VK_HELP] + [VK_LWIN..VK_SLEEP] + CBadQuickSearchSymbols = [VK_UNKNOWN..VK_HELP] + [VK_LWIN..VK_SLEEP] +
[VK_NUMLOCK..VK_SCROLL] + [VK_LSHIFT..VK_OEM_102] + [VK_PROCESSKEY] + [VK_NUMLOCK..VK_SCROLL] + [VK_LSHIFT..VK_OEM_102] + [VK_PROCESSKEY] +
@ -617,7 +620,9 @@ type
procedure UpdateActive; override; procedure UpdateActive; override;
procedure UpdateData; override; procedure UpdateData; override;
procedure MoveSelection; override; procedure MoveSelection; override;
{$IFDEF RX_USE_LCL_DEVEL}
function GetBufferCount: integer; override; function GetBufferCount: integer; override;
{$ENDIF}
procedure CMHintShow(var Message: TLMessage); message CM_HINTSHOW; procedure CMHintShow(var Message: TLMessage); message CM_HINTSHOW;
procedure FFilterListEditorOnChange(Sender: TObject); procedure FFilterListEditorOnChange(Sender: TObject);
procedure FFilterListEditorOnCloseUp(Sender: TObject); procedure FFilterListEditorOnCloseUp(Sender: TObject);
@ -3623,6 +3628,7 @@ begin
// UpdateRowsHeight; // UpdateRowsHeight;
end; end;
{$IFDEF RX_USE_LCL_DEVEL}
function TRxDBGrid.GetBufferCount: integer; function TRxDBGrid.GetBufferCount: integer;
var var
H:integer; H:integer;
@ -3641,6 +3647,7 @@ begin
if FFooterOptions.Active then if FFooterOptions.Active then
Dec(Result, FFooterOptions.RowCount); Dec(Result, FFooterOptions.RowCount);
end; end;
{$ENDIF}
procedure TRxDBGrid.CMHintShow(var Message: TLMessage); procedure TRxDBGrid.CMHintShow(var Message: TLMessage);
var var

View File

@ -1520,9 +1520,11 @@ begin
end; end;
FLocateObject.DataSet := DataSet; FLocateObject.DataSet := DataSet;
if not (csDestroying in ComponentState) then
if FListActive and Assigned(FDataField) then UpdateKeyValue begin
else KeyValueChanged; if FListActive and Assigned(FDataField) then UpdateKeyValue
else KeyValueChanged;
end;
end; end;
procedure TRxCustomDBLookupCombo.SetValue(const Value: string); procedure TRxCustomDBLookupCombo.SetValue(const Value: string);