derive wxConfig classes from wxObject and add wxRTTI macros to them (patch 1587607)

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

diff --git a/include/wx/dcgraph.h b/include/wx/dcgraph.h
index 894e33ea56d58ba9eb4f920930632972c5287af3..9115ec0af40376a87673da0431c21599d1a78aa9 100755 (executable)
--- a/include/wx/dcgraph.h
+++ b/include/wx/dcgraph.h
@@ -16,20 +16,19 @@
 
 #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 WXDLLEXPORT wxWindowDC;
 

-

 #ifdef __WXMAC__
 #define wxGCDC wxDC
 #endif
 
 class WXDLLEXPORT wxGCDC: 
 #ifdef __WXMAC__
 #ifdef __WXMAC__
 #define wxGCDC wxDC
 #endif
 
 class WXDLLEXPORT wxGCDC: 
 #ifdef __WXMAC__

-       public wxDCBase
+    public wxDCBase

 #else
 #else

-       public wxDC
+    public wxDC

 #endif
 {
     DECLARE_DYNAMIC_CLASS(wxGCDC)
 #endif
 {
     DECLARE_DYNAMIC_CLASS(wxGCDC)


@@ -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();
 


@@ -85,9 +87,9 @@ public:
 
     virtual void ComputeScaleAndOrigin();
 
 
     virtual void ComputeScaleAndOrigin();
 

-    wxGraphicsContext* GetGraphicContext() { return m_graphicContext; }
-       virtual void SetGraphicsContext( wxGraphicsContext* ctx )
-               { delete m_graphicContext; m_graphicContext = ctx; }
+    wxGraphicsContext* GetGraphicsContext() { return m_graphicContext; }
+    virtual void SetGraphicsContext( wxGraphicsContext* ctx );
+    

 protected:
     // the true implementations
     virtual bool DoFloodFill(wxCoord x, wxCoord y, const wxColour& col,
 protected:
     // the true implementations
     virtual bool DoFloodFill(wxCoord x, wxCoord y, const wxColour& col,


@@ -169,9 +171,12 @@ protected:
 
 protected:
     // scaling variables
 
 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;

-       
-       double m_formerScaleX, m_formerScaleY;
+    wxGraphicsMatrix m_matrixOriginal;
+    wxGraphicsMatrix m_matrixCurrent;
+
+    double m_formerScaleX, m_formerScaleY;

 
     wxGraphicsContext* m_graphicContext;
 };
 
     wxGraphicsContext* m_graphicContext;
 };