long long for DJGPP

[wxWidgets.git] / include / wx / cmndata.h

diff --git a/include/wx/cmndata.h b/include/wx/cmndata.h
index 03b46f0604066e2dadd0f089d1b5998010385f20..2b4063f3179aa213b10faee87d8837a35449a6fd 100644 (file)
--- a/include/wx/cmndata.h
+++ b/include/wx/cmndata.h
@@ -21,10 +21,11 @@
 #include "wx/colour.h"
 #include "wx/gdicmn.h"
 
-#if defined(__WXMAC__) && defined(TARGET_CARBON)
-  #if !defined(__UNIX__)
-    #include <PMApplication.h>
+#if defined(__WXMAC__) && defined(TARGET_CARBON) && !defined(__UNIX__)
+  #if PM_USE_SESSION_APIS
+    #include <PMCore.h>
   #endif
+    #include <PMApplication.h>
 #endif
 
 #if (defined(__WXMOTIF__) || defined(__WXGTK__) || defined(__WXPM__) || defined(__WXMAC__)) && wxUSE_POSTSCRIPT
@@ -193,12 +194,12 @@ public:
     void*           m_devMode;
     void*           m_devNames;
 #elif defined( __WXMAC__  )
-#if TARGET_CARBON
+  #if TARGET_CARBON
     PMPageFormat    m_macPageFormat ;
     PMPrintSettings m_macPrintSettings ;
-#else
+  #else
        THPrint                 m_macPrintInfo ;
-#endif
+  #endif
 #endif
 
 private: