fixed crash with '\' on the end of the last line

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

diff --git a/include/wx/cmndata.h b/include/wx/cmndata.h
index 2745dcb0aa838ec9d215f1be9bf40e9a0628fdb8..49afce94151f16f9dc2020d13d40c6f4aded02ab 100644 (file)
--- a/include/wx/cmndata.h
+++ b/include/wx/cmndata.h
@@ -18,10 +18,13 @@
 
 #include "wx/window.h"
 #include "wx/font.h"
-#include "wx/fontutil.h"
 #include "wx/colour.h"
 #include "wx/gdicmn.h"
 
+#if defined( __WXMAC__  ) && defined( TARGET_CARBON )
+#include <PMApplication.h>
+#endif
+
 #if (defined(__WXMOTIF__) || defined(__WXGTK__) || defined(__WXPM__)) && wxUSE_POSTSCRIPT
 class WXDLLEXPORT wxPrintSetupData;
 #endif
@@ -176,6 +179,8 @@ class WXDLLEXPORT wxPrintData: public wxObject
     void ConvertFromNative();
     void* GetNativeData() const { return m_devMode; }
     void SetNativeData(void* data) { m_devMode = data; }
+    void* GetNativeDataDevNames() const { return m_devNames; }
+    void SetNativeDataDevNames(void* data) { m_devNames = data; }
 #elif defined( __WXMAC__)
   void ConvertToNative();
   void ConvertFromNative();
@@ -184,9 +189,15 @@ class WXDLLEXPORT wxPrintData: public wxObject
 public:
 #ifdef __WXMSW__
     void*           m_devMode;
+    void*           m_devNames;
 #elif defined( __WXMAC__  )
+#if TARGET_CARBON
+    PMPageFormat    m_macPageFormat ;
+    PMPrintSettings m_macPrintSettings ;
+#else
        THPrint                 m_macPrintInfo ;
 #endif
+#endif
 
 private:
 
@@ -282,8 +293,6 @@ class WXDLLEXPORT wxPrintDialogData: public wxObject
 
 #ifdef __WXMSW__
     void*           m_printDlgData;
-#elif defined( __WXMAC__  )
-       THPrint                 m_macPrintInfo ;
 #endif
 
 private:
@@ -386,8 +395,6 @@ public:
 
 #if defined(__WIN95__)
     void*           m_pageSetupData;
-#elif defined( __WXMAC__  )
-       THPrint         m_macPageSetupInfo ;
 #endif
 
 private: