Better fix

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

diff --git a/include/wx/dcgraph.h b/include/wx/dcgraph.h
index 61d7104efafad7573acef15f47465c623c28808b..d51692eb4f457ae3e6fe10ca0ecf7c6d62f79a41 100644 (file)
--- a/include/wx/dcgraph.h
+++ b/include/wx/dcgraph.h
@@ -14,8 +14,8 @@
 
 #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;


@@ -27,17 +27,16 @@ public:
     wxGCDC( const wxWindowDC& dc );
     wxGCDC( const wxMemoryDC& dc );
     wxGCDC();
     wxGCDC( const wxWindowDC& dc );
     wxGCDC( const wxMemoryDC& dc );
     wxGCDC();

-    
+    virtual ~wxGCDC();
+ 

     wxGraphicsContext* GetGraphicsContext();
     void SetGraphicsContext( wxGraphicsContext* ctx );
     
     wxGraphicsContext* GetGraphicsContext();
     void SetGraphicsContext( wxGraphicsContext* ctx );
     

-private:

     DECLARE_DYNAMIC_CLASS(wxGCDC)
     DECLARE_NO_COPY_CLASS(wxGCDC)
 };
 
 
     DECLARE_DYNAMIC_CLASS(wxGCDC)
     DECLARE_NO_COPY_CLASS(wxGCDC)
 };
 
 

-

 class WXDLLEXPORT wxGCDCImpl: public wxDCImpl
 {
 public:
 class WXDLLEXPORT wxGCDCImpl: public wxDCImpl
 {
 public:


@@ -82,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);


@@ -98,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);


@@ -196,11 +189,9 @@ protected:
 
     wxGraphicsContext* m_graphicContext;
     
 
     wxGraphicsContext* m_graphicContext;
     

-private:

     DECLARE_CLASS(wxGCDCImpl)
     DECLARE_NO_COPY_CLASS(wxGCDCImpl)
 };
 
     DECLARE_CLASS(wxGCDCImpl)
     DECLARE_NO_COPY_CLASS(wxGCDCImpl)
 };
 

-#endif
-
+#endif // wxUSE_GRAPHICS_CONTEXT

 #endif // _WX_GRAPHICS_DC_H_
 #endif // _WX_GRAPHICS_DC_H_