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

[Ivan Timofeev]

 vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 6ea3aa6aae980156529d007a107373bbd37dcee6
Author: Ivan Timofeev <timofeev.i.s at gmail.com>
Date:   Tue Aug 20 17:51:58 2013 +0400

    gtk: use frame widget for frame rendering
    
    otherwise I get ugly two-color frames with the Adwaita theme.
    
    Change-Id: Ibac1df9759148f89954e13051e3d6e64db30a2af

diff --git a/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx b/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
index e3bff2a..a80112d 100644
--- a/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
+++ b/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
@@ -1187,7 +1187,7 @@ sal_Bool GtkSalGraphics::getNativeControlRegion(  ControlType nType,
     }
     if( nType == CTRL_FRAME && nPart == PART_BORDER )
     {
-        int frameWidth = getFrameWidth(m_pWindow);
+        int frameWidth = getFrameWidth(gWidgetData[m_nXScreen].gFrame);
         rNativeBoundingRegion = rControlRegion;
         sal_uInt16 nStyle = aValue.getNumericVal();
         int x1=rControlRegion.Left();
@@ -1308,7 +1308,7 @@ sal_Bool GtkSalGraphics::NWPaintGTKFrame(
             const OUString& )
 {
     GdkRectangle clipRect;
-    int frameWidth=getFrameWidth(m_pWindow);
+    int frameWidth=getFrameWidth(gWidgetData[m_nXScreen].gFrame);
     GtkShadowType shadowType=GTK_SHADOW_IN;
     sal_uInt16 nStyle = aValue.getNumericVal();
     if( nStyle & FRAME_DRAW_IN )
@@ -1355,8 +1355,8 @@ sal_Bool GtkSalGraphics::NWPaintGTKFrame(
                          rControlRectangle.GetHeight());
 
         // Now render the frame
-        gtk_paint_shadow(m_pWindow->style,gdkDrawable,GTK_STATE_NORMAL,shadowType,&clipRect,
-                         m_pWindow,"base",
+        gtk_paint_shadow(gWidgetData[m_nXScreen].gFrame->style,gdkDrawable,GTK_STATE_NORMAL,shadowType,&clipRect,
+                         gWidgetData[m_nXScreen].gFrame,"base",
                          rControlRectangle.Left(),
                          rControlRectangle.Top(),
                          rControlRectangle.GetWidth(),