wxMenuItem code cleanup, removing duplicate and unneccessary code

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

diff --git a/include/wx/dcgraph.h b/include/wx/dcgraph.h
index 61d7104efafad7573acef15f47465c623c28808b..0c2dec47711bf24bd820826d1a0d5447c8714d05 100644 (file)
--- a/include/wx/dcgraph.h
+++ b/include/wx/dcgraph.h
@@ -14,35 +14,36 @@
 
 #if wxUSE_GRAPHICS_CONTEXT
 
+#include "wx/dc.h"
 #include "wx/geometry.h"
-#include "wx/dynarray.h"
 #include "wx/graphics.h"
 
 class WXDLLIMPEXP_FWD_CORE wxWindowDC;
 
 
-class WXDLLEXPORT wxGCDC: public wxDC
+class WXDLLIMPEXP_CORE wxGCDC: public wxDC
 {
 public:
     wxGCDC( const wxWindowDC& dc );
     wxGCDC( const wxMemoryDC& dc );
+    wxGCDC( const wxPrinterDC& dc );
     wxGCDC();
-    
+    virtual ~wxGCDC();
+ 
     wxGraphicsContext* GetGraphicsContext();
     void SetGraphicsContext( wxGraphicsContext* ctx );
     
-private:
     DECLARE_DYNAMIC_CLASS(wxGCDC)
     DECLARE_NO_COPY_CLASS(wxGCDC)
 };
 
 
-
-class WXDLLEXPORT wxGCDCImpl: public wxDCImpl
+class WXDLLIMPEXP_CORE wxGCDCImpl: public wxDCImpl
 {
 public:
     wxGCDCImpl( wxDC *owner, const wxWindowDC& dc );
     wxGCDCImpl( wxDC *owner, const wxMemoryDC& dc );
+    wxGCDCImpl( wxDC *owner, const wxPrinterDC& dc );
     wxGCDCImpl( wxDC *owner );
     
     virtual ~wxGCDCImpl();
@@ -82,12 +83,7 @@ public:
     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);
@@ -98,7 +94,6 @@ public:
     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);
@@ -173,7 +168,7 @@ protected:
         wxCoord xoffset, wxCoord yoffset,
         int fillStyle);
 
-    virtual void DoSetClippingRegionAsRegion(const wxRegion& region);
+    virtual void DoSetDeviceClippingRegion(const wxRegion& region);
     virtual void DoSetClippingRegion(wxCoord x, wxCoord y,
         wxCoord width, wxCoord height);
 
@@ -196,11 +191,9 @@ protected:
 
     wxGraphicsContext* m_graphicContext;
     
-private:
     DECLARE_CLASS(wxGCDCImpl)
     DECLARE_NO_COPY_CLASS(wxGCDCImpl)
 };
 
-#endif
-
+#endif // wxUSE_GRAPHICS_CONTEXT
 #endif // _WX_GRAPHICS_DC_H_