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

*** empty log message ***

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@2902 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
1999-06-26 10:12:18 +00:00
parent 720dcba648
commit 00cd8a958f
3 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
docs/latex/wx/progdlg.tex
View File

@@ -57,6 +57,9 @@ window only.
\twocolitem{wxPD\_CAN\_ABORT}{This flag tells the dialog that it should have a \twocolitem{wxPD\_CAN\_ABORT}{This flag tells the dialog that it should have a
"Cancel" button which the user may press. If this happens, the next call to "Cancel" button which the user may press. If this happens, the next call to
\helpref{Update()}{wxprogressdialogupdate} will return FALSE.} \helpref{Update()}{wxprogressdialogupdate} will return FALSE.}
\twocolitem{wxPD\_ELAPSED\_TIME}{This flag tells the dialog that it should show elapsed time (since creating the dialog).}
\twocolitem{wxPD\_ESTIMATED\_TIME}{This flag tells the dialog that it should show estimated time.}
\twocolitem{wxPD\_REMAINING\_TIME}{This flag tells the dialog that it should show remaining time.}
\end{twocollist}% \end{twocollist}%
} }

11
include/wx/defs.h
View File

@@ -411,18 +411,10 @@ typedef int unsigned wxUint32;
#if !defined(__WXMSW__) && !defined(__WXMAC__) && !defined(__WXOS2__) #if !defined(__WXMSW__) && !defined(__WXMAC__) && !defined(__WXOS2__)
#if defined(SIZEOF_INT) #if defined(SIZEOF_INT)
#if (SIZEOF_SHORT == 2)
typedef short signed wxInt16; typedef short signed wxInt16;
typedef short unsigned wxUint16; typedef short unsigned wxUint16;
#else
#error "FIXME"
#endif
#if (SIZEOF_INT == 4)
typedef int signed wxInt32; typedef int signed wxInt32;
typedef int unsigned wxUint32; typedef int unsigned wxUint32;
#else
#error "FIXME"
#endif
#else #else
typedef short signed wxInt16; typedef short signed wxInt16;
typedef short unsigned wxUint16; typedef short unsigned wxUint16;
@@ -822,6 +814,9 @@ enum wxOrientation
#define wxPD_CAN_ABORT 0x0001 #define wxPD_CAN_ABORT 0x0001
#define wxPD_APP_MODAL 0x0002 #define wxPD_APP_MODAL 0x0002
#define wxPD_AUTO_HIDE 0x0004 #define wxPD_AUTO_HIDE 0x0004
#define wxPD_ELAPSED_TIME 0x0008
#define wxPD_ESTIMATED_TIME 0x0010
#define wxPD_REMAINING_TIME 0x0020
/* /*
* GDI descriptions * GDI descriptions

5
include/wx/generic/progdlgg.h
View File

@@ -21,6 +21,7 @@
#if wxUSE_PROGRESSDLG #if wxUSE_PROGRESSDLG
#include "wx/frame.h" #include "wx/frame.h"
#include "wx/time.h"
/** Progress dialog which shows a moving progress bar. /** Progress dialog which shows a moving progress bar.
Taken from the Mahogany project.*/ Taken from the Mahogany project.*/
@@ -72,6 +73,10 @@ private:
class wxStaticText *m_msg; class wxStaticText *m_msg;
/// disable all or parent window only /// disable all or parent window only
bool m_disableParentOnly; bool m_disableParentOnly;
/// displayed elapsed, estimated, remaining time
class wxStaticText *m_elapsed, *m_estimated, *m_remaining;
/// time when the dialog was created or NULL
class wxTime *m_time;
/// parent window /// parent window
class wxWindow *m_parent; class wxWindow *m_parent;
/// continue processing or not (return value for Update()) /// continue processing or not (return value for Update())