added a call for invalidating the dc setup on mac explicitely (needed in case of...

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

diff --git a/include/wx/cmndata.h b/include/wx/cmndata.h
index 2745dcb0aa838ec9d215f1be9bf40e9a0628fdb8..03b46f0604066e2dadd0f089d1b5998010385f20 100644 (file)
--- a/include/wx/cmndata.h
+++ b/include/wx/cmndata.h
@@ -18,11 +18,16 @@
 
 #include "wx/window.h"
 #include "wx/font.h"
-#include "wx/fontutil.h"
 #include "wx/colour.h"
 #include "wx/gdicmn.h"
 
-#if (defined(__WXMOTIF__) || defined(__WXGTK__) || defined(__WXPM__)) && wxUSE_POSTSCRIPT
+#if defined(__WXMAC__) && defined(TARGET_CARBON)
+  #if !defined(__UNIX__)
+    #include <PMApplication.h>
+  #endif
+#endif
+
+#if (defined(__WXMOTIF__) || defined(__WXGTK__) || defined(__WXPM__) || defined(__WXMAC__)) && wxUSE_POSTSCRIPT
 class WXDLLEXPORT wxPrintSetupData;
 #endif
 
@@ -166,7 +171,7 @@ class WXDLLEXPORT wxPrintData: public wxObject
     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
 
@@ -176,7 +181,9 @@ class WXDLLEXPORT wxPrintData: public wxObject
     void ConvertFromNative();
     void* GetNativeData() const { return m_devMode; }
     void SetNativeData(void* data) { m_devMode = data; }
-#elif defined( __WXMAC__)
+    void* GetNativeDataDevNames() const { return m_devNames; }
+    void SetNativeDataDevNames(void* data) { m_devNames = data; }
+#elif defined(__WXMAC__)
   void ConvertToNative();
   void ConvertFromNative();
 #endif
@@ -184,9 +191,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:
 
@@ -275,15 +288,13 @@ class WXDLLEXPORT wxPrintDialogData: public wxObject
     void ConvertFromNative();
     void SetOwnerWindow(wxWindow* win);
     void* GetNativeData() const { return m_printDlgData; }
-#elif defined( __WXMAC__)
+#elif defined(__WXMAC__)
   void ConvertToNative();
   void ConvertFromNative();
 #endif
 
 #ifdef __WXMSW__
     void*           m_printDlgData;
-#elif defined( __WXMAC__  )
-       THPrint                 m_macPrintInfo ;
 #endif
 
 private:
@@ -366,7 +377,7 @@ public:
     void ConvertFromNative();
     void SetOwnerWindow(wxWindow* win);
     void* GetNativeData() const { return m_pageSetupData; }
-#elif defined( __WXMAC__)
+#elif defined(__WXMAC__)
   void ConvertToNative();
   void ConvertFromNative();
 #endif
@@ -386,8 +397,6 @@ public:
 
 #if defined(__WIN95__)
     void*           m_pageSetupData;
-#elif defined( __WXMAC__  )
-       THPrint         m_macPageSetupInfo ;
 #endif
 
 private: