fixed off by one error in wxXPMDecoder::ReadFile

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

diff --git a/include/wx/generic/dcpsg.h b/include/wx/generic/dcpsg.h
index 184092f593c9f54dfb52bf189b9af41371724c5d..fb1b61bce2164d3d593241e79f7be324b22d85dd 100644 (file)
--- a/include/wx/generic/dcpsg.h
+++ b/include/wx/generic/dcpsg.h
@@ -79,13 +79,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);
+            wxDC *source, wxCoord xsrc, wxCoord ysrc, int rop = wxCOPY, bool useMask = FALSE,
+            wxCoord xsrcMask = -1, wxCoord ysrcMask = -1);

   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 DoDrawText(const wxString& text, wxCoord x, wxCoord y );
   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 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 );


@@ -128,6 +130,12 @@ public:
   void SetPrintData(const wxPrintData& data) { m_printData = data; }
 
   virtual int GetDepth() const { return 24; }
   void SetPrintData(const wxPrintData& data) { m_printData = data; }
 
   virtual int GetDepth() const { return 24; }

+  
+  static void SetResolution(int ppi);
+  static int GetResolution();
+  
+private:  
+  static float ms_PSScaleFactor;

 
 protected:
 
 
 protected: