added wxTreeCtrl::AssignImageList

[wxWidgets.git] / src / gtk / dcclient.cpp

diff --git a/src/gtk/dcclient.cpp b/src/gtk/dcclient.cpp
index 0cad4913f8f4ddfcc1dc3d43f3576fd44c579550..f0a96e569430f4bec5decccb2f4ee43015ffb7c3 100644 (file)
--- a/src/gtk/dcclient.cpp
+++ b/src/gtk/dcclient.cpp
@@ -11,6 +11,10 @@
 #pragma implementation "dcclient.h"
 #endif
 
 #pragma implementation "dcclient.h"
 #endif
 

+#ifdef __VMS
+#define XCopyPlane XCOPYPLANE
+#endif
+

 #include "wx/dcclient.h"
 #include "wx/dcmemory.h"
 #include "wx/image.h"
 #include "wx/dcclient.h"
 #include "wx/dcmemory.h"
 #include "wx/image.h"


@@ -522,7 +526,12 @@ void wxWindowDC::DoDrawArc( wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2,
         }
 
         if (m_pen.GetStyle() != wxTRANSPARENT)
         }
 
         if (m_pen.GetStyle() != wxTRANSPARENT)

+        {

             gdk_draw_arc( m_window, m_penGC, FALSE, xxc-r, yyc-r, 2*r,2*r, alpha1, alpha2 );
             gdk_draw_arc( m_window, m_penGC, FALSE, xxc-r, yyc-r, 2*r,2*r, alpha1, alpha2 );

+            
+            gdk_draw_line( m_window, m_penGC, xx1, yy1, xxc, yyc );
+            gdk_draw_line( m_window, m_penGC, xxc, yyc, xx2, yy2 );
+        }

     }
 
     CalcBoundingBox (x1, y1);
     }
 
     CalcBoundingBox (x1, y1);


@@ -545,7 +554,7 @@ void wxWindowDC::DoDrawEllipticArc( wxCoord x, wxCoord y, wxCoord width, wxCoord
     if (m_window)
     {
         wxCoord start = wxCoord(sa * 64.0);
     if (m_window)
     {
         wxCoord start = wxCoord(sa * 64.0);

-        wxCoord end = wxCoord(ea * 64.0);
+        wxCoord end = wxCoord((ea-sa) * 64.0);

 
         if (m_brush.GetStyle() != wxTRANSPARENT)
         {
 
         if (m_brush.GetStyle() != wxTRANSPARENT)
         {