X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/5360828db9ece34c6c7dc81ec7b4a294e6cd5cd5..bc55104d9ab0b0b835644f17a152b4fbbfa8c7b9:/include/wx/cmndata.h diff --git a/include/wx/cmndata.h b/include/wx/cmndata.h index 82768cc4e3..2c8c64b7c8 100644 --- a/include/wx/cmndata.h +++ b/include/wx/cmndata.h @@ -21,7 +21,7 @@ #include "wx/colour.h" #include "wx/gdicmn.h" -#if (defined(__WXMOTIF__) || defined(__WXGTK__) || defined(__WXPM__)) && wxUSE_POSTSCRIPT +#if (defined(__WXMOTIF__) || defined(__WXX11__) || defined(__WXGTK__) || defined(__WXPM__) || defined(__WXMAC__)) && wxUSE_POSTSCRIPT class WXDLLEXPORT wxPrintSetupData; #endif @@ -35,11 +35,11 @@ public: void SetChooseFull(bool flag) { chooseFull = flag; } bool GetChooseFull() const { return chooseFull; } - void SetColour(wxColour& colour) { dataColour = colour; } + void SetColour(const wxColour& colour) { dataColour = colour; } wxColour &GetColour() { return dataColour; } // Array of 16 custom colours - void SetCustomColour(int i, wxColour& colour); + void SetCustomColour(int i, const wxColour& colour); wxColour GetCustomColour(int i); void operator=(const wxColourData& data); @@ -55,7 +55,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 +77,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 +94,10 @@ public: wxFont chosenFont; int minSize; int maxSize; + +private: + wxFontEncoding m_encoding; + wxNativeEncodingInfo m_encodingInfo; }; #if wxUSE_PRINTING_ARCHITECTURE @@ -156,7 +165,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(__WXX11__) || defined(__WXGTK__) || defined(__WXPM__) || defined(__WXMAC__)) && wxUSE_POSTSCRIPT void operator=(const wxPrintSetupData& setupData); #endif @@ -166,11 +175,20 @@ 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__ +#if defined(__WXMSW__) void* m_devMode; + void* m_devNames; +#elif defined(__WXMAC__) + void* m_macPageFormat ; + void* m_macPrintSettings ; #endif private: @@ -260,6 +278,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__ @@ -322,7 +343,7 @@ public: // paper size id member as well. void SetPaperSize(const wxSize& sz); - void SetPaperId(wxPaperSize& id) { m_printData.SetPaperId(id); }; + void SetPaperId(wxPaperSize id) { m_printData.SetPaperId(id); }; // Sets the wxPrintData id, plus the paper width/height if found in the paper database. void SetPaperSize(wxPaperSize id); @@ -346,6 +367,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