added and documented wxWindow::MoveBefore/AfterInTabOrder()

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

diff --git a/include/wx/cmndata.h b/include/wx/cmndata.h
index eaceebd2b6d4c5ea20e34aaf8f087d946afe10bd..fae981643ee96e32ca5e1840eac9fcbaa19daa25 100644 (file)
--- 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)
 };