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

the progres dialog now looks decently under Windows

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@2890 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
1999-06-24 22:07:04 +00:00
parent d1d7cdff87
commit f81a662057
1 changed files with 30 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
src/generic/progdlgg.cpp
View File

@@ -6,7 +6,7 @@
// Created: 09.05.1999 // Created: 09.05.1999
// RCS-ID: $Id$ // RCS-ID: $Id$
// Copyright: (c) Karsten Ball<6C>der // Copyright: (c) Karsten Ball<6C>der
// Licence: wxWindows license // Licence: wxWindows license
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
#ifdef __GNUG__ #ifdef __GNUG__
@@ -17,18 +17,19 @@
#include "wx/wxprec.h" #include "wx/wxprec.h"
#ifdef __BORLANDC__ #ifdef __BORLANDC__
#pragma hdrstop #pragma hdrstop
#endif #endif
#ifndef WX_PRECOMP #ifndef WX_PRECOMP
#include "wx/utils.h" #include "wx/utils.h"
#include "wx/frame.h" #include "wx/frame.h"
#include "wx/button.h" #include "wx/button.h"
#include "wx/stattext.h" #include "wx/stattext.h"
#include "wx/layout.h" #include "wx/layout.h"
#include "wx/event.h" #include "wx/event.h"
#include "wx/gauge.h" #include "wx/gauge.h"
#include "wx/intl.h" #include "wx/intl.h"
#include "wx/settings.h"
#endif #endif
#if wxUSE_PROGRESSDLG #if wxUSE_PROGRESSDLG
@@ -60,13 +61,9 @@ wxProgressDialog::wxProgressDialog(wxString const &title,
m_disableParentOnly = (style & wxPD_APP_MODAL) == 0; m_disableParentOnly = (style & wxPD_APP_MODAL) == 0;
m_parent = parent; m_parent = parent;
m_maximum = maximum; m_maximum = maximum;
int height = 70; // FIXME arbitrary numbers wxFrame::Create(m_parent, -1, title);
if ( hasAbortButton ) SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DFACE));
height += 35;
wxFrame::Create(m_parent, -1, title,
wxPoint(0, 0), wxSize(220, height),
wxDEFAULT_DIALOG_STYLE | style );
wxLayoutConstraints *c; wxLayoutConstraints *c;
@@ -80,7 +77,9 @@ wxProgressDialog::wxProgressDialog(wxString const &title,
if ( maximum > 0 ) if ( maximum > 0 )
{ {
m_gauge = new wxGauge(this, -1, maximum); m_gauge = new wxGauge(this, -1, maximum,
wxDefaultPosition, wxDefaultSize,
wxGA_HORIZONTAL | wxRAISED_BORDER);
c = new wxLayoutConstraints; c = new wxLayoutConstraints;
c->left.SameAs(this, wxLeft, 2*LAYOUT_X_MARGIN); c->left.SameAs(this, wxLeft, 2*LAYOUT_X_MARGIN);
c->top.Below(m_msg, 2*LAYOUT_Y_MARGIN); c->top.Below(m_msg, 2*LAYOUT_Y_MARGIN);
@@ -91,7 +90,7 @@ wxProgressDialog::wxProgressDialog(wxString const &title,
} }
else else
m_gauge = (wxGauge *)NULL; m_gauge = (wxGauge *)NULL;
if ( hasAbortButton ) if ( hasAbortButton )
{ {
m_btnAbort = new wxButton(this, -1, _("Cancel")); m_btnAbort = new wxButton(this, -1, _("Cancel"));
@@ -106,9 +105,17 @@ wxProgressDialog::wxProgressDialog(wxString const &title,
m_btnAbort->SetConstraints(c); m_btnAbort->SetConstraints(c);
} }
else else
m_btnAbort = (wxButton *)NULL; m_btnAbort = (wxButton *)NULL;
SetAutoLayout(TRUE); SetAutoLayout(TRUE);
Layout();
// calc the height of the dialog
Fit();
// and set the width from it
wxSize size = GetClientSize();
SetClientSize(2*size.y, size.y);
Show(TRUE); Show(TRUE);
Centre(wxCENTER_FRAME | wxBOTH); Centre(wxCENTER_FRAME | wxBOTH);
@@ -116,6 +123,7 @@ wxProgressDialog::wxProgressDialog(wxString const &title,
m_parent->Enable(FALSE); m_parent->Enable(FALSE);
else else
wxEnableTopLevelWindows(FALSE); wxEnableTopLevelWindows(FALSE);
Enable(TRUE); // enable this window Enable(TRUE); // enable this window
wxYield(); wxYield();
} }
@@ -130,7 +138,7 @@ wxProgressDialog::Update(int value, const wxString& newmsg)
if( m_gauge ) if( m_gauge )
m_gauge->SetValue(value + 1); m_gauge->SetValue(value + 1);
if( !newmsg.IsEmpty() ) if( !newmsg.IsEmpty() )
m_msg->SetLabel(newmsg); m_msg->SetLabel(newmsg);
@@ -149,7 +157,7 @@ wxProgressDialog::Update(int value, const wxString& newmsg)
} }
m_state = Finished; m_state = Finished;
// so that we return TRUE below // so that we return TRUE below
m_state = Finished; m_state = Finished;
} }