graphics context additions and merging graphics bitmap additions from Kevin O.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@52342 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/common/dcgraph.cpp b/src/common/dcgraph.cpp
index 2dc10c9a3de21b4bf6bb75ffa2c0baecd28f8cd3..14584924bafa9e8a30154bf745db52fcce17f91f 100644 (file)
--- a/src/common/dcgraph.cpp
+++ b/src/common/dcgraph.cpp
@@ -952,8 +952,13 @@ void wxGCDCImpl::Clear(void)
 
 void wxGCDCImpl::DoGetSize(int *width, int *height) const
 {
 
 void wxGCDCImpl::DoGetSize(int *width, int *height) const
 {

-    *width = 10000;
-    *height = 10000;
+    wxCHECK_RET( IsOk(), wxT("wxGCDC(cg)::DoGetSize - invalid DC") );
+    wxDouble w,h;
+    m_graphicContext->GetSize( &w, &h );
+    if ( height )
+        *height = (int) (h+0.5);
+    if ( width )
+        *width = (int) (w+0.5);

 }
 
 void wxGCDCImpl::DoGradientFillLinear(const wxRect& rect,
 }
 
 void wxGCDCImpl::DoGradientFillLinear(const wxRect& rect,