fixed memory leak in wxXmlResource introduced when fixing wxVector<> usage (patch...

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

diff --git a/include/wx/dcgraph.h b/include/wx/dcgraph.h
index 2359129d76ba0c85eacf5cac1ac1c379213edaff..d51692eb4f457ae3e6fe10ca0ecf7c6d62f79a41 100644 (file)
--- a/include/wx/dcgraph.h
+++ b/include/wx/dcgraph.h
@@ -14,33 +14,37 @@
 
 #if wxUSE_GRAPHICS_CONTEXT
 
 
 #if wxUSE_GRAPHICS_CONTEXT
 

+#include "wx/dc.h"

 #include "wx/geometry.h"
 #include "wx/geometry.h"

-#include "wx/dynarray.h"

 #include "wx/graphics.h"
 
 class WXDLLIMPEXP_FWD_CORE wxWindowDC;
 
 #include "wx/graphics.h"
 
 class WXDLLIMPEXP_FWD_CORE wxWindowDC;
 

-#ifdef __WXMAC__
-#define wxGCDC wxDC
-#endif

 
 

-class WXDLLEXPORT wxGCDC: 
-#ifdef __WXMAC__
-    public wxDCBase
-#else
-    public wxDC
-#endif
+class WXDLLEXPORT wxGCDC: public wxDC

 {
 {

+public:
+    wxGCDC( const wxWindowDC& dc );
+    wxGCDC( const wxMemoryDC& dc );
+    wxGCDC();
+    virtual ~wxGCDC();
+ 
+    wxGraphicsContext* GetGraphicsContext();
+    void SetGraphicsContext( wxGraphicsContext* ctx );
+    

     DECLARE_DYNAMIC_CLASS(wxGCDC)
     DECLARE_NO_COPY_CLASS(wxGCDC)
     DECLARE_DYNAMIC_CLASS(wxGCDC)
     DECLARE_NO_COPY_CLASS(wxGCDC)

+};

 
 

+
+class WXDLLEXPORT wxGCDCImpl: public wxDCImpl
+{

 public:
 public:

-    wxGCDC(const wxWindowDC& dc);
-#ifdef __WXMSW__
-    wxGCDC( const wxMemoryDC& dc);
-#endif    
-    wxGCDC();
-    virtual ~wxGCDC();
+    wxGCDCImpl( wxDC *owner, const wxWindowDC& dc );
+    wxGCDCImpl( wxDC *owner, const wxMemoryDC& dc );
+    wxGCDCImpl( wxDC *owner );
+    
+    virtual ~wxGCDCImpl();

 
     void Init();
 
 
     void Init();
 


@@ -50,11 +54,14 @@ public:
 
     virtual void Clear();
 
 
     virtual void Clear();
 

-    virtual bool StartDoc( const wxString& WXUNUSED(message) ) { return true; }
-    virtual void EndDoc(void) {}
+    virtual bool StartDoc( const wxString& message );
+    virtual void EndDoc();

 
 

-    virtual void StartPage(void) {}
-    virtual void EndPage(void) {}
+    virtual void StartPage();
+    virtual void EndPage();
+    
+    // flushing the content of this dc immediately onto screen
+    virtual void Flush();

 
     virtual void SetFont(const wxFont& font);
     virtual void SetPen(const wxPen& pen);
 
     virtual void SetFont(const wxFont& font);
     virtual void SetPen(const wxPen& pen);


@@ -74,12 +81,7 @@ public:
     virtual wxSize GetPPI() const;
 
     virtual void SetMapMode(int mode);
     virtual wxSize GetPPI() const;
 
     virtual void SetMapMode(int mode);

-    virtual void SetUserScale(double x, double y);

 
 

-    virtual void SetLogicalScale(double x, double y);
-    virtual void SetLogicalOrigin(wxCoord x, wxCoord y);
-    virtual void SetDeviceOrigin(wxCoord x, wxCoord y);
-    virtual void SetAxisOrientation(bool xLeftRight, bool yBottomUp);

     virtual void SetLogicalFunction(int function);
 
     virtual void SetTextForeground(const wxColour& colour);
     virtual void SetLogicalFunction(int function);
 
     virtual void SetTextForeground(const wxColour& colour);


@@ -90,7 +92,6 @@ public:
     wxGraphicsContext* GetGraphicsContext() { return m_graphicContext; }
     virtual void SetGraphicsContext( wxGraphicsContext* 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,
         int style = wxFLOOD_SURFACE);
     // the true implementations
     virtual bool DoFloodFill(wxCoord x, wxCoord y, const wxColour& col,
         int style = wxFLOOD_SURFACE);


@@ -187,8 +188,10 @@ protected:
     double m_formerScaleX, m_formerScaleY;
 
     wxGraphicsContext* m_graphicContext;
     double m_formerScaleX, m_formerScaleY;
 
     wxGraphicsContext* m_graphicContext;

+    
+    DECLARE_CLASS(wxGCDCImpl)
+    DECLARE_NO_COPY_CLASS(wxGCDCImpl)

 };
 
 };
 

-#endif
-
+#endif // wxUSE_GRAPHICS_CONTEXT

 #endif // _WX_GRAPHICS_DC_H_
 #endif // _WX_GRAPHICS_DC_H_