Test using wxString::ToCDouble() in wxAny.

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

diff --git a/include/wx/graphics.h b/include/wx/graphics.h
index ad0206e2d30fd6129924078f65ee960a29b48ae2..656a338d3bdbbda37b3cbb3ec4fae42d7ce0edab 100644 (file)
--- a/include/wx/graphics.h
+++ b/include/wx/graphics.h
@@ -107,6 +107,7 @@ class WXDLLIMPEXP_FWD_CORE wxGraphicsBitmap;
 //
 
 class WXDLLIMPEXP_FWD_CORE wxGraphicsObjectRefData;
 //
 
 class WXDLLIMPEXP_FWD_CORE wxGraphicsObjectRefData;

+class WXDLLIMPEXP_FWD_CORE wxGraphicsBitmapData;

 class WXDLLIMPEXP_FWD_CORE wxGraphicsMatrixData;
 class WXDLLIMPEXP_FWD_CORE wxGraphicsPathData;
 
 class WXDLLIMPEXP_FWD_CORE wxGraphicsMatrixData;
 class WXDLLIMPEXP_FWD_CORE wxGraphicsPathData;
 


@@ -174,6 +175,13 @@ public:
 #if wxUSE_IMAGE
     wxImage ConvertToImage() const;
 #endif // wxUSE_IMAGE
 #if wxUSE_IMAGE
     wxImage ConvertToImage() const;
 #endif // wxUSE_IMAGE

+    
+    void* GetNativeBitmap() const;
+
+    const wxGraphicsBitmapData* GetBitmapData() const
+    { return (const wxGraphicsBitmapData*) GetRefData(); }
+    wxGraphicsBitmapData* GetBitmapData()
+    { return (wxGraphicsBitmapData*) GetRefData(); }

 
 private:
     DECLARE_DYNAMIC_CLASS(wxGraphicsBitmap)
 
 private:
     DECLARE_DYNAMIC_CLASS(wxGraphicsBitmap)


@@ -557,7 +565,7 @@ public:
     virtual bool SetCompositionMode(wxCompositionMode op) = 0;
 
     // returns the size of the graphics context in device coordinates
     virtual bool SetCompositionMode(wxCompositionMode op) = 0;
 
     // returns the size of the graphics context in device coordinates

-    void GetSize(wxDouble* width, wxDouble* height)
+    void GetSize(wxDouble* width, wxDouble* height) const

     {
         if ( width )
             *width = m_width;
     {
         if ( width )
             *width = m_width;