Fix additional GTK theme engine problems

git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/gtk-qt-engine@1259599 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

src/qt_qt_wrapper.cpp

@@ -2091,7 +2091,7 @@ void setRcProperties(GtkRcStyle* rc_style, int forceRecreate)
 	stream << parse_rc_string("GtkButton::default-border = { 0, 0, 0, 0 }", "*");
 	stream << parse_rc_string("GtkButton::default-outside-border = {0, 0, 0, 0}", "*");
 #ifdef USE_NATIVE_GTK_BUTTON_DRAWING
-	stream << parse_rc_string("GtkButton::inner-border = {0, 0, 0, 0}", "*");
+	stream << parse_rc_string("GtkButton::inner-border = {2, 2, 2, 2}", "*");
 #else
 	if (tde_showIconsOnPushButtons) {
 		stream << parse_rc_string("GtkButton::inner-border = {10, 10, 2, 2}", "*");	// Allow space for the icon on either side of the text
@@ -2116,6 +2116,9 @@ void setRcProperties(GtkRcStyle* rc_style, int forceRecreate)
 	stream << parse_rc_string("ythickness = 1", "*.GtkButton");
 	stream << parse_rc_string("fg[NORMAL] = {0, 0, 0}", "gtk-tooltips.GtkLabel", false);
 
+	stream << parse_rc_string("xthickness = 1", "*.GtkButton.*");
+	stream << parse_rc_string("ythickness = 1", "*.GtkButton.*");
+
 	stream << parse_rc_string("GtkButton::inner-border = {0, 0, 0, 0}", "*GtkToolbar*GtkButton*");
 	stream << parse_rc_string("GtkButton::inner-border = {0, 0, 0, 0}", "*GtkToolbar*GtkToggleButton*");
 	stream << parse_rc_string("GtkButton::inner-border = {0, 0, 0, 0}", "*GtkNotebook*GtkButton*");

src/qt_qt_wrapper.h

@@ -8,7 +8,7 @@
 #include <gtk/gtkbutton.h>
 #include <gtk/gtkprogressbar.h>
 
-// #define USE_NATIVE_GTK_BUTTON_DRAWING 1
+#define USE_NATIVE_GTK_BUTTON_DRAWING 1
 #define FORCE_RELOAD_THEMES_ON_STARTUP 1
 
 #ifdef __cplusplus

src/qt_theme_draw.c

@@ -1997,7 +1997,7 @@ qtengine_style_class_init (QtEngineStyleClass *klass)
 
 	style_class->realize = realize;
 
-	/* style_class->set_background = set_background;*/
+	style_class->set_background = set_background;
 }