diff --git a/ide/lazarusmanager.pas b/ide/lazarusmanager.pas index f056af61ca..d20f0dfe56 100644 --- a/ide/lazarusmanager.pas +++ b/ide/lazarusmanager.pas @@ -193,9 +193,12 @@ var BackupFileName: String; begin Result := mrOK; + { There are several cases: + 1. user has not yet created a custom IDE + 2. user has created a custom IDE (~/.lazarus/bin/) - + } NewFileName := GetLazarusPath('lazarus.new'); FLazarusPath := GetLazarusPath('lazarus'); BackupFileName := GetLazarusPath('lazarus.old'); diff --git a/lcl/interfaces/gtk/gtklclintf.inc b/lcl/interfaces/gtk/gtklclintf.inc index 0c5a351085..9fc6a8c0f7 100644 --- a/lcl/interfaces/gtk/gtklclintf.inc +++ b/lcl/interfaces/gtk/gtklclintf.inc @@ -564,8 +564,8 @@ var begin Result:=true; if Constraints is TSizeConstraints then begin - MinWidth := 1; - MinHeight := 1; + MinWidth:=1; + MinHeight:=1; MaxWidth:=0; MaxHeight:=0; SizeConstraints:=TSizeConstraints(Constraints); @@ -577,14 +577,13 @@ begin if TScrollBar(SizeConstraints.Control).Kind=sbHorizontal then begin Widget:=GetStyleWidget(lgsHorizontalScrollbar); MinHeight:=Widget^.requisition.Height; + MaxHeight:=MinHeight; end else begin Widget:=GetStyleWidget(lgsVerticalScrollbar); MinWidth:=Widget^.requisition.Width; + MaxWidth:=MinWidth; end; //DebugLn('TGtkWidgetSet.GetControlConstraints A '+dbgs(MinWidth)+','+dbgs(MinHeight),' ',dbgs(TScrollBar(SizeConstraints.Control).Kind=sbHorizontal),' ',TScrollBar(SizeConstraints.Control).Name); - SizeConstraints.SetInterfaceConstraints(MinWidth,MinHeight, - MinWidth,MinHeight); - exit; end else if SizeConstraints.Control is TCustomSplitter then begin // TCustomSplitter @@ -592,13 +591,12 @@ begin begin Widget:=GetStyleWidget(lgsHorizontalPaned); MinHeight:=Widget^.requisition.Height; + MaxHeight:=MinHeight; end else begin Widget:=GetStyleWidget(lgsVerticalPaned); MinWidth:=Widget^.requisition.Width; + MaxWidth:=MinWidth; end; - SizeConstraints.SetInterfaceConstraints(MinWidth,MinHeight, - MinWidth,MinHeight); - exit; end else if SizeConstraints.Control is TCustomMemo then begin // TCustomMemo