Made wxGTK's wxEventLoop::IsRunning a little more consistent with

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

diff --git a/include/wx/cmndata.h b/include/wx/cmndata.h
index eaceebd2b6d4c5ea20e34aaf8f087d946afe10bd..75eb6960fb9ab9944b5e3ce7810a74b33bc8d9b2 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:
@@ -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)
 };
@@ -144,6 +149,28 @@ class wxNativePrintData ;
 
 #endif
 
+enum wxPrintBin
+{
+    wxPRINTBIN_DEFAULT,
+
+    wxPRINTBIN_ONLYONE,
+    wxPRINTBIN_LOWER,
+    wxPRINTBIN_MIDDLE,
+    wxPRINTBIN_MANUAL,
+    wxPRINTBIN_ENVELOPE,
+    wxPRINTBIN_ENVMANUAL,
+    wxPRINTBIN_AUTO,
+    wxPRINTBIN_TRACTOR,
+    wxPRINTBIN_SMALLFMT,
+    wxPRINTBIN_LARGEFMT,
+    wxPRINTBIN_LARGECAPACITY,
+    wxPRINTBIN_CASSETTE,
+    wxPRINTBIN_FORMSOURCE,
+
+    wxPRINTBIN_USER,
+};
+
+
 class WXDLLEXPORT wxPrintData: public wxObject
 {
 public:
@@ -165,6 +192,7 @@ public:
     const wxSize& GetPaperSize() const { return m_paperSize; } // Not used yet: confusable with paper size
                                                                       // in wxPageSetupDialogData
     wxPrintQuality GetQuality() const { return m_printQuality; }
+    wxPrintBin GetBin() const { return m_bin; }
 
     void SetNoCopies(int v) { m_printNoCopies = v; };
     void SetCollate(bool flag) { m_printCollate = flag; };
@@ -176,6 +204,7 @@ public:
     void SetPaperId(wxPaperSize sizeId) { m_paperId = sizeId; }
     void SetPaperSize(const wxSize& sz) { m_paperSize = sz; }
     void SetQuality(wxPrintQuality quality) { m_printQuality = quality; }
+    void SetBin(wxPrintBin bin) { m_bin = bin; }
 
     // PostScript-specific data
     const wxString& GetPrinterCommand() const { return m_printerCommand; }
@@ -202,6 +231,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,8 +258,12 @@ public:
 #elif defined(__WXMAC__)
     wxNativePrintData* m_nativePrintData ;
 #endif
+#if wxUSE_STREAMS
+    wxOutputStream* m_outputstream;
+#endif
 
 private:
+    wxPrintBin      m_bin;
 
     int             m_printNoCopies;
     int             m_printOrientation;
@@ -250,7 +288,7 @@ private:
     long            m_printerTranslateX;
     long            m_printerTranslateY;
     wxPrintMode     m_printMode;
-    
+
 private:
     DECLARE_DYNAMIC_CLASS(wxPrintData)
 };
@@ -343,7 +381,7 @@ private:
     bool            m_printSetupDialog;
     wxPrintData     m_printData;
 
-private:    
+private:
     DECLARE_DYNAMIC_CLASS(wxPrintDialogData)
 };
 
@@ -444,7 +482,7 @@ private:
     bool            m_getDefaultInfo; // Equiv. to PSD_RETURNDEFAULT
     bool            m_enableHelp;
     wxPrintData     m_printData;
-    
+
 private:
     DECLARE_DYNAMIC_CLASS(wxPageSetupDialogData)
 };