1. corrected problem with label updating in wxProgressDialog
2. optical fix in wxTipDlg: use wxTE_RICH control to avoid vert scrollbar 3. put wxProgressDialog demo into dialogs sample, seems more appropriate 4. fixed a serious bug in wxProgressDialog when its parent was not a top level window (as in controls sample) 5. fixes in BringWindowToTop() usage in msw/dialog.cpp 6. fixed another serious bug in wxProgressDialog::OnClose() 7. wxDialog restores focus to previously focused window once again 8. attempts at fixing wxBusyCursor with modal dialogs problem - unsuccessful git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@6273 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -23,6 +23,7 @@
|
||||
#include "wx/dialog.h"
|
||||
|
||||
class WXDLLEXPORT wxButton;
|
||||
class WXDLLEXPORT wxGauge;
|
||||
class WXDLLEXPORT wxStaticText;
|
||||
|
||||
/* Progress dialog which shows a moving progress bar.
|
||||
@@ -75,21 +76,19 @@ private:
|
||||
wxStaticText *CreateLabel(const wxString& text, wxWindow **lastWindow);
|
||||
|
||||
// the status bar
|
||||
class wxGauge *m_gauge;
|
||||
wxGauge *m_gauge;
|
||||
// the message displayed
|
||||
class wxStaticText *m_msg;
|
||||
// disable all or parent window only
|
||||
bool m_disableParentOnly;
|
||||
// auto-hide?
|
||||
bool m_AutoHide;
|
||||
wxStaticText *m_msg;
|
||||
// displayed elapsed, estimated, remaining time
|
||||
class wxStaticText *m_elapsed,
|
||||
*m_estimated,
|
||||
*m_remaining;
|
||||
// time when the dialog was created
|
||||
unsigned long m_timeStart;
|
||||
// parent window
|
||||
wxWindow *m_parent;
|
||||
|
||||
// parent top level window (may be NULL)
|
||||
wxWindow *m_parentTop;
|
||||
|
||||
// continue processing or not (return value for Update())
|
||||
enum
|
||||
{
|
||||
|
Reference in New Issue
Block a user