finally applied the helpbest patch

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

diff --git a/include/wx/cmndata.h b/include/wx/cmndata.h
index 49afce94151f16f9dc2020d13d40c6f4aded02ab..2b4063f3179aa213b10faee87d8837a35449a6fd 100644 (file)
--- a/include/wx/cmndata.h
+++ b/include/wx/cmndata.h
@@ -21,11 +21,14 @@
 #include "wx/colour.h"
 #include "wx/gdicmn.h"
 
 #include "wx/colour.h"
 #include "wx/gdicmn.h"
 

-#if defined( __WXMAC__  ) && defined( TARGET_CARBON )
-#include <PMApplication.h>
+#if defined(__WXMAC__) && defined(TARGET_CARBON) && !defined(__UNIX__)
+  #if PM_USE_SESSION_APIS
+    #include <PMCore.h>
+  #endif
+    #include <PMApplication.h>

 #endif
 
 #endif
 

-#if (defined(__WXMOTIF__) || defined(__WXGTK__) || defined(__WXPM__)) && wxUSE_POSTSCRIPT
+#if (defined(__WXMOTIF__) || defined(__WXGTK__) || defined(__WXPM__) || defined(__WXMAC__)) && wxUSE_POSTSCRIPT

 class WXDLLEXPORT wxPrintSetupData;
 #endif
 
 class WXDLLEXPORT wxPrintSetupData;
 #endif
 


@@ -169,7 +172,7 @@ class WXDLLEXPORT wxPrintData: public wxObject
     void operator=(const wxPrintData& data);
 
     // For compatibility
     void operator=(const wxPrintData& data);
 
     // For compatibility

-#if (defined(__WXMOTIF__) || defined(__WXGTK__) || defined(__WXPM__)) && wxUSE_POSTSCRIPT
+#if (defined(__WXMOTIF__) || defined(__WXGTK__) || defined(__WXPM__) || defined(__WXMAC__)) && wxUSE_POSTSCRIPT

     void operator=(const wxPrintSetupData& setupData);
 #endif
 
     void operator=(const wxPrintSetupData& setupData);
 #endif
 


@@ -181,7 +184,7 @@ class WXDLLEXPORT wxPrintData: public wxObject
     void SetNativeData(void* data) { m_devMode = data; }
     void* GetNativeDataDevNames() const { return m_devNames; }
     void SetNativeDataDevNames(void* data) { m_devNames = data; }
     void SetNativeData(void* data) { m_devMode = data; }
     void* GetNativeDataDevNames() const { return m_devNames; }
     void SetNativeDataDevNames(void* data) { m_devNames = data; }

-#elif defined( __WXMAC__)
+#elif defined(__WXMAC__)

   void ConvertToNative();
   void ConvertFromNative();
 #endif
   void ConvertToNative();
   void ConvertFromNative();
 #endif


@@ -191,12 +194,12 @@ public:
     void*           m_devMode;
     void*           m_devNames;
 #elif defined( __WXMAC__  )
     void*           m_devMode;
     void*           m_devNames;
 #elif defined( __WXMAC__  )

-#if TARGET_CARBON
+  #if TARGET_CARBON

     PMPageFormat    m_macPageFormat ;
     PMPrintSettings m_macPrintSettings ;
     PMPageFormat    m_macPageFormat ;
     PMPrintSettings m_macPrintSettings ;

-#else
+  #else

        THPrint                 m_macPrintInfo ;
        THPrint                 m_macPrintInfo ;

-#endif
+  #endif

 #endif
 
 private:
 #endif
 
 private:


@@ -286,7 +289,7 @@ class WXDLLEXPORT wxPrintDialogData: public wxObject
     void ConvertFromNative();
     void SetOwnerWindow(wxWindow* win);
     void* GetNativeData() const { return m_printDlgData; }
     void ConvertFromNative();
     void SetOwnerWindow(wxWindow* win);
     void* GetNativeData() const { return m_printDlgData; }

-#elif defined( __WXMAC__)
+#elif defined(__WXMAC__)

   void ConvertToNative();
   void ConvertFromNative();
 #endif
   void ConvertToNative();
   void ConvertFromNative();
 #endif


@@ -375,7 +378,7 @@ public:
     void ConvertFromNative();
     void SetOwnerWindow(wxWindow* win);
     void* GetNativeData() const { return m_pageSetupData; }
     void ConvertFromNative();
     void SetOwnerWindow(wxWindow* win);
     void* GetNativeData() const { return m_pageSetupData; }

-#elif defined( __WXMAC__)
+#elif defined(__WXMAC__)

   void ConvertToNative();
   void ConvertFromNative();
 #endif
   void ConvertToNative();
   void ConvertFromNative();
 #endif