Applied patch [ 597398 ] Generic MDI, wxNotebook based.

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

diff --git a/include/wx/generic/progdlgg.h b/include/wx/generic/progdlgg.h
index 57bcf51d4a2e0af31dfe1a5d0ef1ec102c572de1..e88b639386773f026f38b46048bece5d233ae1f2 100644 (file)
--- a/include/wx/generic/progdlgg.h
+++ b/include/wx/generic/progdlgg.h
@@ -61,7 +61,7 @@ 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();

 
 protected:
    // callback for optional abort button
 
 protected:
    // callback for optional abort button


@@ -109,7 +109,7 @@ private:
    // the maximum value
    int m_maximum;
 
    // 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;
    // 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;