*** empty log message ***

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@2902 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/docs/latex/wx/progdlg.tex b/docs/latex/wx/progdlg.tex
index bf9d6c87a3c9a8e1661a8764cb4e6f506f567b4a..2ec695b0503db7176429fea398a6587f8a1b9807 100644 (file)
--- a/docs/latex/wx/progdlg.tex
+++ b/docs/latex/wx/progdlg.tex
@@ -57,6 +57,9 @@ window only.
 \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 
     \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}%
 }
 

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

diff --git a/include/wx/generic/progdlgg.h b/include/wx/generic/progdlgg.h
index 8d8c7e544bfe7cd3c0b2ce765737e6da21c31537..0940e052b6cfde6fbf51f0878bbc79be3f8d20b5 100644 (file)
--- a/include/wx/generic/progdlgg.h
+++ b/include/wx/generic/progdlgg.h
@@ -21,6 +21,7 @@
 #if wxUSE_PROGRESSDLG
 
 #include "wx/frame.h"
+#include "wx/time.h"
 
 /** Progress dialog which shows a moving progress bar.
     Taken from the Mahogany project.*/
@@ -72,6 +73,10 @@ private:
    class wxStaticText *m_msg;
    /// disable all or parent window only
    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
    class wxWindow *m_parent;
    /// continue processing or not (return value for Update())