X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/7beba2fc73283f5b750227459da57e66bcd475f5..82a5f02c861e8d57ba8255a9553b941118ad4520:/include/wx/cmndata.h diff --git a/include/wx/cmndata.h b/include/wx/cmndata.h index 408d3827b1..028c27fe4f 100644 --- a/include/wx/cmndata.h +++ b/include/wx/cmndata.h @@ -18,7 +18,6 @@ #include "wx/window.h" #include "wx/font.h" -#include "wx/fontutil.h" #include "wx/colour.h" #include "wx/gdicmn.h" @@ -176,11 +175,19 @@ 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(); #endif public: #ifdef __WXMSW__ void* m_devMode; + void* m_devNames; +#elif defined( __WXMAC__ ) + THPrint m_macPrintInfo ; #endif private: @@ -270,10 +277,15 @@ class WXDLLEXPORT wxPrintDialogData: public wxObject void ConvertFromNative(); void SetOwnerWindow(wxWindow* win); void* GetNativeData() const { return m_printDlgData; } +#elif defined( __WXMAC__) + void ConvertToNative(); + void ConvertFromNative(); #endif #ifdef __WXMSW__ void* m_printDlgData; +#elif defined( __WXMAC__ ) + THPrint m_macPrintInfo ; #endif private: @@ -356,6 +368,9 @@ public: void ConvertFromNative(); void SetOwnerWindow(wxWindow* win); void* GetNativeData() const { return m_pageSetupData; } +#elif defined( __WXMAC__) + void ConvertToNative(); + void ConvertFromNative(); #endif // Use paper size defined in this object to set the wxPrintData @@ -373,6 +388,8 @@ public: #if defined(__WIN95__) void* m_pageSetupData; +#elif defined( __WXMAC__ ) + THPrint m_macPageSetupInfo ; #endif private: