source id type is unsigned; minor cleanup

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

diff --git a/include/wx/dcgraph.h b/include/wx/dcgraph.h
index 3805a4a7e1511c62e5a7eccd19609456201209ca..9115ec0af40376a87673da0431c21599d1a78aa9 100755 (executable)
--- a/include/wx/dcgraph.h
+++ b/include/wx/dcgraph.h
@@ -16,11 +16,10 @@
 
 #include "wx/geometry.h"
 #include "wx/dynarray.h"
+#include "wx/graphics.h"
 
-class WXDLLEXPORT wxGraphicsContext;
 class WXDLLEXPORT wxWindowDC;
 
-
 #ifdef __WXMAC__
 #define wxGCDC wxDC
 #endif
@@ -37,6 +36,9 @@ class WXDLLEXPORT wxGCDC:
 
 public:
     wxGCDC(const wxWindowDC& dc);
+#ifdef __WXMSW__
+    wxGCDC( const wxMemoryDC& dc);
+#endif    
     wxGCDC();
     virtual ~wxGCDC();
 
@@ -169,7 +171,10 @@ protected:
 
 protected:
     // scaling variables
+    bool m_logicalFunctionSupported;
     double       m_mm_to_pix_x, m_mm_to_pix_y;
+    wxGraphicsMatrix m_matrixOriginal;
+    wxGraphicsMatrix m_matrixCurrent;
 
     double m_formerScaleX, m_formerScaleY;