revert some stuff for 1.6

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

diff --git a/include/wx/generic/dcpsg.h b/include/wx/generic/dcpsg.h
index ae569a4a6324da8b99cf32f47a56548307aa8372..234feb4a469d72df704234392bafea55725cf188 100644 (file)
--- a/include/wx/generic/dcpsg.h
+++ b/include/wx/generic/dcpsg.h
@@ -42,16 +42,10 @@ public:
 
     // Recommended constructor
     wxPostScriptDC(const wxPrintData& printData);
-  
+
     // Recommended destructor :-)
     ~wxPostScriptDC();
 
-#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 void BeginDrawing() {}
@@ -67,7 +61,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 DoDrawPolyPolygon(int n, int start[], 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);
@@ -75,12 +69,12 @@ public:
   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,
-            wxCoord xsrcMask = -1, wxCoord ysrcMask = -1);
-  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 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 DoDrawRotatedText(const wxString& text, wxCoord x, wxCoord y, double angle);
@@ -104,7 +98,7 @@ public:
 
   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,
@@ -126,7 +120,7 @@ public:
   void SetPrintData(const wxPrintData& data) { m_printData = data; }
 
   virtual int GetDepth() const { return 24; }
-  
+
   static void SetResolution(int ppi);
   static int GetResolution();
 
@@ -138,15 +132,10 @@ public:
   void PsPrint( const wxChar* psdata ) { PsPrint( wxConvUTF8.cWX2MB( psdata ) ); }
 #endif
 
-private:  
+private:
     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;
@@ -158,55 +147,11 @@ protected:
     double            m_underlinePosition;
     double            m_underlineThickness;
     wxPrintData       m_printData;
-    
+
 private:
     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