correct typo in one of the last changes

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

diff --git a/src/gtk/dcclient.cpp b/src/gtk/dcclient.cpp
index 1c3227b106635e978f51055176f79a691f6e0b8c..a7c10579f31d5db6518ad9b118c4183228343728 100644 (file)
--- a/src/gtk/dcclient.cpp
+++ b/src/gtk/dcclient.cpp
@@ -28,6 +28,7 @@
 #include "wx/fontutil.h"
 
 #include "wx/gtk/private.h"
 #include "wx/fontutil.h"
 
 #include "wx/gtk/private.h"

+#include "wx/gtk/private/object.h"

 
 #include <gdk/gdkx.h>
 
 
 #include <gdk/gdkx.h>
 


@@ -954,6 +955,14 @@ void wxWindowDCImpl::DoDrawEllipse( wxCoord x, wxCoord y, wxCoord width, wxCoord
             bool originChanged;
             DrawingSetup(gc, originChanged);
 
             bool originChanged;
             DrawingSetup(gc, originChanged);
 

+            // If the pen is transparent pen we increase the size
+            // for better compatibility with other platforms.
+            if (m_pen.GetStyle() == wxPENSTYLE_TRANSPARENT)
+            {
+                ++ww;
+                ++hh;
+            }
+

             gdk_draw_arc(m_gdkwindow, gc, true, xx, yy, ww, hh, 0, 360*64);
 
             if (originChanged)
             gdk_draw_arc(m_gdkwindow, gc, true, xx, yy, ww, hh, 0, 360*64);
 
             if (originChanged)


@@ -961,7 +970,7 @@ void wxWindowDCImpl::DoDrawEllipse( wxCoord x, wxCoord y, wxCoord width, wxCoord
         }
 
         if (m_pen.GetStyle() != wxPENSTYLE_TRANSPARENT)
         }
 
         if (m_pen.GetStyle() != wxPENSTYLE_TRANSPARENT)

-            gdk_draw_arc( m_gdkwindow, m_penGC, FALSE, xx, yy, ww, hh, 0, 360*64 );
+            gdk_draw_arc( m_gdkwindow, m_penGC, false, xx, yy, ww, hh, 0, 360*64 );

     }
 
     CalcBoundingBox( x, y );
     }
 
     CalcBoundingBox( x, y );


@@ -1000,18 +1009,15 @@ void wxWindowDCImpl::DoDrawMonoBitmap(const wxBitmap& bitmap,
                                       int xdest, int ydest,
                                       int width, int height)
 {
                                       int xdest, int ydest,
                                       int width, int height)
 {

-    GdkPixmap *bitmap2
-        = gdk_pixmap_new( wxGetRootWindow()->window, bmp_w, bmp_h, -1 );
-    GdkGC *gc = gdk_gc_new( bitmap2 );
+    wxGtkObject<GdkPixmap>
+        bitmap2(gdk_pixmap_new( wxGetRootWindow()->window, bmp_w, bmp_h, -1 ));
+    wxGtkObject<GdkGC> gc(gdk_gc_new( bitmap2 ));

     gdk_gc_set_foreground( gc, m_textForegroundColour.GetColor() );
     gdk_gc_set_background( gc, m_textBackgroundColour.GetColor() );
     gdk_wx_draw_bitmap(bitmap2, gc, bitmap.GetPixmap(), 0, 0);
 
     gdk_draw_drawable(m_gdkwindow, m_textGC, bitmap2, xsrc, ysrc, xdest, ydest,
                       width, height);
     gdk_gc_set_foreground( gc, m_textForegroundColour.GetColor() );
     gdk_gc_set_background( gc, m_textBackgroundColour.GetColor() );
     gdk_wx_draw_bitmap(bitmap2, gc, bitmap.GetPixmap(), 0, 0);
 
     gdk_draw_drawable(m_gdkwindow, m_textGC, bitmap2, xsrc, ysrc, xdest, ydest,
                       width, height);

-
-    g_object_unref (bitmap2);
-    g_object_unref (gc);

 }
 
 // Returns a new mask that is the intersection of the old mask
 }
 
 // Returns a new mask that is the intersection of the old mask


@@ -1026,7 +1032,7 @@ GdkBitmap* wxWindowDCImpl::GetClippedMask(GdkBitmap* mask, int w, int h,
     GdkColor c0, c1;
     c0.pixel = 0;
     c1.pixel = 1;
     GdkColor c0, c1;
     c0.pixel = 0;
     c1.pixel = 1;

-    GdkGC *gc = gdk_gc_new( new_mask );
+    wxGtkObject<GdkGC> gc(gdk_gc_new( new_mask ));

 
     // zero-ing new_mask
     gdk_gc_set_foreground( gc, &c0 );
 
     // zero-ing new_mask
     gdk_gc_set_foreground( gc, &c0 );


@@ -1044,7 +1050,6 @@ GdkBitmap* wxWindowDCImpl::GetClippedMask(GdkBitmap* mask, int w, int h,
     gdk_gc_set_stipple( gc, mask );
     gdk_draw_rectangle( new_mask, gc, TRUE, 0, 0, w, h );
 
     gdk_gc_set_stipple( gc, mask );
     gdk_draw_rectangle( new_mask, gc, TRUE, 0, 0, w, h );
 

-    g_object_unref (gc);

     return new_mask;
 }
 
     return new_mask;
 }
 


@@ -1065,9 +1070,6 @@ void wxWindowDCImpl::DoDrawBitmap( const wxBitmap &bitmap,
     int w = bitmap.GetWidth();
     int h = bitmap.GetHeight();
 
     int w = bitmap.GetWidth();
     int h = bitmap.GetHeight();
 

-    if (m_window && m_window->GetLayoutDirection() == wxLayout_RightToLeft)
-        xx -= w;
-

     CalcBoundingBox( x, y );
     CalcBoundingBox( x + w, y + h );
 
     CalcBoundingBox( x, y );
     CalcBoundingBox( x + w, y + h );
 


@@ -1076,6 +1078,9 @@ void wxWindowDCImpl::DoDrawBitmap( const wxBitmap &bitmap,
     int ww = XLOG2DEVREL(w);
     int hh = YLOG2DEVREL(h);
 
     int ww = XLOG2DEVREL(w);
     int hh = YLOG2DEVREL(h);
 

+    if (m_window && m_window->GetLayoutDirection() == wxLayout_RightToLeft)
+        xx -= ww;
+

     if (IsOutsideOfClippingRegion( xx,yy,ww,hh ))
         return;
 
     if (IsOutsideOfClippingRegion( xx,yy,ww,hh ))
         return;