Source cleaning: whitespaces, tabs, TRUE/true, FALSE/false.

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

diff --git a/include/wx/generic/dcpsg.h b/include/wx/generic/dcpsg.h
index 184092f593c9f54dfb52bf189b9af41371724c5d..a71086fcde433dfedfd7dfd418f27c27d8649128 100644 (file)
--- a/include/wx/generic/dcpsg.h
+++ b/include/wx/generic/dcpsg.h
@@ -4,15 +4,15 @@
 // 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_
 

-#ifdef __GNUG__
-#pragma interface
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
+#pragma interface "dcpsg.h"

 #endif
 
 #include "wx/dc.h"
 #endif
 
 #include "wx/dc.h"


@@ -37,32 +37,27 @@ class wxPostScriptDC;
 
 class WXDLLEXPORT wxPostScriptDC: public wxDC
 {
 
 class WXDLLEXPORT wxPostScriptDC: public wxDC
 {

-  DECLARE_DYNAMIC_CLASS(wxPostScriptDC)
-

 public:
 public:

+    wxPostScriptDC();

 
 

-  wxPostScriptDC();
-
-  // Deprecated constructor
-  wxPostScriptDC(const wxString& output, bool interactive = TRUE, wxWindow *parent = (wxWindow *) NULL);
+    // Recommended constructor
+    wxPostScriptDC(const wxPrintData& printData);

 
 

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

 
 

-  ~wxPostScriptDC();
-
-  // Deprecated
-  bool Create(const wxString& output, bool interactive = TRUE, wxWindow *parent = (wxWindow *) NULL);
+#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 );
+#endif

 
   virtual bool Ok() const;
 
 
   virtual bool Ok() const;
 

-  // Deprecated: use wxGenericPrintDialog instead
-  virtual bool PrinterDialog(wxWindow *parent = (wxWindow *) NULL);
-

   virtual void BeginDrawing() {}
   virtual void EndDrawing() {}
 
   virtual void BeginDrawing() {}
   virtual void EndDrawing() {}
 

-  void DoFloodFill(wxCoord x1, wxCoord y1, const wxColour &col, int style=wxFLOOD_SURFACE );
+  bool DoFloodFill(wxCoord x1, wxCoord y1, const wxColour &col, int style=wxFLOOD_SURFACE );

   bool DoGetPixel(wxCoord x1, wxCoord y1, wxColour *col) const;
 
   void DoDrawLine(wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2);
   bool DoGetPixel(wxCoord x1, wxCoord y1, wxColour *col) const;
 
   void DoDrawLine(wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2);


@@ -72,6 +67,7 @@ public:
   void DoDrawPoint(wxCoord x, wxCoord y);
   void DoDrawLines(int n, wxPoint points[], wxCoord xoffset = 0, wxCoord yoffset = 0);
   void DoDrawPolygon(int n, wxPoint points[], wxCoord xoffset = 0, wxCoord yoffset = 0, int fillStyle=wxODDEVEN_RULE);
   void DoDrawPoint(wxCoord x, wxCoord y);
   void DoDrawLines(int n, wxPoint points[], wxCoord xoffset = 0, wxCoord yoffset = 0);
   void DoDrawPolygon(int n, wxPoint points[], wxCoord xoffset = 0, wxCoord yoffset = 0, int fillStyle=wxODDEVEN_RULE);

+  void DoDrawPolyPolygon(int n, int count[], wxPoint points[], wxCoord xoffset = 0, wxCoord yoffset = 0, int fillStyle=wxODDEVEN_RULE);

   void DoDrawRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord height);
   void DoDrawRoundedRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord height, double radius = 20);
   void DoDrawEllipse(wxCoord x, wxCoord y, wxCoord width, wxCoord height);
   void DoDrawRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord height);
   void DoDrawRoundedRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord height, double radius = 20);
   void DoDrawEllipse(wxCoord x, wxCoord y, wxCoord width, wxCoord height);


@@ -79,13 +75,15 @@ public:
   void DoDrawSpline(wxList *points);
 
   bool DoBlit(wxCoord xdest, wxCoord ydest, wxCoord width, wxCoord height,
   void DoDrawSpline(wxList *points);
 
   bool DoBlit(wxCoord xdest, wxCoord ydest, wxCoord width, wxCoord height,

-            wxDC *source, wxCoord xsrc, wxCoord ysrc, int rop = wxCOPY, bool useMask = FALSE);
-  bool CanDrawBitmap() const { return TRUE; }
+            wxDC *source, wxCoord xsrc, wxCoord ysrc, int rop = wxCOPY, bool useMask = false,
+            wxCoord xsrcMask = wxDefaultCoord, wxCoord ysrcMask = wxDefaultCoord);
+  bool CanDrawBitmap() const { return true; }

 
   void DoDrawIcon( const wxIcon& icon, wxCoord x, wxCoord y );
 
   void DoDrawIcon( const wxIcon& icon, wxCoord x, wxCoord y );

-  void DoDrawBitmap( const wxBitmap& bitmap, wxCoord x, wxCoord y, bool useMask=FALSE );
+  void DoDrawBitmap( const wxBitmap& bitmap, wxCoord x, wxCoord y, bool useMask = false );

 
   void DoDrawText(const wxString& text, wxCoord x, wxCoord y );
 
   void DoDrawText(const wxString& text, wxCoord x, wxCoord y );

+  void DoDrawRotatedText(const wxString& text, wxCoord x, wxCoord y, double angle);

 
   void Clear();
   void SetFont( const wxFont& font );
 
   void Clear();
   void SetFont( const wxFont& font );


@@ -106,7 +104,7 @@ public:
 
   wxCoord GetCharHeight() const;
   wxCoord GetCharWidth() const;
 
   wxCoord GetCharHeight() const;
   wxCoord GetCharWidth() const;

-  bool CanGetTextExtent() const { return TRUE; }
+  bool CanGetTextExtent() const { return true; }

   void DoGetTextExtent(const wxString& string, wxCoord *x, wxCoord *y,
                      wxCoord *descent = (wxCoord *) NULL,
                      wxCoord *externalLeading = (wxCoord *) NULL,
   void DoGetTextExtent(const wxString& string, wxCoord *x, wxCoord *y,
                      wxCoord *descent = (wxCoord *) NULL,
                      wxCoord *externalLeading = (wxCoord *) NULL,


@@ -129,154 +127,85 @@ public:
 
   virtual int GetDepth() const { return 24; }
 
 
   virtual int GetDepth() const { return 24; }
 

-protected:
+  static void SetResolution(int ppi);
+  static int GetResolution();

 
 

-  FILE*             m_pstream;    // PostScript output stream
-  wxString          m_title;
-  unsigned char     m_currentRed;
-  unsigned char     m_currentGreen;
-  unsigned char     m_currentBlue;
-  int               m_pageNumber;
-  bool              m_clipping;
-  double            m_underlinePosition;
-  double            m_underlineThickness;
-  wxPrintData       m_printData;
-};
+  void PsPrintf( const wxChar* fmt, ... );
+  void PsPrint( const char* psdata );
+  void PsPrint( int ch );

 
 

-// Deprecated: should use wxGenericPrintDialog instead.
-#if 1
-enum
-{
-    wxID_PRINTER_COMMAND = 1,
-    wxID_PRINTER_OPTIONS,
-    wxID_PRINTER_ORIENTATION,
-    wxID_PRINTER_MODES,
-    wxID_PRINTER_X_SCALE,
-    wxID_PRINTER_Y_SCALE,
-    wxID_PRINTER_X_TRANS,
-    wxID_PRINTER_Y_TRANS
-};
+#if wxUSE_UNICODE
+  void PsPrint( const wxChar* psdata ) { PsPrint( wxConvUTF8.cWX2MB( psdata ) ); }
+#endif

 
 

-class WXDLLEXPORT wxPostScriptPrintDialog: public wxDialog
-{
-DECLARE_CLASS(wxPostScriptPrintDialog)
-public:
-    wxPostScriptPrintDialog (wxWindow *parent, const wxString& title,
-          const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,
-          wxCoord style = wxDEFAULT_DIALOG_STYLE);
+private:
+    static float ms_PSScaleFactor;
+
+protected:
+#if wxUSE_PANGO
+    PangoContext *m_context;
+    PangoLayout *m_layout;
+    PangoFontDescription *m_fontdesc;
+#endif

 
 

-    virtual int ShowModal();
+    FILE*             m_pstream;    // PostScript output stream
+    wxString          m_title;
+    unsigned char     m_currentRed;
+    unsigned char     m_currentGreen;
+    unsigned char     m_currentBlue;
+    int               m_pageNumber;
+    bool              m_clipping;
+    double            m_underlinePosition;
+    double            m_underlineThickness;
+    wxPrintData       m_printData;
+
+private:
+    DECLARE_DYNAMIC_CLASS(wxPostScriptDC)

 };
 };

-#endif // 1

 
 

-// Print Orientation (Should also add Left, Right)
+
+#if WXWIN_COMPATIBILITY_2_2
+// Print Orientation

 enum
 {
 enum
 {

-  PS_PORTRAIT = 1,
-  PS_LANDSCAPE = 2
-};// ps_orientation = PS_PORTRAIT;
+    PS_PORTRAIT = wxPORTRAIT,
+    PS_LANDSCAPE = wxLANDSCAPE
+};

 
 // Print Actions
 enum
 {
 
 // Print Actions
 enum
 {

-  PS_NONE,
-  PS_PREVIEW,
-  PS_FILE,
-  PS_PRINTER
-};// ps_action = PS_PREVIEW;
-
-// PostScript printer settings
-WXDLLEXPORT void wxSetPrinterCommand(const wxString& cmd);
-WXDLLEXPORT void wxSetPrintPreviewCommand(const wxString& cmd);
-WXDLLEXPORT void wxSetPrinterOptions(const wxString& flags);
-WXDLLEXPORT void wxSetPrinterOrientation(int orientation);
-WXDLLEXPORT void wxSetPrinterScaling(double x, double y);
-WXDLLEXPORT void wxSetPrinterTranslation(wxCoord x, wxCoord y);
-WXDLLEXPORT void wxSetPrinterMode(int mode);
-WXDLLEXPORT void wxSetPrinterFile(const wxString& f);
-WXDLLEXPORT void wxSetAFMPath(const wxString& f);
-
-// Get current values
-WXDLLEXPORT wxString wxGetPrinterCommand();
-WXDLLEXPORT wxString wxGetPrintPreviewCommand();
-WXDLLEXPORT wxString wxGetPrinterOptions();
-WXDLLEXPORT int wxGetPrinterOrientation();
-WXDLLEXPORT void wxGetPrinterScaling(double* x, double* y);
-WXDLLEXPORT void wxGetPrinterTranslation(wxCoord *x, wxCoord *y);
-WXDLLEXPORT int wxGetPrinterMode();
-WXDLLEXPORT wxString wxGetPrinterFile();
-WXDLLEXPORT wxString wxGetAFMPath();
-
-/*
- * PostScript print setup information.
- * This is now obsolete, but retained for a while for compatibility
- */
-
-class WXDLLEXPORT wxPrintSetupData: public wxObject
+    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:
 {
 public:

-    wxPrintSetupData();
-    ~wxPrintSetupData();
-
-    void SetPrinterCommand(const wxString& cmd) { m_printerCommand = cmd; };
-    void SetPaperName(const wxString& paper) { m_paperName = paper; };
-    void SetPrintPreviewCommand(const wxString& cmd) { m_previewCommand = cmd; };
-    void SetPrinterOptions(const wxString& flags) { m_printerFlags = flags; };
-    void SetPrinterFile(const wxString& f) { m_printerFile = f; };
-    void SetPrinterOrientation(int orient) { m_printerOrient = orient; };
-    void SetPrinterScaling(double x, double y) { m_printerScaleX = x; m_printerScaleY = y; };
-    void SetPrinterTranslation(wxCoord x, wxCoord y) { m_printerTranslateX = x; m_printerTranslateY = y; };
-    // 1 = Preview, 2 = print to file, 3 = send to printer
-    void SetPrinterMode(int mode) { m_printerMode = mode; };
-    void SetAFMPath(const wxString& f) { m_afmPath = f; };
-    void SetColour(bool col) { m_printColour = col; };
-
-    // Get current values
-    wxString GetPrinterCommand() const { return m_printerCommand; } ;
-    wxString GetPrintPreviewCommand() const { return m_previewCommand; } ;
-    wxString GetPrinterOptions() const { return m_printerFlags; };
-    wxString GetPrinterFile() const { return m_printerFile; };
-    wxString GetPaperName() const { return m_paperName; }
-    int GetPrinterOrientation() const { return m_printerOrient; };
-    void GetPrinterScaling(double* x, double* y) const { *x = m_printerScaleX; *y = m_printerScaleY; };
-    void GetPrinterTranslation(wxCoord *x, wxCoord *y) const { *x = m_printerTranslateX; *y = m_printerTranslateY; };
-    int GetPrinterMode() const { return m_printerMode; };
-    wxString GetAFMPath() const { return m_afmPath; };
-    bool GetColour() const { return m_printColour; };
+    wxPrintSetupData() {}

 
 

-    void operator=(wxPrintSetupData& data);
+    void SetPrinterOrientation( int orient )
+        { SetOrientation( orient ); }
+    void SetPrinterMode( wxPrintMode mode )
+        { SetPrintMode( mode ); }
+    void SetAFMPath( const wxString &path )
+        { SetFontMetricPath( path ); }

 
 

-    // Initialize from a wxPrintData object (wxPrintData should now be used instead of wxPrintSetupData).
-    // There is also an operator for initializing a wxPrintData from a wxPrintSetupData.
-    void operator=(const wxPrintData& data);
-
-#ifndef __WIN16__
-    void GetPrinterTranslation(long *x, long *y) const
-        { *x = m_printerTranslateX; *y = m_printerTranslateY; }
-#endif // !Win16
+    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; };

 
 

-public:
-    wxString        m_printerCommand;
-    wxString        m_previewCommand;
-    wxString        m_printerFlags;
-    wxString        m_printerFile;
-    int             m_printerOrient;
-    double          m_printerScaleX;
-    double          m_printerScaleY;
-    wxCoord         m_printerTranslateX;
-    wxCoord         m_printerTranslateY;
-    // 1 = Preview, 2 = print to file, 3 = send to printer
-    int             m_printerMode;
-    wxString        m_afmPath;
-    // A name in the paper database (see paper.h)

     wxString        m_paperName;
     wxString        m_paperName;

-    bool            m_printColour;
-
-    DECLARE_DYNAMIC_CLASS(wxPrintSetupData)
+    wxString        m_printerFile;

 };
 
 WXDLLEXPORT_DATA(extern wxPrintSetupData*) wxThePrintSetupData;
 };
 
 WXDLLEXPORT_DATA(extern wxPrintSetupData*) wxThePrintSetupData;

-WXDLLEXPORT extern void wxInitializePrintSetupData(bool init = TRUE);
+WXDLLEXPORT extern void wxInitializePrintSetupData(bool init = true);
+#endif
+

 
 #endif
     // wxUSE_POSTSCRIPT
 
 #endif
     // wxUSE_POSTSCRIPT