avoid a bug in Carbon headers

[wxWidgets.git] / include / wx / generic / dcpsg.h

diff --git a/include/wx/generic/dcpsg.h b/include/wx/generic/dcpsg.h
index d0bf5a34fcec4b4a23d8624938ca5ad7e08b75fe..8848f1601859693d9494ebdec6b7859d5ce59da0 100644 (file)
--- a/include/wx/generic/dcpsg.h
+++ b/include/wx/generic/dcpsg.h
@@ -4,14 +4,14 @@
 // Author:      Julian Smart and others
 // Modified by:
 // RCS-ID:      $Id$
 // Author:      Julian Smart and others
 // Modified by:
 // RCS-ID:      $Id$

-// Copyright:   (c) Julian Smart, Robert Roebling and Markus Holzem
+// Copyright:   (c) Julian Smart and Robert Roebling

 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_DCPSG_H_
 #define _WX_DCPSG_H_
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_DCPSG_H_
 #define _WX_DCPSG_H_
 

-#if defined(__GNUG__) && !defined(__APPLE__)
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

 #pragma interface "dcpsg.h"
 #endif
 
 #pragma interface "dcpsg.h"
 #endif
 


@@ -38,17 +38,18 @@ class wxPostScriptDC;
 class WXDLLEXPORT wxPostScriptDC: public wxDC
 {
 public:
 class WXDLLEXPORT wxPostScriptDC: public wxDC
 {
 public:

-  wxPostScriptDC();
+    wxPostScriptDC();

 
 

-  // Recommended constructor
-  wxPostScriptDC(const wxPrintData& printData);
+    // Recommended constructor
+    wxPostScriptDC(const wxPrintData& printData);

   
   

-  ~wxPostScriptDC();
+    // Recommended destructor :-)
+    ~wxPostScriptDC();

 
 #if WXWIN_COMPATIBILITY_2_2
 
 #if WXWIN_COMPATIBILITY_2_2

-  wxPostScriptDC( const wxString &output, bool interactive = FALSE, wxWindow *parent = NULL )
-      { Create( output, interactive, parent ); }
-  bool Create ( const wxString &output, bool interactive = FALSE, wxWindow *parent = NULL );
+    wxPostScriptDC( const wxString &output, bool interactive = FALSE, wxWindow *parent = NULL )
+        { Create( output, interactive, parent ); }
+    bool Create ( const wxString &output, bool interactive = FALSE, wxWindow *parent = NULL );

 #endif
 
   virtual bool Ok() const;
 #endif
 
   virtual bool Ok() const;


@@ -132,6 +133,12 @@ private:
     static float ms_PSScaleFactor;
 
 protected:
     static float ms_PSScaleFactor;
 
 protected:

+#if wxUSE_PANGO
+    PangoContext *m_context;
+    PangoLayout *m_layout;
+    PangoFontDescription *m_fontdesc;
+#endif
+

     FILE*             m_pstream;    // PostScript output stream
     wxString          m_title;
     unsigned char     m_currentRed;
     FILE*             m_pstream;    // PostScript output stream
     wxString          m_title;
     unsigned char     m_currentRed;


@@ -147,6 +154,50 @@ private:
     DECLARE_DYNAMIC_CLASS(wxPostScriptDC)
 };
 
     DECLARE_DYNAMIC_CLASS(wxPostScriptDC)
 };
 

+
+#if WXWIN_COMPATIBILITY_2_2
+// Print Orientation
+enum
+{
+    PS_PORTRAIT = wxPORTRAIT,
+    PS_LANDSCAPE = wxLANDSCAPE
+};
+
+// Print Actions
+enum
+{
+    PS_NONE = wxPRINT_MODE_NONE,
+    PS_PREVIEW = wxPRINT_MODE_PREVIEW,
+    PS_FILE = wxPRINT_MODE_FILE,
+    PS_PRINTER = wxPRINT_MODE_PRINTER
+};
+    
+class wxPrintSetupData: public wxPrintData
+{
+public:
+    wxPrintSetupData() {}
+    
+    void SetPrinterOrientation( int orient ) 
+        { SetOrientation( orient ); }
+    void SetPrinterMode( wxPrintMode mode ) 
+        { SetPrintMode( mode ); }
+    void SetAFMPath( const wxString &path ) 
+        { SetFontMetricPath( path ); }
+    
+    void SetPaperName(const wxString& paper) { m_paperName = paper; }
+    void SetPrinterFile(const wxString& file) { m_printerFile = file; }
+    wxString GetPaperName() const { return m_paperName; }
+    wxString GetPrinterFile() const { return m_printerFile; };
+    
+    wxString        m_paperName;
+    wxString        m_printerFile;
+};
+
+WXDLLEXPORT_DATA(extern wxPrintSetupData*) wxThePrintSetupData;
+WXDLLEXPORT extern void wxInitializePrintSetupData(bool init = TRUE);
+#endif
+
+

 #endif
     // wxUSE_POSTSCRIPT
 
 #endif
     // wxUSE_POSTSCRIPT