X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/7086987f11055d44165f0c448209df80bdc5bc11..31eefb998d894e3b566e13714fa53186101829a1:/include/wx/generic/progdlgg.h diff --git a/include/wx/generic/progdlgg.h b/include/wx/generic/progdlgg.h index 57bcf51d4a..125e2d2d38 100644 --- a/include/wx/generic/progdlgg.h +++ b/include/wx/generic/progdlgg.h @@ -6,13 +6,13 @@ // Created: 09.05.1999 // RCS-ID: $Id$ // Copyright: (c) Karsten Ballüder -// Licence: wxWindows license +// Licence: wxWindows licence //////////////////////////////////////////////////// #ifndef __PROGDLGH_G__ #define __PROGDLGH_G__ -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(__APPLE__) #pragma interface "progdlgg.h" #endif @@ -61,7 +61,9 @@ public: the program decided to continue the operation (e.g., user didn't confirm it) */ - void Resume() { m_state = Continue; } + void Resume(); + + bool Show( bool show = TRUE ); protected: // callback for optional abort button @@ -109,7 +111,7 @@ private: // the maximum value int m_maximum; -#ifdef __WXMSW__ +#if defined(__WXMSW__ ) || defined(__WXPM__) // the factor we use to always keep the value in 16 bit range as the native // control only supports ranges from 0 to 65,535 size_t m_factor; @@ -122,6 +124,8 @@ private: private: // Virtual function hiding supression virtual void Update() { wxDialog::Update(); } + + DECLARE_NO_COPY_CLASS(wxProgressDialog) }; #endif