X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/5360828db9ece34c6c7dc81ec7b4a294e6cd5cd5..a22be3e1fcf362850fe33d52d55518ad68b98d02:/include/wx/cmndata.h?ds=inline diff --git a/include/wx/cmndata.h b/include/wx/cmndata.h index 82768cc4e3..03b46f0604 100644 --- a/include/wx/cmndata.h +++ b/include/wx/cmndata.h @@ -21,7 +21,13 @@ #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 + #endif +#endif + +#if (defined(__WXMOTIF__) || defined(__WXGTK__) || defined(__WXPM__) || defined(__WXMAC__)) && wxUSE_POSTSCRIPT class WXDLLEXPORT wxPrintSetupData; #endif @@ -55,7 +61,6 @@ class WXDLLEXPORT wxFontData: public wxObject DECLARE_DYNAMIC_CLASS(wxFontData) public: wxFontData(); - wxFontData(const wxFontData& fontData); ~wxFontData(); void SetAllowSymbols(bool flag) { allowSymbols = flag; } @@ -78,7 +83,13 @@ public: void SetRange(int minRange, int maxRange) { minSize = minRange; maxSize = maxRange; } - void operator=(const wxFontData& data); + // encoding info is split into 2 parts: the logical wxWin encoding + // (wxFontEncoding) and a structure containing the native parameters for + // it (wxNativeEncodingInfo) + wxFontEncoding GetEncoding() const { return m_encoding; } + void SetEncoding(wxFontEncoding encoding) { m_encoding = encoding; } + + wxNativeEncodingInfo& EncodingInfo() { return m_encodingInfo; } public: wxColour fontColour; @@ -89,6 +100,10 @@ public: wxFont chosenFont; int minSize; int maxSize; + +private: + wxFontEncoding m_encoding; + wxNativeEncodingInfo m_encodingInfo; }; #if wxUSE_PRINTING_ARCHITECTURE @@ -156,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 @@ -166,11 +181,24 @@ 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__ ) +#if TARGET_CARBON + PMPageFormat m_macPageFormat ; + PMPrintSettings m_macPrintSettings ; +#else + THPrint m_macPrintInfo ; +#endif #endif private: @@ -260,6 +288,9 @@ 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__ @@ -346,6 +377,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