Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixes for the dialog layout for the multiline labels

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@12484 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2001-11-19 14:00:10 +00:00
parent e652fdd527
commit 8d6854a63a
1 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/generic/progdlgg.cpp
View File

@@ -128,7 +128,8 @@ wxProgressDialog::wxProgressDialog(wxString const &title,
c->height.AsIs(); c->height.AsIs();
m_msg->SetConstraints(c); m_msg->SetConstraints(c);
wxSize sizeDlg, sizeLabel = m_msg->GetSize(); wxSize sizeDlg,
sizeLabel = m_msg->GetSize();
sizeDlg.y = 2*LAYOUT_Y_MARGIN + sizeLabel.y; sizeDlg.y = 2*LAYOUT_Y_MARGIN + sizeLabel.y;
wxWindow *lastWindow = m_msg; wxWindow *lastWindow = m_msg;
@@ -160,11 +161,17 @@ wxProgressDialog::wxProgressDialog(wxString const &title,
// create the estimated/remaining/total time zones if requested // create the estimated/remaining/total time zones if requested
m_elapsed = m_estimated = m_remaining = (wxStaticText*)NULL; m_elapsed = m_estimated = m_remaining = (wxStaticText*)NULL;
int nTimeLabels = 0; // if we are going to have at least one label, remmeber it in this var
wxStaticText *label = NULL;
// also count how many labels we really have
size_t nTimeLabels = 0;
if ( style & wxPD_ELAPSED_TIME ) if ( style & wxPD_ELAPSED_TIME )
{ {
nTimeLabels++; nTimeLabels++;
label =
m_elapsed = CreateLabel(_("Elapsed time : "), &lastWindow); m_elapsed = CreateLabel(_("Elapsed time : "), &lastWindow);
} }
@@ -172,6 +179,7 @@ wxProgressDialog::wxProgressDialog(wxString const &title,
{ {
nTimeLabels++; nTimeLabels++;
label =
m_estimated = CreateLabel(_("Estimated time : "), &lastWindow); m_estimated = CreateLabel(_("Estimated time : "), &lastWindow);
} }
@@ -179,6 +187,7 @@ wxProgressDialog::wxProgressDialog(wxString const &title,
{ {
nTimeLabels++; nTimeLabels++;
label =
m_remaining = CreateLabel(_("Remaining time : "), &lastWindow); m_remaining = CreateLabel(_("Remaining time : "), &lastWindow);
} }
@@ -186,7 +195,7 @@ wxProgressDialog::wxProgressDialog(wxString const &title,
{ {
// set it to the current time // set it to the current time
m_timeStart = wxGetCurrentTime(); m_timeStart = wxGetCurrentTime();
sizeDlg.y += nTimeLabels * (sizeLabel.y + LAYOUT_Y_MARGIN); sizeDlg.y += nTimeLabels * (label->GetSize().y + LAYOUT_Y_MARGIN);
} }
if ( hasAbortButton ) if ( hasAbortButton )