From e50a7fa3dc38e41fd6f7e1af39acb13d14e07cb0 Mon Sep 17 00:00:00 2001 From: alexs75 Date: Wed, 8 Jul 2009 15:44:33 +0000 Subject: [PATCH] fix error in RxDBLockupCombo git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@900 8e941d3f-bd1b-0410-a28a-d453659cc2b4 --- components/rx/rxdbgrid.pas | 17 +++++++++-------- components/rx/rxpopupunit.pas | 3 +++ 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/components/rx/rxdbgrid.pas b/components/rx/rxdbgrid.pas index 9e45f95d7..04780ef2f 100644 --- a/components/rx/rxdbgrid.pas +++ b/components/rx/rxdbgrid.pas @@ -357,7 +357,7 @@ type property AutoAdvance default aaRightDown; property AutoFillColumns; property AutoEdit; - //property BiDiMode; + property BiDiMode; property BorderSpacing; property BorderStyle; property Color; @@ -373,11 +373,12 @@ type property DataSource; property DefaultDrawing; property DefaultRowHeight stored IsDefaultRowHeightStored default 18 ; - //property DragCursor; - //property DragKind; - //property DragMode; + property DragCursor; + property DragKind; + property DragMode; property Enabled; property FixedColor; + property FixedCols; property Flat; property Font; property HeaderHotZones; @@ -386,11 +387,11 @@ type //property ImeName; property Options; property OptionsExtra; - //property ParentBiDiMode; + property ParentBiDiMode; property ParentColor; //property ParentCtl3D; property ParentFont; - //property ParentShowHint; + property ParentShowHint; property PopupMenu; property ReadOnly; property Scrollbars default ssBoth; @@ -410,7 +411,7 @@ type property OnDrawColumnCell; property OnDblClick; property OnEditButtonClick; - //property OnEndDock; + property OnEndDock; property OnEndDrag; property OnEnter; property OnExit; @@ -423,7 +424,7 @@ type property OnMouseUp; property OnPrepareCanvas; property OnSelectEditor; - //property OnStartDock; + property OnStartDock; property OnStartDrag; property OnTitleClick; property OnUserCheckboxBitmap; diff --git a/components/rx/rxpopupunit.pas b/components/rx/rxpopupunit.pas index 6217f460e..a584c3fe1 100644 --- a/components/rx/rxpopupunit.pas +++ b/components/rx/rxpopupunit.pas @@ -469,7 +469,10 @@ begin end; //Set options if not (pfgIndicator in FPopUpFormOptions.FOptions) then + begin FGrid.Options:=FGrid.Options - [dgIndicator]; + FGrid.FixedCols:=0; + end; if not (pfgColLines in FPopUpFormOptions.FOptions) then FGrid.Options:=FGrid.Options - [dgColLines];