don't use wxVector<wxDataFormat> from wx/clipbrd.h as wxDataFormat definition is...

[wxWidgets.git] / src / palmos / progdlg.cpp

diff --git a/src/palmos/progdlg.cpp b/src/palmos/progdlg.cpp
index f7be8c1df58784189279444d63d64b42e858d068..4b57a09fc04da98ed21ace873db8077a0c912944 100644 (file)
--- a/src/palmos/progdlg.cpp
+++ b/src/palmos/progdlg.cpp
@@ -9,25 +9,21 @@
 // License:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma implementation "progdlg.h"
-#endif
-
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
-#pragma hdrstop
+    #pragma hdrstop
 #endif
 
-#ifndef WX_PRECOMP
-    #include  "wx/string.h"
-#endif //WX_PRECOMP
-
 #if wxUSE_PROGRESSDLG
 
 #include "wx/progdlg.h"
-#include "wx/msgdlg.h"
+
+#ifndef WX_PRECOMP
+    #include  "wx/string.h"
+    #include "wx/msgdlg.h"
+#endif //WX_PRECOMP
 
 #include <Progress.h>
 #include <SysEvtMgr.h>
@@ -115,7 +111,9 @@ Boolean wxProgressDialog::Callback(void *data)
     PrgCallbackData *palmData = (PrgCallbackData *)data;
     strncpy( palmData->textP, m_msg.ToAscii() , palmData->textLen - 1 );
     palmData->textChanged = true;
+#ifdef __WXPALMOS6__
     palmData->displaySkipBtn = m_canSkip;
+#endif // __WXPALMOS6__
     palmData->barMaxValue = (uint32_t)m_max;
     palmData->barCurValue = (uint32_t)m_cur;
     palmData->delay = (m_max == m_cur);