don't make the dialog 3 times as wide as the length of the label string, this is excessive (bug 1824673)

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@49601 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2007-11-02 16:11:08 +00:00
parent cdfc78b892
commit 6f457a7735

View File

@@ -176,7 +176,7 @@ wxProgressDialog::wxProgressDialog(wxString const &title,
m_display_estimated = m_last_timeupdate = m_break = 0; m_display_estimated = m_last_timeupdate = m_break = 0;
m_ctdelay = 0; m_ctdelay = 0;
// if we are going to have at least one label, remmeber it in this var // if we are going to have at least one label, remember it in this var
wxStaticText *label = NULL; wxStaticText *label = NULL;
// also count how many labels we really have // also count how many labels we really have
@@ -261,9 +261,7 @@ wxProgressDialog::wxProgressDialog(wxString const &title,
sizeDlg.y += 2*LAYOUT_MARGIN; sizeDlg.y += 2*LAYOUT_MARGIN;
// try to make the dialog not square but rectangular of reasonable width // try to make the dialog not square but rectangular of reasonable width
sizeDlg.x = (wxCoord)wxMax(widthText*2, 4*sizeDlg.y/3); sizeDlg.x = (wxCoord)wxMax(3*widthText/2, 4*sizeDlg.y/3);
sizeDlg.x *= 3;
sizeDlg.x /= 2;
SetClientSize(sizeDlg); SetClientSize(sizeDlg);
} }