RxDBGrid - fix column width in columns dialog

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

components/rx/trunk/rxdbgrid.pas

@@ -791,6 +791,9 @@ type
     property DataSource;
     property DefaultDrawing;
     property DefaultRowHeight; // stored IsDefaultRowHeightStored;
+
+    property DefaultColWidth;
+
     property DragCursor;
     property DragKind;
     property DragMode;

components/rx/trunk/rxdbgrid_columsunit.lfm

@@ -126,7 +126,7 @@ object rxDBGridColumsForm: TrxDBGridColumsForm
     end
     object btnApply: TBitBtn
       AnchorSideBottom.Side = asrBottom
-      Left = 150
+      Left = -63
       Height = 30
       Top = 0
       Width = 71
@@ -151,19 +151,15 @@ object rxDBGridColumsForm: TrxDBGridColumsForm
     Columns = <    
       item
         ButtonStyle = cbsCheckboxColumn
-        ReadOnly = False
         SizePriority = 0
         Title.Alignment = taCenter
         Title.Caption = '...'
-        Title.MultiLine = False
         Width = 30
       end    
       item
-        Alignment = taLeftJustify
         ButtonStyle = cbsNone
         ReadOnly = True
         Title.Caption = 'Caption'
-        Title.MultiLine = False
         Width = 377
       end    
       item
@@ -171,7 +167,6 @@ object rxDBGridColumsForm: TrxDBGridColumsForm
         SizePriority = 0
         Title.Alignment = taCenter
         Title.Caption = 'Width'
-        Title.MultiLine = False
         Width = 60
       end>
     FixedCols = 0

components/rx/trunk/rxdbgrid_columsunit.pas

@@ -179,7 +179,10 @@ begin
     begin
       StringGrid1.Cells[0, i+1]:=BoolToStr(AGrid.Columns[i].Visible, '1', '0');
       StringGrid1.Cells[1, i+1]:=AGrid.Columns[i].Title.Caption;
-      StringGrid1.Cells[2, i+1]:=IntToStr(AGrid.Columns[i].Width);
+      if AGrid.Columns[i].Width = 0 then
+        StringGrid1.Cells[2, i+1]:=IntToStr(AGrid.DefaultColWidth)
+      else
+        StringGrid1.Cells[2, i+1]:=IntToStr(AGrid.Columns[i].Width);
     end;
   end
   else