moved some more stuff from .cpp files to here

[wxWidgets.git] / include / wx / generic / progdlgg.h

diff --git a/include/wx/generic/progdlgg.h b/include/wx/generic/progdlgg.h
index 11437238a0014d5162ced12a9dd5885d68169f39..125e2d2d38eb50917288000dfac6f85944bc6b99 100644 (file)
--- 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
 // Created:     09.05.1999
 // RCS-ID:      $Id$
 // Copyright:   (c) Karsten Ballüder

-// Licence:     wxWindows license
+// Licence:     wxWindows licence

 ////////////////////////////////////////////////////
 
 #ifndef __PROGDLGH_G__
 #define __PROGDLGH_G__
 
 ////////////////////////////////////////////////////
 
 #ifndef __PROGDLGH_G__
 #define __PROGDLGH_G__
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)

 #pragma interface "progdlgg.h"
 #endif
 
 #pragma interface "progdlgg.h"
 #endif
 


@@ -61,7 +61,9 @@ public:
        the program decided to continue the operation (e.g., user didn't
        confirm it)
    */
        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
 
 protected:
    // callback for optional abort button


@@ -70,9 +72,6 @@ protected:
    // callback to disable "hard" window closing
    void OnClose(wxCloseEvent& event);
 
    // callback to disable "hard" window closing
    void OnClose(wxCloseEvent& event);
 

-   // callback to detect when the dialog is closed
-   void OnShow(wxShowEvent& event);
-

    // must be called to reenable the other windows temporarily disabled while
    // the dialog was shown
    void ReenableOtherWindows();
    // must be called to reenable the other windows temporarily disabled while
    // the dialog was shown
    void ReenableOtherWindows();


@@ -112,6 +111,12 @@ private:
    // the maximum value
    int m_maximum;
 
    // the maximum value
    int m_maximum;
 

+#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;
+#endif // __WXMSW__
+

    // for wxPD_APP_MODAL case
    class WXDLLEXPORT wxWindowDisabler *m_winDisabler;
 
    // for wxPD_APP_MODAL case
    class WXDLLEXPORT wxWindowDisabler *m_winDisabler;
 


@@ -119,6 +124,8 @@ private:
 private:
     // Virtual function hiding supression
     virtual void Update() { wxDialog::Update(); }
 private:
     // Virtual function hiding supression
     virtual void Update() { wxDialog::Update(); }

+
+    DECLARE_NO_COPY_CLASS(wxProgressDialog)

 };
 #endif
 
 };
 #endif