ButtonEdit: fix not being able to set Width when AutoSize = True

git-svn-id: trunk@44590 -
This commit is contained in:
bart 2014-04-03 09:18:50 +00:00
parent f78c905370
commit 6fe5df74c8

View File

@ -144,6 +144,10 @@ type
function GetDefaultGlyph: TBitmap; virtual;
function GetDefaultGlyphName: String; virtual;
function GetPopupMenu: TPopupMenu; override;
procedure CalculatePreferredSize(var PreferredWidth,
PreferredHeight: integer;
WithThemeSpace: Boolean); override;
procedure CheckButtonVisible;
procedure DoButtonClick(Sender: TObject); virtual;
@ -898,6 +902,13 @@ begin
Result := FEdit.PopupMenu;
end;
procedure TCustomButtonEdit.CalculatePreferredSize(var PreferredWidth,
PreferredHeight: integer; WithThemeSpace: Boolean);
begin
inherited CalculatePreferredSize(PreferredWidth, PreferredHeight, WithThemeSpace);
PreferredWidth := 0;
end;
function TCustomButtonEdit.GetReadOnly: Boolean;
begin
Result := FEdit.ReadOnly;
@ -1098,8 +1109,8 @@ end;
class function TCustomButtonEdit.GetControlClassDefaultSize: TSize;
begin
Result.CX := 100;
Result.CY := 23;
Result.CX := 80 + 23; //as TCustomEdit + TCustomSpeedButton
Result.CY := 23; //as TCustomEdit
end;
function TCustomButtonEdit.GetDefaultGlyph: TBitmap;