Remove selection methods taking int from generic wxDataViewCtrl.

[wxWidgets.git] / include / wx / progdlg.h

diff --git a/include/wx/progdlg.h b/include/wx/progdlg.h
index 38e3b0d18d0c7a90356817ad87152377e13800f6..25716b0780e269e054ba076cd807714b9d99a1de 100644 (file)
--- a/include/wx/progdlg.h
+++ b/include/wx/progdlg.h
@@ -1,7 +1,60 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        wx/progdlg.h
+// Purpose:     Base header for wxProgressDialog
+// Author:      Julian Smart
+// Modified by:
+// Created:
+// RCS-ID:      $Id$
+// Copyright:   (c) Julian Smart
+// Licence:     wxWindows Licence
+/////////////////////////////////////////////////////////////////////////////
+

 #ifndef _WX_PROGDLG_H_BASE_
 #define _WX_PROGDLG_H_BASE_
 
 #ifndef _WX_PROGDLG_H_BASE_
 #define _WX_PROGDLG_H_BASE_
 

-#include "wx/generic/progdlgg.h"
+#include "wx/defs.h"
+
+#if wxUSE_PROGRESSDLG
+
+/*
+ * wxProgressDialog flags
+ */
+#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_SMOOTH             0x0020
+#define wxPD_REMAINING_TIME     0x0040
+#define wxPD_CAN_SKIP           0x0080
+
+
+#ifdef __WXPALMOS__
+    #include "wx/palmos/progdlg.h"
+#else
+    #include "wx/generic/progdlgg.h"
+
+    #if defined(__WXMSW__) && wxUSE_THREADS && !defined(__WXUNIVERSAL__)
+        #include "wx/msw/progdlg.h"
+    #else
+        class WXDLLIMPEXP_CORE wxProgressDialog
+                               : public wxGenericProgressDialog
+        {
+        public:
+            wxProgressDialog( const wxString& title, const wxString& message,
+                              int maximum = 100,
+                              wxWindow *parent = NULL,
+                              int style = wxPD_APP_MODAL | wxPD_AUTO_HIDE )
+                : wxGenericProgressDialog( title, message, maximum,
+                                           parent, style )
+                { }
+
+        private:
+            wxDECLARE_DYNAMIC_CLASS_NO_COPY( wxProgressDialog );
+        };
+    #endif // defined(__WXMSW__) && wxUSE_THREADS
+#endif // __WXPALMOS__
+
+#endif // wxUSE_PROGRESSDLG

 
 

-#endif
-    // _WX_PROGDLG_H_BASE_
+#endif // _WX_PROGDLG_H_BASE_