X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/7826e2dd838d59c6a8061b4fdd9f7326a6e06de3..77436c4cbac2269e564dc4fcf4494a58feca0af4:/include/wx/cmndata.h diff --git a/include/wx/cmndata.h b/include/wx/cmndata.h index 028c27fe4f..2b4063f317 100644 --- a/include/wx/cmndata.h +++ b/include/wx/cmndata.h @@ -21,7 +21,14 @@ #include "wx/colour.h" #include "wx/gdicmn.h" -#if (defined(__WXMOTIF__) || defined(__WXGTK__) || defined(__WXPM__)) && wxUSE_POSTSCRIPT +#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 class WXDLLEXPORT wxPrintSetupData; #endif @@ -165,7 +172,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 @@ -177,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; } -#elif defined( __WXMAC__) +#elif defined(__WXMAC__) void ConvertToNative(); void ConvertFromNative(); #endif @@ -187,7 +194,12 @@ public: 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: @@ -277,15 +289,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: @@ -368,7 +378,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 @@ -388,8 +398,6 @@ public: #if defined(__WIN95__) void* m_pageSetupData; -#elif defined( __WXMAC__ ) - THPrint m_macPageSetupInfo ; #endif private: