smoother time estimation updates in wxProgressDialog (patch 992813)

[wxWidgets.git] / include / wx / cmndata.h

diff --git a/include/wx/cmndata.h b/include/wx/cmndata.h
index fa2a86d914d43ccfcafb936ea236635d072e7e37..c6632a2c0b1608f95078ded51fd36ef5b1e8f1fd 100644 (file)
--- a/include/wx/cmndata.h
+++ b/include/wx/cmndata.h
@@ -18,9 +18,14 @@
 
 #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:
@@ -44,7 +49,7 @@ public:
     wxColour        m_dataColour;
     wxColour        m_custColours[16];
     bool            m_chooseFull;
-    
+
 private:
     DECLARE_DYNAMIC_CLASS(wxColourData)
 };
@@ -85,7 +90,7 @@ public:
         m_encodingInfo = data.m_encodingInfo;
         return *this;
     }
-                          
+
     void SetAllowSymbols(bool flag) { m_allowSymbols = flag; }
     bool GetAllowSymbols() const { return m_allowSymbols; }
 
@@ -127,7 +132,7 @@ public:
 private:
     wxFontEncoding       m_encoding;
     wxNativeEncodingInfo m_encodingInfo;
-    
+
 private:
     DECLARE_DYNAMIC_CLASS(wxFontData)
 };
@@ -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)
 };
@@ -343,7 +356,7 @@ private:
     bool            m_printSetupDialog;
     wxPrintData     m_printData;
 
-private:    
+private:
     DECLARE_DYNAMIC_CLASS(wxPrintDialogData)
 };
 
@@ -444,7 +457,7 @@ private:
     bool            m_getDefaultInfo; // Equiv. to PSD_RETURNDEFAULT
     bool            m_enableHelp;
     wxPrintData     m_printData;
-    
+
 private:
     DECLARE_DYNAMIC_CLASS(wxPageSetupDialogData)
 };