compilation fix for wxString::Format("no variadic arguments") and VC6

[wxWidgets.git] / include / wx / dcgraph.h

diff --git a/include/wx/dcgraph.h b/include/wx/dcgraph.h
old mode 100755 (executable)
new mode 100644 (file)
index 3805a4a..cce940f
--- a/include/wx/dcgraph.h
+++ b/include/wx/dcgraph.h
@@ -16,10 +16,9 @@
 
 #include "wx/geometry.h"
 #include "wx/dynarray.h"
 
 #include "wx/geometry.h"
 #include "wx/dynarray.h"

+#include "wx/graphics.h"

 
 

-class WXDLLEXPORT wxGraphicsContext;
-class WXDLLEXPORT wxWindowDC;
-
+class WXDLLIMPEXP_FWD_CORE wxWindowDC;

 
 #ifdef __WXMAC__
 #define wxGCDC wxDC
 
 #ifdef __WXMAC__
 #define wxGCDC wxDC


@@ -37,6 +36,9 @@ class WXDLLEXPORT wxGCDC:
 
 public:
     wxGCDC(const wxWindowDC& dc);
 
 public:
     wxGCDC(const wxWindowDC& dc);

+#ifdef __WXMSW__
+    wxGCDC( const wxMemoryDC& dc);
+#endif    

     wxGCDC();
     virtual ~wxGCDC();
 
     wxGCDC();
     virtual ~wxGCDC();
 


@@ -143,6 +145,14 @@ protected:
         wxDC *source, wxCoord xsrc, wxCoord ysrc,
         int rop = wxCOPY, bool useMask = false, wxCoord xsrcMask = -1, wxCoord ysrcMask = -1);
 
         wxDC *source, wxCoord xsrc, wxCoord ysrc,
         int rop = wxCOPY, bool useMask = false, wxCoord xsrcMask = -1, wxCoord ysrcMask = -1);
 

+    virtual bool DoStretchBlit(wxCoord xdest, wxCoord ydest,
+                               wxCoord dstWidth, wxCoord dstHeight,
+                               wxDC *source,
+                               wxCoord xsrc, wxCoord ysrc,
+                               wxCoord srcWidth, wxCoord srcHeight,
+                               int rop = wxCOPY, bool useMask = false,
+                               wxCoord xsrcMask = wxDefaultCoord, wxCoord ysrcMask = wxDefaultCoord);
+

     virtual void DoGetSize(int *,int *) const;
     virtual void DoGetSizeMM(int* width, int* height) const;
 
     virtual void DoGetSize(int *,int *) const;
     virtual void DoGetSizeMM(int* width, int* height) const;
 


@@ -163,13 +173,16 @@ protected:
         wxCoord *x, wxCoord *y,
         wxCoord *descent = NULL,
         wxCoord *externalLeading = NULL,
         wxCoord *x, wxCoord *y,
         wxCoord *descent = NULL,
         wxCoord *externalLeading = NULL,

-        wxFont *theFont = NULL) const;
+        const wxFont *theFont = NULL) const;

 
     virtual bool DoGetPartialTextExtents(const wxString& text, wxArrayInt& widths) const;
 
 protected:
     // scaling variables
 
     virtual bool DoGetPartialTextExtents(const wxString& text, wxArrayInt& widths) const;
 
 protected:
     // scaling variables

+    bool m_logicalFunctionSupported;

     double       m_mm_to_pix_x, m_mm_to_pix_y;
     double       m_mm_to_pix_x, m_mm_to_pix_y;

+    wxGraphicsMatrix m_matrixOriginal;
+    wxGraphicsMatrix m_matrixCurrent;

 
     double m_formerScaleX, m_formerScaleY;
 
 
     double m_formerScaleX, m_formerScaleY;