Add some version checks to help compiling on OSX.

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

diff --git a/src/palmos/progdlg.cpp b/src/palmos/progdlg.cpp
index 0b4c467a4d27b32555d3c402e76b92636c9aaec5..db371b59179e96a4863619da8c4eaac29ab616ca 100644 (file)
--- a/src/palmos/progdlg.cpp
+++ b/src/palmos/progdlg.cpp
@@ -6,24 +6,24 @@
 // 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

 ///////////////////////////////////////////////////////////////////////////////
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
 ///////////////////////////////////////////////////////////////////////////////
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__

-#pragma hdrstop
+    #pragma hdrstop

 #endif
 
 #endif
 

-#ifndef WX_PRECOMP
-    #include  "wx/string.h"
-#endif //WX_PRECOMP
-

 #if wxUSE_PROGRESSDLG
 
 #include "wx/progdlg.h"
 #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>
 
 #include <Progress.h>
 #include <SysEvtMgr.h>


@@ -111,7 +111,9 @@ Boolean wxProgressDialog::Callback(void *data)
     PrgCallbackData *palmData = (PrgCallbackData *)data;
     strncpy( palmData->textP, m_msg.ToAscii() , palmData->textLen - 1 );
     palmData->textChanged = true;
     PrgCallbackData *palmData = (PrgCallbackData *)data;
     strncpy( palmData->textP, m_msg.ToAscii() , palmData->textLen - 1 );
     palmData->textChanged = true;

+#ifdef __WXPALMOS6__

     palmData->displaySkipBtn = m_canSkip;
     palmData->displaySkipBtn = m_canSkip;

+#endif // __WXPALMOS6__

     palmData->barMaxValue = (uint32_t)m_max;
     palmData->barCurValue = (uint32_t)m_cur;
     palmData->delay = (m_max == m_cur);
     palmData->barMaxValue = (uint32_t)m_max;
     palmData->barCurValue = (uint32_t)m_cur;
     palmData->delay = (m_max == m_cur);