synchronize GTK2 minimum version in docs

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

diff --git a/include/wx/dcgraph.h b/include/wx/dcgraph.h
index df10beeb96a039e04771e809abe42051b9121375..c0fa7451b1193fd550d80392142834daef1d088d 100644 (file)
--- a/include/wx/dcgraph.h
+++ b/include/wx/dcgraph.h
@@ -29,10 +29,15 @@ public:
 #if wxUSE_PRINTING_ARCHITECTURE
     wxGCDC( const wxPrinterDC& dc );
 #endif
 #if wxUSE_PRINTING_ARCHITECTURE
     wxGCDC( const wxPrinterDC& dc );
 #endif

+#if defined(__WXMSW__) && wxUSE_ENH_METAFILE
+    wxGCDC( const wxEnhMetaFileDC& dc );
+#endif
+    wxGCDC(wxGraphicsContext* context);
+    

     wxGCDC();
     virtual ~wxGCDC();
 
     wxGCDC();
     virtual ~wxGCDC();
 

-    wxGraphicsContext* GetGraphicsContext();
+    wxGraphicsContext* GetGraphicsContext() const;

     void SetGraphicsContext( wxGraphicsContext* ctx );
 
 #ifdef __WXMSW__
     void SetGraphicsContext( wxGraphicsContext* ctx );
 
 #ifdef __WXMSW__


@@ -55,6 +60,9 @@ public:
     wxGCDCImpl( wxDC *owner, const wxMemoryDC& dc );
 #if wxUSE_PRINTING_ARCHITECTURE
     wxGCDCImpl( wxDC *owner, const wxPrinterDC& dc );
     wxGCDCImpl( wxDC *owner, const wxMemoryDC& dc );
 #if wxUSE_PRINTING_ARCHITECTURE
     wxGCDCImpl( wxDC *owner, const wxPrinterDC& dc );

+#endif
+#if defined(__WXMSW__) && wxUSE_ENH_METAFILE
+    wxGCDCImpl( wxDC *owner, const wxEnhMetaFileDC& dc );

 #endif
     wxGCDCImpl( wxDC *owner );
 
 #endif
     wxGCDCImpl( wxDC *owner );
 


@@ -94,8 +102,6 @@ public:
     virtual int GetDepth() const;
     virtual wxSize GetPPI() const;
 
     virtual int GetDepth() const;
     virtual wxSize GetPPI() const;
 

-    virtual void SetMapMode(wxMappingMode mode);
-

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


@@ -103,7 +109,7 @@ public:
 
     virtual void ComputeScaleAndOrigin();
 
 
     virtual void ComputeScaleAndOrigin();
 

-    wxGraphicsContext* GetGraphicsContext() { return m_graphicContext; }
+    wxGraphicsContext* GetGraphicsContext() const { return m_graphicContext; }

     virtual void SetGraphicsContext( wxGraphicsContext* ctx );
 
     // the true implementations
     virtual void SetGraphicsContext( wxGraphicsContext* ctx );
 
     // the true implementations


@@ -193,10 +199,13 @@ public:
 
     virtual bool DoGetPartialTextExtents(const wxString& text, wxArrayInt& widths) const;
 
 
     virtual bool DoGetPartialTextExtents(const wxString& text, wxArrayInt& widths) const;
 

+#ifdef __WXMSW__
+    virtual wxRect MSWApplyGDIPlusTransform(const wxRect& r) const;
+#endif // __WXMSW__
+

 protected:
     // scaling variables
     bool m_logicalFunctionSupported;
 protected:
     // scaling variables
     bool m_logicalFunctionSupported;

-    double       m_mm_to_pix_x, m_mm_to_pix_y;

     wxGraphicsMatrix m_matrixOriginal;
     wxGraphicsMatrix m_matrixCurrent;
 
     wxGraphicsMatrix m_matrixOriginal;
     wxGraphicsMatrix m_matrixCurrent;