[Libreoffice-commits] core.git: vcl/inc vcl/unx

[Caolán McNamara]

 vcl/inc/unx/gtk/gtkgdi.hxx                    |    1 -
 vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx |    8 +-------
 2 files changed, 1 insertion(+), 8 deletions(-)

New commits:
commit 1cdf1e90390bda6b059a4fa844e68619a00dd8a6
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Wed Mar 4 17:10:35 2015 +0000

    damaged does the same gtk_widget_queue_draw_area with -1 top and +2 dimension
    
    Change-Id: I86428b381680455dfd8dcb2ef28decfd4063fe59

diff --git a/vcl/inc/unx/gtk/gtkgdi.hxx b/vcl/inc/unx/gtk/gtkgdi.hxx
index 28e3f7b..b9ec78f 100644
--- a/vcl/inc/unx/gtk/gtkgdi.hxx
+++ b/vcl/inc/unx/gtk/gtkgdi.hxx
@@ -78,7 +78,6 @@ private:
     static GtkStyleContext *mpComboboxStyle;
     static GtkStyleContext *mpListboxStyle;
 
-    void queue_draw_area(cairo_rectangle_int_t *region);
     void getStyleContext( GtkStyleContext** style, GtkWidget* widget );
     Rectangle NWGetScrollButtonRect( ControlPart nPart, Rectangle aAreaRect );
     Rectangle NWGetSpinButtonRect( ControlPart nPart, Rectangle aAreaRect);
diff --git a/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx b/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx
index c54657b..c86bac58 100644
--- a/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx
+++ b/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx
@@ -963,17 +963,11 @@ bool GtkSalGraphics::drawNativeControl( ControlType nType, ControlPart nPart, co
     }
 
     cairo_destroy(cr); // unref
-    queue_draw_area(&translatedRegion);
+    mpFrame->damaged(basegfx::B2IBox(rControlRegion.Left(), rControlRegion.Top(), rControlRegion.Right(), rControlRegion.Bottom()));
 
     return true;
 }
 
-void GtkSalGraphics::queue_draw_area(cairo_rectangle_int_t *region)
-{
-    if (!mpFrame->isDuringRender())
-        gtk_widget_queue_draw_area(mpFrame->getWindow(), region->x, region->y, region->width, region->height);
-}
-
 bool GtkSalGraphics::getNativeControlRegion( ControlType nType, ControlPart nPart, const Rectangle& rControlRegion, ControlState,
                                                 const ImplControlValue&, const OUString&,
                                                 Rectangle &rNativeBoundingRegion, Rectangle &rNativeContentRegion )