Fix compilation under dll builds. Wrap source files in wxUSE_WEB checks to allow...

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

diff --git a/include/wx/palmos/progdlg.h b/include/wx/palmos/progdlg.h
index 8381b44bcff71a2831d40de7123f79058c3d98f9..711be7350cfda581738558a84bf8b970f556d04c 100644 (file)
--- a/include/wx/palmos/progdlg.h
+++ b/include/wx/palmos/progdlg.h
@@ -6,23 +6,19 @@
 // Created:     29.12.2004
 // RCS-ID:      $Id$
 // Copyright:   (c) Wlodzimierz Skiba
 // Created:     29.12.2004
 // RCS-ID:      $Id$
 // Copyright:   (c) Wlodzimierz Skiba

-// License:     wxWindows licence
+// Licence:     wxWindows licence

 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef _PREFCONF_H_
 #define _PREFCONF_H_
 
 ///////////////////////////////////////////////////////////////////////////////
 
 #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"
 
 #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:
 {
 DECLARE_DYNAMIC_CLASS(wxProgressDialog)
 public:


@@ -31,27 +27,30 @@ public:
                      int maximum = 100,
                      wxWindow *parent = NULL,
                      int style = wxPD_APP_MODAL | wxPD_AUTO_HIDE);
                      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 );
 
 
     virtual bool Update(int value, const wxString& newmsg = wxEmptyString, bool *skip = NULL);
     void Resume();
     virtual bool Show( bool show = true );
 

-    wxString GetMessage(){return m_msg;}
-    void SetMessage(wxString const &message){m_msg = message;}
+    Boolean Callback(/*PrgCallbackData */ void *data);
+
+    int GetValue() const { return m_cur; }
+    int GetRange() const { return m_max; }
+    wxString GetMessage() const { return m_msg; }

 
 

-    int GetMaxValue(){return m_max;}
-    int GetCurValue(){return m_cur;}

 private:
 
 private:
 

-    ProgressType *m_prgFrame;
+    /*ProgressType*/ void *m_prgFrame;

     wxString m_msg;
     int m_max,m_cur;
     wxString m_msg;
     int m_max,m_cur;

+    bool m_canSkip;
+    bool m_activeSkip;

 
     // Virtual function hiding supression
     virtual void Update() { wxDialog::Update(); }
 
 
     // Virtual function hiding supression
     virtual void Update() { wxDialog::Update(); }
 

-    DECLARE_NO_COPY_CLASS(wxProgressDialog)
+    wxDECLARE_NO_COPY_CLASS(wxProgressDialog);

 };
 
 #endif // wxUSE_PROGRESSDLG
 };
 
 #endif // wxUSE_PROGRESSDLG