Bug 550672 - Provide disable native theme preference for Qt port. r=dougt

widget/src/qt/nsWidgetFactory.cpp

@@ -53,13 +53,6 @@
 #include "nsLookAndFeel.h"
 #include "nsAppShellSingleton.h"
 #include "nsScreenManagerQt.h"
-
-// #include "nsIComponentRegistrar.h"
-// #include "nsComponentManagerUtils.h"
-// #include "nsAutoPtr.h"
-// 
-
-
 #include "nsFilePicker.h"
 #include "nsClipboard.h"
 #include "nsClipboardHelper.h"
@@ -68,16 +61,9 @@
 #include "nsSound.h"
 #include "nsBidiKeyboard.h"
 #include "nsNativeThemeQt.h"
-// #include "nsScrollbar.h"
+
-// 
+// from nsWindow.cpp
-// #include "nsGUIEvent.h"
+extern PRBool gDisableNativeTheme;
-// #include "nsQtEventDispatcher.h"
-// #include "nsIRenderingContext.h"
-// #include "nsIServiceManager.h"
-// #include "nsGfxCIID.h"
-// #include "nsIPrefBranch.h"
-// #include "nsIPrefService.h"
-// 
 
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsWindow)
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsChildWindow)
@@ -87,23 +73,38 @@ NS_GENERIC_FACTORY_CONSTRUCTOR(nsHTMLFormatConverter)
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsTransferable)
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsLookAndFeel)
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsScreenManagerQt)
-
-/*
-static NS_DEFINE_CID(kNativeScrollCID, NS_NATIVESCROLLBAR_CID);
-*/
-
-
-
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsClipboard)
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsClipboardHelper)
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsDragService)
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsBidiKeyboard)
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsIdleServiceQt)
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsSound)
-NS_GENERIC_FACTORY_CONSTRUCTOR(nsNativeThemeQt)
-//NS_GENERIC_FACTORY_CONSTRUCTOR(nsNativeScrollbar)
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsFilePicker)
 
+static NS_IMETHODIMP
+nsNativeThemeQtConstructor(nsISupports *aOuter, REFNSIID aIID,
+                            void **aResult)
+{
+    nsresult rv;
+    nsNativeThemeQt *inst;
+
+    if (gDisableNativeTheme)
+        return NS_ERROR_NO_INTERFACE;
+
+    *aResult = NULL;
+    if (NULL != aOuter)
+        return NS_ERROR_NO_AGGREGATION;
+
+    NS_NEWXPCOM(inst, nsNativeThemeQt);
+    if (NULL == inst)
+        return NS_ERROR_OUT_OF_MEMORY;
+
+    NS_ADDREF(inst);
+    rv = inst->QueryInterface(aIID, aResult);
+    NS_RELEASE(inst);
+
+    return rv;
+}
 
 static const nsModuleComponentInfo components[] =
 {

widget/src/qt/nsWindow.cpp

@@ -91,6 +91,9 @@
 #include "gfxContext.h"
 #include "gfxSharedImageSurface.h"
 
+// imported in nsWidgetFactory.cpp
+PRBool gDisableNativeTheme = PR_FALSE;
+
 // Buffered Pixmap stuff
 static QPixmap *gBufferPixmap = nsnull;
 static int gBufferPixmapUsageCount = 0;
@@ -1869,7 +1872,9 @@ initialize_prefs(void)
 
     PRBool val = PR_TRUE;
     nsresult rv;
-    rv = prefs->GetBoolPref("mozilla.widget.raise-on-setfocus", &val);
+    rv = prefs->GetBoolPref("mozilla.widget.disable-native-theme", &val);
+    if (NS_SUCCEEDED(rv))
+        gDisableNativeTheme = val;
 
     return NS_OK;
 }