return const wxString& from wxFontMapper::GetDefaultConfigPath()

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

diff --git a/include/wx/palmos/progdlg.h b/include/wx/palmos/progdlg.h
index 0000d901ee3a5fcecfcb679305ec1afd5cd9eedf..fa897d81f3a21c7cb261876243a88cb059d33466 100644 (file)
--- a/include/wx/palmos/progdlg.h
+++ b/include/wx/palmos/progdlg.h
@@ -12,10 +12,6 @@
 #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
@@ -31,17 +27,17 @@ 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);
 
 private:
 
-    ProgressType *m_prgFrame;
+    /*ProgressType*/ void *m_prgFrame;
     wxString m_msg;
     int m_max,m_cur;
     bool m_canSkip;