X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ae500232a4e961a567a5fb375fcf4f4a23216bd2..a24de76b33ff8c30343d322ba9031527f0ba060f:/include/wx/cmndata.h diff --git a/include/wx/cmndata.h b/include/wx/cmndata.h index eaceebd2b6..fae981643e 100644 --- a/include/wx/cmndata.h +++ b/include/wx/cmndata.h @@ -12,15 +12,20 @@ #ifndef _WX_CMNDATA_H_BASE_ #define _WX_CMNDATA_H_BASE_ -#if defined(__GNUG__) && !defined(__APPLE__) +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma interface "cmndata.h" #endif #include "wx/window.h" #include "wx/font.h" +#include "wx/encinfo.h" #include "wx/colour.h" #include "wx/gdicmn.h" +#if wxUSE_STREAMS +#include "wx/stream.h" +#endif + class WXDLLEXPORT wxColourData: public wxObject { public: @@ -202,6 +207,11 @@ public: void SetPrinterTranslation(long x, long y) { m_printerTranslateX = x; m_printerTranslateY = y; } void SetPrintMode(wxPrintMode printMode) { m_printMode = printMode; } +#if wxUSE_STREAMS + wxOutputStream* GetOutputStream() { return m_outputstream; } + void SetOutputStream(wxOutputStream* outputstream) { m_outputstream = outputstream; } +#endif + void operator=(const wxPrintData& data); #if defined(__WXMSW__) @@ -224,6 +234,9 @@ public: #elif defined(__WXMAC__) wxNativePrintData* m_nativePrintData ; #endif +#if wxUSE_STREAMS + wxOutputStream* m_outputstream; +#endif private: @@ -250,7 +263,7 @@ private: long m_printerTranslateX; long m_printerTranslateY; wxPrintMode m_printMode; - + private: DECLARE_DYNAMIC_CLASS(wxPrintData) };