added and documented wxDYNLIB_FUNCTION

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

diff --git a/include/wx/generic/progdlgg.h b/include/wx/generic/progdlgg.h
index 4ea81319df4dbb4e8cd34333626bec95788c6916..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
 


@@ -63,6 +63,8 @@ public:
    */
    void Resume();
 
    */
    void Resume();
 

+   bool Show( bool show = TRUE );
+

 protected:
    // callback for optional abort button
    void OnCancel(wxCommandEvent& event);
 protected:
    // callback for optional abort button
    void OnCancel(wxCommandEvent& event);


@@ -109,7 +111,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;


@@ -122,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