X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/03e11df5470fd64d9d9a669d0b50b84c2d714736..4d876ee3f727afa0d79aa5f7b03bf9a59673bef6:/include/wx/cmndata.h diff --git a/include/wx/cmndata.h b/include/wx/cmndata.h index 03b46f0604..0688f00f38 100644 --- a/include/wx/cmndata.h +++ b/include/wx/cmndata.h @@ -21,12 +21,6 @@ #include "wx/colour.h" #include "wx/gdicmn.h" -#if defined(__WXMAC__) && defined(TARGET_CARBON) - #if !defined(__UNIX__) - #include - #endif -#endif - #if (defined(__WXMOTIF__) || defined(__WXGTK__) || defined(__WXPM__) || defined(__WXMAC__)) && wxUSE_POSTSCRIPT class WXDLLEXPORT wxPrintSetupData; #endif @@ -189,16 +183,12 @@ class WXDLLEXPORT wxPrintData: public wxObject #endif public: -#ifdef __WXMSW__ +#if defined(__WXMSW__) void* m_devMode; void* m_devNames; -#elif defined( __WXMAC__ ) -#if TARGET_CARBON - PMPageFormat m_macPageFormat ; - PMPrintSettings m_macPrintSettings ; -#else - THPrint m_macPrintInfo ; -#endif +#elif defined(__WXMAC__) + void* m_macPageFormat ; + void* m_macPrintSettings ; #endif private: