removed separate wxSYS_ICONTITLE_FONT; made it the same as wxSYS_DEFAULT_GUI_FONT

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

diff --git a/include/wx/generic/progdlgg.h b/include/wx/generic/progdlgg.h
index e88b639386773f026f38b46048bece5d233ae1f2..9fc06a25bf965611da3c9fe90a7fca09a3acf1e6 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(NO_GCC_PRAGMA)

 #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);


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