Fix menu bar drawing failures on Firefox v4+ and Thunderbird when used with the GTK Qt Theme Engine

This partially resolves Bug 546


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

src/qt_qt_wrapper.cpp

@@ -53,7 +53,6 @@
 #define RC_CACHE_VERSION TQString("1")
 
 bool gtkQtEnable = false;
-bool mozillaFix = false;
 bool tqAppOwner = false;
 gboolean tde_showIconsOnPushButtons = false;
 
@@ -96,6 +95,7 @@ int isDomino;
 int isPolyester;
 int eclipseFix;
 int openOfficeFix;
+int mozillaFix;
 int gtkQtDebug;
 
 Atom kipcCommAtom;
@@ -335,7 +335,7 @@ void createTQApp()
 #endif // USE_FREEBSD
 #endif // USE_SOLARIS
 
-	mozillaFix = (cmdLine.contains("mozilla") || cmdLine.contains("firefox"));
+	mozillaFix = (cmdLine.contains("mozilla") || cmdLine.contains("firefox") || cmdLine.contains("thunderbird"));
 
 	openOfficeFix = (cmdLine.endsWith("soffice.bin"))
 	              | (cmdLine.endsWith("swriter.bin"))

src/qt_qt_wrapper.h

@@ -74,6 +74,7 @@ extern int isAlloy;
 extern int isDomino;
 extern int isPolyester;
 extern int openOfficeFix;
+extern int mozillaFix;
 extern int gtkQtDebug;
 
 #ifdef  __cplusplus

src/qt_theme_draw.c

@@ -702,7 +702,9 @@ draw_box(GtkStyle * style,
 	if (DETAIL("menubar"))
 	{
 		if (openOfficeFix == 1)
-			 parent_class->draw_box (style, window, state_type, shadow_type, area, widget, detail, x, y, width, height);
+			parent_class->draw_box (style, window, state_type, shadow_type, area, widget, detail, x, y, width, height);
+		else if (mozillaFix == 1)
+			parent_class->draw_box (style, window, state_type, GTK_SHADOW_NONE, area, widget, detail, x, y, width, height);
 		else
 			drawMenubar(window,style,state_type,x,y,width,height);
 		return;