streamlining code

[wxWidgets.git] / include / wx / palmos / progdlg.h

diff --git a/include/wx/palmos/progdlg.h b/include/wx/palmos/progdlg.h
index 0000d901ee3a5fcecfcb679305ec1afd5cd9eedf..d3f4c0ca147e1d620def7c50b0c8c0ea5805721a 100644 (file)
--- a/include/wx/palmos/progdlg.h
+++ b/include/wx/palmos/progdlg.h
@@ -2,7 +2,7 @@
 // Name:        wx/palmos/progdlg.h
 // Purpose:     wxProgressDialog interface
 // Author:      Wlodzimierz ABX Skiba
-// Modified by: 
+// Modified by:
 // Created:     29.12.2004
 // RCS-ID:      $Id$
 // Copyright:   (c) Wlodzimierz Skiba
@@ -12,17 +12,13 @@
 #ifndef _PREFCONF_H_
 #define _PREFCONF_H_
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma interface "progdlg.h"
-#endif
-
 #include "wx/defs.h"
 
 #if wxUSE_PROGRESSDLG
 
 #include "wx/dialog.h"
 
-class WXDLLEXPORT wxProgressDialog : public wxDialog
+class WXDLLIMPEXP_CORE wxProgressDialog : public wxDialog
 {
 DECLARE_DYNAMIC_CLASS(wxProgressDialog)
 public:
@@ -31,17 +27,21 @@ public:
                      int maximum = 100,
                      wxWindow *parent = NULL,
                      int style = wxPD_APP_MODAL | wxPD_AUTO_HIDE);
-    ~wxProgressDialog();
+    virtual ~wxProgressDialog();
 
     virtual bool Update(int value, const wxString& newmsg = wxEmptyString, bool *skip = NULL);
     void Resume();
     virtual bool Show( bool show = true );
 
-    Boolean Callback(PrgCallbackData *data);
+    Boolean Callback(/*PrgCallbackData */ void *data);
+
+    int GetValue() const { return m_cur; }
+    int GetRange() const { return m_max; }
+    wxString GetMessage() const { return m_msg; }
 
 private:
 
-    ProgressType *m_prgFrame;
+    /*ProgressType*/ void *m_prgFrame;
     wxString m_msg;
     int m_max,m_cur;
     bool m_canSkip;
@@ -50,7 +50,7 @@ private:
     // Virtual function hiding supression
     virtual void Update() { wxDialog::Update(); }
 
-    DECLARE_NO_COPY_CLASS(wxProgressDialog)
+    wxDECLARE_NO_COPY_CLASS(wxProgressDialog);
 };
 
 #endif // wxUSE_PROGRESSDLG