[Libreoffice-commits] .: vcl/unx

Michael Meeks mmeeks at kemper.freedesktop.org
Fri Jan 28 05:46:57 PST 2011


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

New commits:
commit ad7584a2acbfe42e005188e2379bda49a7e880e2
Author: Lucas Baudin <xapantu at gmail.com>
Date:   Fri Jan 28 13:44:56 2011 +0000

    fix fdo#33473: bin duff 'togglebutton' detail hurting Ambience theme.
    
    cf. https://webstats.gnome.org/GTK%2B/ThemingInternals
    (GtkToggleButton is a subclass of GtkButton)

diff --git a/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx b/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
index 3d56218..f94a9e3 100644
--- a/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
+++ b/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
@@ -2516,7 +2516,6 @@ BOOL GtkSalGraphics::NWPaintGTKToolbar(
     gint            g_x=0, g_y=0, g_w=10, g_h=10;
     bool            bPaintButton = true;
     GtkWidget*      pButtonWidget = gWidgetData[m_nScreen].gToolbarButtonWidget;
-    const gchar*    pButtonDetail = "button";
     GdkRectangle	clipRect;
 
     NWEnsureGTKToolbar( m_nScreen );
@@ -2579,7 +2578,6 @@ BOOL GtkSalGraphics::NWPaintGTKToolbar(
             // cf. gtk+/gtk/gtktogglebutton.c (gtk_toggle_button_update_state)
             if( ! (nState & (CTRL_STATE_PRESSED|CTRL_STATE_ROLLOVER)) )
                 stateType = GTK_STATE_ACTIVE;
-            pButtonDetail = "togglebutton";
             bPaintButton = true;
         }
 
@@ -2639,7 +2637,7 @@ BOOL GtkSalGraphics::NWPaintGTKToolbar(
                                stateType,
                                shadowType,
                                &clipRect,
-                               pButtonWidget, pButtonDetail, x, y, w, h );
+                               pButtonWidget, "button", x, y, w, h );
             }
         }
     }


More information about the Libreoffice-commits mailing list