X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/dbc37e688092c6a01aaaf614aa8c6e8aac59bc72..1146983c7be03c3b0d617b983625b11f693cefdb:/include/wx/cmndata.h diff --git a/include/wx/cmndata.h b/include/wx/cmndata.h index 4dc71933cc..382f937687 100644 --- a/include/wx/cmndata.h +++ b/include/wx/cmndata.h @@ -147,12 +147,6 @@ private: * Encapsulates printer information (not printer dialog information) */ -#ifdef __WXMAC__ - -class wxNativePrintData ; - -#endif - enum wxPrintBin { wxPRINTBIN_DEFAULT, @@ -217,6 +211,11 @@ public: void operator=(const wxPrintData& data); + char* GetPrivData() const { return m_privData; } + int GetPrivDataLen() const { return m_privDataLen; } + void SetPrivData( char *privData, int len ); + + #if WXWIN_COMPATIBILITY_2_4 // PostScript-specific data wxString GetPrinterCommand() const; @@ -246,11 +245,6 @@ public: // Holds the native print data wxPrintNativeDataBase *GetNativeData() const { return m_nativeData; } -public: -#if defined(__WXMAC__) - wxNativePrintData* m_nativePrintData ; -#endif - private: wxPrintBin m_bin; wxPrintMode m_printMode; @@ -268,6 +262,9 @@ private: wxString m_filename; + char* m_privData; + int m_privDataLen; + wxPrintNativeDataBase *m_nativeData; private: @@ -332,11 +329,6 @@ public: void operator=(const wxPrintDialogData& data); void operator=(const wxPrintData& data); // Sets internal m_printData member -#if defined(__WXMAC__) - void ConvertToNative(); - void ConvertFromNative(); -#endif - private: int m_printFromPage; int m_printToPage; @@ -415,11 +407,6 @@ public: void EnablePrinter(bool flag) { m_enablePrinter = flag; }; void EnableHelp(bool flag) { m_enableHelp = flag; }; -#if defined(__WXMAC__) - void ConvertToNative(); - void ConvertFromNative(); -#endif - // Use paper size defined in this object to set the wxPrintData // paper id void CalculateIdFromPaperSize();