Lots of updates for color dialog and sliders

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

diff --git a/include/wx/generic/dcpsg.h b/include/wx/generic/dcpsg.h
index 184092f593c9f54dfb52bf189b9af41371724c5d..049af7267fe259cdb1987272681c94ec0a8e3f81 100644 (file)
--- a/include/wx/generic/dcpsg.h
+++ b/include/wx/generic/dcpsg.h
@@ -12,7 +12,7 @@
 #define _WX_DCPSG_H_
 
 #ifdef __GNUG__
-#pragma interface
+#pragma interface "dcpsg.h"
 #endif
 
 #include "wx/dc.h"
@@ -62,7 +62,7 @@ public:
   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);
@@ -79,13 +79,15 @@ 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);
+            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 );
+  void DoDrawRotatedText(const wxString& text, wxCoord x, wxCoord y, double angle);
 
   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; }
+  
+  static void SetResolution(int ppi);
+  static int GetResolution();
+  
+private:  
+  static float ms_PSScaleFactor;
 
 protected: