From 65a16a548db2b95d9ee6fb70eee2d1e4eae0b1d4 Mon Sep 17 00:00:00 2001 From: "timeless%mozdev.org" Date: Thu, 28 Oct 2004 07:25:57 +0000 Subject: [PATCH] Bug 265336 GetService klookandfeel instead of CreateInstance r=biesi sr=dmose git-svn-id: svn://10.0.0.236/trunk@164547 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/layout/generic/nsFrameSetFrame.cpp | 15 ++++++----- .../html/document/src/nsFrameSetFrame.cpp | 15 ++++++----- mozilla/layout/xul/base/src/nsMenuFrame.cpp | 2 +- .../layout/xul/base/src/nsSplitterFrame.cpp | 18 ++++++++----- .../webshell/tests/viewer/nsBrowserWindow.cpp | 14 +++++----- mozilla/webshell/tests/viewer/nsViewerApp.cpp | 26 ++++++++++--------- .../webshell/tests/viewer/os2/nsButton.cpp | 15 ++++++----- .../tests/viewer/os2/nsTextWidget.cpp | 19 +++++++------- .../tests/viewer/windows/nsButton.cpp | 15 ++++++----- .../tests/viewer/windows/nsTextWidget.cpp | 19 +++++++------- mozilla/widget/src/beos/nsButton.cpp | 15 ++++++----- mozilla/widget/src/beos/nsTextWidget.cpp | 19 +++++++------- mozilla/widget/src/photon/nsWidget.cpp | 8 ++---- 13 files changed, 105 insertions(+), 95 deletions(-) diff --git a/mozilla/layout/generic/nsFrameSetFrame.cpp b/mozilla/layout/generic/nsFrameSetFrame.cpp index ebf7f497033..1cee639ffe4 100644 --- a/mozilla/layout/generic/nsFrameSetFrame.cpp +++ b/mozilla/layout/generic/nsFrameSetFrame.cpp @@ -1621,13 +1621,14 @@ nsHTMLFramesetBorderFrame::Paint(nsPresContext* aPresContext, nscolor hltColor = NS_RGB(255,255,255); nscolor sdwColor = NS_RGB(128,128,128); - nsILookAndFeel * lookAndFeel; - if (NS_OK == nsComponentManager::CreateInstance(kLookAndFeelCID, nsnull, NS_GET_IID(nsILookAndFeel), (void**)&lookAndFeel)) { - lookAndFeel->GetColor(nsILookAndFeel::eColor_WidgetBackground, bgColor); - lookAndFeel->GetColor(nsILookAndFeel::eColor_WidgetForeground, fgColor); - lookAndFeel->GetColor(nsILookAndFeel::eColor_Widget3DShadow, sdwColor); - lookAndFeel->GetColor(nsILookAndFeel::eColor_Widget3DHighlight, hltColor); - NS_RELEASE(lookAndFeel); + { + nsCOMPtr lookAndFeel = do_GetService(kLookAndFeelCID); + if (lookAndFeel) { + lookAndFeel->GetColor(nsILookAndFeel::eColor_WidgetBackground, bgColor); + lookAndFeel->GetColor(nsILookAndFeel::eColor_WidgetForeground, fgColor); + lookAndFeel->GetColor(nsILookAndFeel::eColor_Widget3DShadow, sdwColor); + lookAndFeel->GetColor(nsILookAndFeel::eColor_Widget3DHighlight, hltColor); + } } float t2p; diff --git a/mozilla/layout/html/document/src/nsFrameSetFrame.cpp b/mozilla/layout/html/document/src/nsFrameSetFrame.cpp index ebf7f497033..1cee639ffe4 100644 --- a/mozilla/layout/html/document/src/nsFrameSetFrame.cpp +++ b/mozilla/layout/html/document/src/nsFrameSetFrame.cpp @@ -1621,13 +1621,14 @@ nsHTMLFramesetBorderFrame::Paint(nsPresContext* aPresContext, nscolor hltColor = NS_RGB(255,255,255); nscolor sdwColor = NS_RGB(128,128,128); - nsILookAndFeel * lookAndFeel; - if (NS_OK == nsComponentManager::CreateInstance(kLookAndFeelCID, nsnull, NS_GET_IID(nsILookAndFeel), (void**)&lookAndFeel)) { - lookAndFeel->GetColor(nsILookAndFeel::eColor_WidgetBackground, bgColor); - lookAndFeel->GetColor(nsILookAndFeel::eColor_WidgetForeground, fgColor); - lookAndFeel->GetColor(nsILookAndFeel::eColor_Widget3DShadow, sdwColor); - lookAndFeel->GetColor(nsILookAndFeel::eColor_Widget3DHighlight, hltColor); - NS_RELEASE(lookAndFeel); + { + nsCOMPtr lookAndFeel = do_GetService(kLookAndFeelCID); + if (lookAndFeel) { + lookAndFeel->GetColor(nsILookAndFeel::eColor_WidgetBackground, bgColor); + lookAndFeel->GetColor(nsILookAndFeel::eColor_WidgetForeground, fgColor); + lookAndFeel->GetColor(nsILookAndFeel::eColor_Widget3DShadow, sdwColor); + lookAndFeel->GetColor(nsILookAndFeel::eColor_Widget3DHighlight, hltColor); + } } float t2p; diff --git a/mozilla/layout/xul/base/src/nsMenuFrame.cpp b/mozilla/layout/xul/base/src/nsMenuFrame.cpp index 3f251ac7762..116999ab215 100644 --- a/mozilla/layout/xul/base/src/nsMenuFrame.cpp +++ b/mozilla/layout/xul/base/src/nsMenuFrame.cpp @@ -484,7 +484,7 @@ nsMenuFrame::HandleEvent(nsPresContext* aPresContext, PRInt32 menuDelay = 300; // ms - nsCOMPtr lookAndFeel(do_CreateInstance(kLookAndFeelCID)); + nsCOMPtr lookAndFeel(do_GetService(kLookAndFeelCID)); if (lookAndFeel) lookAndFeel->GetMetric(nsILookAndFeel::eMetric_SubmenuDelay, menuDelay); diff --git a/mozilla/layout/xul/base/src/nsSplitterFrame.cpp b/mozilla/layout/xul/base/src/nsSplitterFrame.cpp index 8b804dae371..c0bad67ef7b 100644 --- a/mozilla/layout/xul/base/src/nsSplitterFrame.cpp +++ b/mozilla/layout/xul/base/src/nsSplitterFrame.cpp @@ -328,14 +328,18 @@ nsSplitterFrame::Init(nsPresContext* aPresContext, mInner->mChildInfosBefore = nsnull; mInner->mState = nsSplitterFrameInner::Open; mInner->mDragging = PR_FALSE; -/* make it real time drag for now due to problems - nsILookAndFeel* lookAndFeel; - if (NS_SUCCEEDED(nsComponentManager::CreateInstance(kLookAndFeelCID, nsnull, NS_GET_IID(nsILookAndFeel), (void**)&lookAndFeel))) { - lookAndFeel->GetMetric(nsILookAndFeel::eMetric_DragFullWindow, realTimeDrag); - NS_RELEASE(lookAndFeel); + + { +#if 0 + // make it real time drag for now due to problems + nsCOMPtr lookAndFeel = do_GetService(kLookAndFeelCID); + if (lookAndFeel) { + lookAndFeel->GetMetric(nsILookAndFeel::eMetric_DragFullWindow, realTimeDrag); + } + else +#endif + realTimeDrag = 1; } - else */ - realTimeDrag = 1; // determine orientation of parent, and if vertical, set orient to vertical // on splitter content, then re-resolve style diff --git a/mozilla/webshell/tests/viewer/nsBrowserWindow.cpp b/mozilla/webshell/tests/viewer/nsBrowserWindow.cpp index bad2d913d41..2fa7994068b 100644 --- a/mozilla/webshell/tests/viewer/nsBrowserWindow.cpp +++ b/mozilla/webshell/tests/viewer/nsBrowserWindow.cpp @@ -191,7 +191,6 @@ static NS_DEFINE_CID(kTextFieldCID, NS_TEXTFIELD_CID); static NS_DEFINE_CID(kWindowCID, NS_WINDOW_CID); static NS_DEFINE_IID(kIXPBaseWindowIID, NS_IXPBASE_WINDOW_IID); -static NS_DEFINE_IID(kILookAndFeelIID, NS_ILOOKANDFEEL_IID); static NS_DEFINE_IID(kIButtonIID, NS_IBUTTON_IID); static NS_DEFINE_IID(kIDOMDocumentIID, NS_IDOMDOCUMENT_IID); static NS_DEFINE_IID(kITextWidgetIID, NS_ITEXTWIDGET_IID); @@ -1674,12 +1673,13 @@ nsBrowserWindow::Layout(PRInt32 aWidth, PRInt32 aHeight) { nscoord txtHeight; nscoord menuBarHeight; - nsILookAndFeel * lookAndFeel; - if (NS_OK == nsComponentManager::CreateInstance(kLookAndFeelCID, nsnull, kILookAndFeelIID, (void**)&lookAndFeel)) { - lookAndFeel->GetMetric(nsILookAndFeel::eMetric_TextFieldHeight, txtHeight); - NS_RELEASE(lookAndFeel); - } else { - txtHeight = 24; + { + nsCOMPtr lookAndFeel = do_GetService(kLookAndFeelCID); + if (lookAndFeel) { + lookAndFeel->GetMetric(nsILookAndFeel::eMetric_TextFieldHeight, txtHeight); + } else { + txtHeight = 24; + } } // Find out the menubar height diff --git a/mozilla/webshell/tests/viewer/nsViewerApp.cpp b/mozilla/webshell/tests/viewer/nsViewerApp.cpp index 7a94b7f7f93..2d038633da0 100644 --- a/mozilla/webshell/tests/viewer/nsViewerApp.cpp +++ b/mozilla/webshell/tests/viewer/nsViewerApp.cpp @@ -787,7 +787,6 @@ static NS_DEFINE_IID(kCheckButtonCID, NS_CHECKBUTTON_CID); static NS_DEFINE_IID(kLabelCID, NS_LABEL_CID); -static NS_DEFINE_IID(kILookAndFeelIID, NS_ILOOKANDFEEL_IID); static NS_DEFINE_IID(kIButtonIID, NS_IBUTTON_IID); static NS_DEFINE_IID(kITextWidgetIID, NS_ITEXTWIDGET_IID); static NS_DEFINE_IID(kIWidgetIID, NS_IWIDGET_IID); @@ -949,11 +948,13 @@ PRBool CreateRobotDialog(nsIWidget * aParent) nscolor textBGColor = NS_RGB(255,255,255); nscolor textFGColor = NS_RGB(255,255,255); - nsILookAndFeel * lookAndFeel; - if (NS_OK == nsComponentManager::CreateInstance(kLookAndFeelCID, nsnull, kILookAndFeelIID, (void**)&lookAndFeel)) { - lookAndFeel->GetMetric(nsILookAndFeel::eMetric_TextFieldHeight, txtHeight); - lookAndFeel->GetColor(nsILookAndFeel::eColor_TextBackground, textBGColor); - lookAndFeel->GetColor(nsILookAndFeel::eColor_TextForeground, textFGColor); + { + nsCOMPtr lookAndFeel = do_GetService(kLookAndFeelCID); + if (lookAndFeel) { + lookAndFeel->GetMetric(nsILookAndFeel::eMetric_TextFieldHeight, txtHeight); + lookAndFeel->GetColor(nsILookAndFeel::eColor_TextBackground, textBGColor); + lookAndFeel->GetColor(nsILookAndFeel::eColor_TextForeground, textFGColor); + } } nscoord w = 65; @@ -1464,11 +1465,13 @@ PRBool CreateSiteDialog(nsIWidget * aParent) nscolor textBGColor = NS_RGB(255,255,255); nscolor textFGColor = NS_RGB(255,255,255); - nsILookAndFeel * lookAndFeel; - if (NS_OK == nsComponentManager::CreateInstance(kLookAndFeelCID, nsnull, kILookAndFeelIID, (void**)&lookAndFeel)) { - lookAndFeel->GetMetric(nsILookAndFeel::eMetric_TextFieldHeight, txtHeight); - lookAndFeel->GetColor(nsILookAndFeel::eColor_TextBackground, textBGColor); - lookAndFeel->GetColor(nsILookAndFeel::eColor_TextForeground, textFGColor); + { + nsCOMPtr lookAndFeel = do_GetService(kLookAndFeelCID); + if (lookAndFeel) { + lookAndFeel->GetMetric(nsILookAndFeel::eMetric_TextFieldHeight, txtHeight); + lookAndFeel->GetColor(nsILookAndFeel::eColor_TextBackground, textBGColor); + lookAndFeel->GetColor(nsILookAndFeel::eColor_TextForeground, textFGColor); + } } // Create TextField @@ -1483,7 +1486,6 @@ PRBool CreateSiteDialog(nsIWidget * aParent) widget->SetBackgroundColor(textBGColor); widget->SetForegroundColor(textFGColor); } - NS_IF_RELEASE(lookAndFeel); nsString str; str.AppendInt(0); diff --git a/mozilla/webshell/tests/viewer/os2/nsButton.cpp b/mozilla/webshell/tests/viewer/os2/nsButton.cpp index c47a1d02299..dabdcc62fc6 100644 --- a/mozilla/webshell/tests/viewer/os2/nsButton.cpp +++ b/mozilla/webshell/tests/viewer/os2/nsButton.cpp @@ -51,7 +51,6 @@ #include "nsIFontMetrics.h" static NS_DEFINE_IID(kLookAndFeelCID, NS_LOOKANDFEEL_CID); -static NS_DEFINE_IID(kILookAndFeelIID, NS_ILOOKANDFEEL_IID); //------------------------------------------------------------------------- nsresult @@ -230,12 +229,14 @@ NS_METHOD nsButton::Paint(nsIRenderingContext& aRenderingContext, nscolor hltColor = NS_RGB(240,240,240); nscolor sdwColor = NS_RGB(128,128,128); - nsILookAndFeel * lookAndFeel; - if (NS_OK == nsComponentManager::CreateInstance(kLookAndFeelCID, nsnull, kILookAndFeelIID, (void**)&lookAndFeel)) { - lookAndFeel->GetColor(nsILookAndFeel::eColor_WidgetBackground, bgColor); - lookAndFeel->GetColor(nsILookAndFeel::eColor_WidgetForeground, fgColor); - lookAndFeel->GetColor(nsILookAndFeel::eColor_Widget3DShadow, sdwColor); - lookAndFeel->GetColor(nsILookAndFeel::eColor_Widget3DHighlight, hltColor); + { + nsCOMPtr lookAndFeel = do_GetService(kLookAndFeelCID); + if (lookAndFeel) { + lookAndFeel->GetColor(nsILookAndFeel::eColor_WidgetBackground, bgColor); + lookAndFeel->GetColor(nsILookAndFeel::eColor_WidgetForeground, fgColor); + lookAndFeel->GetColor(nsILookAndFeel::eColor_Widget3DShadow, sdwColor); + lookAndFeel->GetColor(nsILookAndFeel::eColor_Widget3DHighlight, hltColor); + } } aRenderingContext.SetColor(bgColor); diff --git a/mozilla/webshell/tests/viewer/os2/nsTextWidget.cpp b/mozilla/webshell/tests/viewer/os2/nsTextWidget.cpp index 3665ccdd504..4cb8e789d03 100644 --- a/mozilla/webshell/tests/viewer/os2/nsTextWidget.cpp +++ b/mozilla/webshell/tests/viewer/os2/nsTextWidget.cpp @@ -51,7 +51,6 @@ #include "nsIFontMetrics.h" static NS_DEFINE_IID(kLookAndFeelCID, NS_LOOKANDFEEL_CID); -static NS_DEFINE_IID(kILookAndFeelIID, NS_ILOOKANDFEEL_IID); //------------------------------------------------------------------------- nsresult @@ -249,14 +248,16 @@ NS_METHOD nsTextWidget::Paint(nsIRenderingContext& aRenderingContext, nscolor sdwColor = NS_RGB(128,128,128); nscolor txtBGColor = NS_RGB(255,255,255); nscolor txtFGColor = NS_RGB(0,0,0); - nsILookAndFeel * lookAndFeel; - if (NS_OK == nsComponentManager::CreateInstance(kLookAndFeelCID, nsnull, kILookAndFeelIID, (void**)&lookAndFeel)) { - lookAndFeel->GetColor(nsILookAndFeel::eColor_WidgetBackground, bgColor); - lookAndFeel->GetColor(nsILookAndFeel::eColor_WidgetForeground, fgColor); - lookAndFeel->GetColor(nsILookAndFeel::eColor_Widget3DShadow, sdwColor); - lookAndFeel->GetColor(nsILookAndFeel::eColor_Widget3DHighlight, hltColor); - lookAndFeel->GetColor(nsILookAndFeel::eColor_TextBackground, txtBGColor); - lookAndFeel->GetColor(nsILookAndFeel::eColor_TextForeground, txtFGColor); + { + nsCOMPtr lookAndFeel = do_GetService(kLookAndFeelCID); + if (lookAndFeel) { + lookAndFeel->GetColor(nsILookAndFeel::eColor_WidgetBackground, bgColor); + lookAndFeel->GetColor(nsILookAndFeel::eColor_WidgetForeground, fgColor); + lookAndFeel->GetColor(nsILookAndFeel::eColor_Widget3DShadow, sdwColor); + lookAndFeel->GetColor(nsILookAndFeel::eColor_Widget3DHighlight, hltColor); + lookAndFeel->GetColor(nsILookAndFeel::eColor_TextBackground, txtBGColor); + lookAndFeel->GetColor(nsILookAndFeel::eColor_TextForeground, txtFGColor); + } } aRenderingContext.SetColor(txtBGColor); diff --git a/mozilla/webshell/tests/viewer/windows/nsButton.cpp b/mozilla/webshell/tests/viewer/windows/nsButton.cpp index 60cfbf3e7bf..f702ae24f66 100644 --- a/mozilla/webshell/tests/viewer/windows/nsButton.cpp +++ b/mozilla/webshell/tests/viewer/windows/nsButton.cpp @@ -51,7 +51,6 @@ #include "nsIFontMetrics.h" static NS_DEFINE_IID(kLookAndFeelCID, NS_LOOKANDFEEL_CID); -static NS_DEFINE_IID(kILookAndFeelIID, NS_ILOOKANDFEEL_IID); //------------------------------------------------------------------------- nsresult @@ -240,12 +239,14 @@ NS_METHOD nsButton::Paint(nsIRenderingContext& aRenderingContext, nscolor hltColor = NS_RGB(240,240,240); nscolor sdwColor = NS_RGB(128,128,128); - nsILookAndFeel * lookAndFeel; - if (NS_OK == nsComponentManager::CreateInstance(kLookAndFeelCID, nsnull, kILookAndFeelIID, (void**)&lookAndFeel)) { - lookAndFeel->GetColor(nsILookAndFeel::eColor_WidgetBackground, bgColor); - lookAndFeel->GetColor(nsILookAndFeel::eColor_WidgetForeground, fgColor); - lookAndFeel->GetColor(nsILookAndFeel::eColor_Widget3DShadow, sdwColor); - lookAndFeel->GetColor(nsILookAndFeel::eColor_Widget3DHighlight, hltColor); + { + nsCOMPtr lookAndFeel = do_GetService(kLookAndFeelCID); + if (lookAndFeel) { + lookAndFeel->GetColor(nsILookAndFeel::eColor_WidgetBackground, bgColor); + lookAndFeel->GetColor(nsILookAndFeel::eColor_WidgetForeground, fgColor); + lookAndFeel->GetColor(nsILookAndFeel::eColor_Widget3DShadow, sdwColor); + lookAndFeel->GetColor(nsILookAndFeel::eColor_Widget3DHighlight, hltColor); + } } aRenderingContext.SetColor(bgColor); diff --git a/mozilla/webshell/tests/viewer/windows/nsTextWidget.cpp b/mozilla/webshell/tests/viewer/windows/nsTextWidget.cpp index d7ef3b68525..4dd88d29e6e 100644 --- a/mozilla/webshell/tests/viewer/windows/nsTextWidget.cpp +++ b/mozilla/webshell/tests/viewer/windows/nsTextWidget.cpp @@ -51,7 +51,6 @@ #include "nsIFontMetrics.h" static NS_DEFINE_IID(kLookAndFeelCID, NS_LOOKANDFEEL_CID); -static NS_DEFINE_IID(kILookAndFeelIID, NS_ILOOKANDFEEL_IID); //------------------------------------------------------------------------- nsresult @@ -260,14 +259,16 @@ NS_METHOD nsTextWidget::Paint(nsIRenderingContext& aRenderingContext, nscolor sdwColor = NS_RGB(128,128,128); nscolor txtBGColor = NS_RGB(255,255,255); nscolor txtFGColor = NS_RGB(0,0,0); - nsILookAndFeel * lookAndFeel; - if (NS_OK == nsComponentManager::CreateInstance(kLookAndFeelCID, nsnull, kILookAndFeelIID, (void**)&lookAndFeel)) { - lookAndFeel->GetColor(nsILookAndFeel::eColor_WidgetBackground, bgColor); - lookAndFeel->GetColor(nsILookAndFeel::eColor_WidgetForeground, fgColor); - lookAndFeel->GetColor(nsILookAndFeel::eColor_Widget3DShadow, sdwColor); - lookAndFeel->GetColor(nsILookAndFeel::eColor_Widget3DHighlight, hltColor); - lookAndFeel->GetColor(nsILookAndFeel::eColor_TextBackground, txtBGColor); - lookAndFeel->GetColor(nsILookAndFeel::eColor_TextForeground, txtFGColor); + { + nsCOMPtr lookAndFeel = do_GetService(kLookAndFeelCID); + if (lookAndFeel) { + lookAndFeel->GetColor(nsILookAndFeel::eColor_WidgetBackground, bgColor); + lookAndFeel->GetColor(nsILookAndFeel::eColor_WidgetForeground, fgColor); + lookAndFeel->GetColor(nsILookAndFeel::eColor_Widget3DShadow, sdwColor); + lookAndFeel->GetColor(nsILookAndFeel::eColor_Widget3DHighlight, hltColor); + lookAndFeel->GetColor(nsILookAndFeel::eColor_TextBackground, txtBGColor); + lookAndFeel->GetColor(nsILookAndFeel::eColor_TextForeground, txtFGColor); + } } aRenderingContext.SetColor(txtBGColor); diff --git a/mozilla/widget/src/beos/nsButton.cpp b/mozilla/widget/src/beos/nsButton.cpp index 127d1c765ef..22bca0e391e 100644 --- a/mozilla/widget/src/beos/nsButton.cpp +++ b/mozilla/widget/src/beos/nsButton.cpp @@ -49,7 +49,6 @@ #include "nsIFontMetrics.h" static NS_DEFINE_IID(kLookAndFeelCID, NS_LOOKANDFEEL_CID); -static NS_DEFINE_IID(kILookAndFeelIID, NS_ILOOKANDFEEL_IID); //------------------------------------------------------------------------- @@ -177,12 +176,14 @@ NS_METHOD nsButton::Paint(nsIRenderingContext& aRenderingContext, nscolor hltColor = NS_RGB(240,240,240); nscolor sdwColor = NS_RGB(128,128,128); - nsILookAndFeel * lookAndFeel; - if (NS_OK == nsComponentManager::CreateInstance(kLookAndFeelCID, nsnull, kILookAndFeelIID, (void**)&lookAndFeel)) { - lookAndFeel->GetColor(nsILookAndFeel::eColor_WidgetBackground, bgColor); - lookAndFeel->GetColor(nsILookAndFeel::eColor_WidgetForeground, fgColor); - lookAndFeel->GetColor(nsILookAndFeel::eColor_Widget3DShadow, sdwColor); - lookAndFeel->GetColor(nsILookAndFeel::eColor_Widget3DHighlight, hltColor); + { + nsCOMPtr lookAndFeel = do_GetService(kLookAndFeelCID); + if (lookAndFeel) { + lookAndFeel->GetColor(nsILookAndFeel::eColor_WidgetBackground, bgColor); + lookAndFeel->GetColor(nsILookAndFeel::eColor_WidgetForeground, fgColor); + lookAndFeel->GetColor(nsILookAndFeel::eColor_Widget3DShadow, sdwColor); + lookAndFeel->GetColor(nsILookAndFeel::eColor_Widget3DHighlight, hltColor); + } } aRenderingContext.SetColor(bgColor); diff --git a/mozilla/widget/src/beos/nsTextWidget.cpp b/mozilla/widget/src/beos/nsTextWidget.cpp index 3d6922d5039..7882641d853 100644 --- a/mozilla/widget/src/beos/nsTextWidget.cpp +++ b/mozilla/widget/src/beos/nsTextWidget.cpp @@ -51,7 +51,6 @@ #include static NS_DEFINE_IID(kLookAndFeelCID, NS_LOOKANDFEEL_CID); -static NS_DEFINE_IID(kILookAndFeelIID, NS_ILOOKANDFEEL_IID); //------------------------------------------------------------------------- @@ -155,14 +154,16 @@ NS_METHOD nsTextWidget::Paint(nsIRenderingContext& aRenderingContext, nscolor sdwColor = NS_RGB(128,128,128); nscolor txtBGColor = NS_RGB(255,255,255); nscolor txtFGColor = NS_RGB(0,0,0); - nsILookAndFeel * lookAndFeel; - if (NS_OK == nsComponentManager::CreateInstance(kLookAndFeelCID, nsnull, kILookAndFeelIID, (void**)&lookAndFeel)) { - lookAndFeel->GetColor(nsILookAndFeel::eColor_WidgetBackground, bgColor); - lookAndFeel->GetColor(nsILookAndFeel::eColor_WidgetForeground, fgColor); - lookAndFeel->GetColor(nsILookAndFeel::eColor_Widget3DShadow, sdwColor); - lookAndFeel->GetColor(nsILookAndFeel::eColor_Widget3DHighlight, hltColor); - lookAndFeel->GetColor(nsILookAndFeel::eColor_TextBackground, txtBGColor); - lookAndFeel->GetColor(nsILookAndFeel::eColor_TextForeground, txtFGColor); + { + nsCOMPtr lookAndFeel = do_GetService(kLookAndFeelCID); + if (lookAndFeel) { + lookAndFeel->GetColor(nsILookAndFeel::eColor_WidgetBackground, bgColor); + lookAndFeel->GetColor(nsILookAndFeel::eColor_WidgetForeground, fgColor); + lookAndFeel->GetColor(nsILookAndFeel::eColor_Widget3DShadow, sdwColor); + lookAndFeel->GetColor(nsILookAndFeel::eColor_Widget3DHighlight, hltColor); + lookAndFeel->GetColor(nsILookAndFeel::eColor_TextBackground, txtBGColor); + lookAndFeel->GetColor(nsILookAndFeel::eColor_TextForeground, txtFGColor); + } } aRenderingContext.SetColor(txtBGColor); diff --git a/mozilla/widget/src/photon/nsWidget.cpp b/mozilla/widget/src/photon/nsWidget.cpp index b2d1a7feab1..90eb07dadc0 100644 --- a/mozilla/widget/src/photon/nsWidget.cpp +++ b/mozilla/widget/src/photon/nsWidget.cpp @@ -92,12 +92,8 @@ nsWidget* nsWidget::sFocusWidget = 0; nsWidget::nsWidget() { if (!sLookAndFeel) { - if (NS_OK != nsComponentManager::CreateInstance(kLookAndFeelCID, - nsnull, - NS_GET_IID(nsILookAndFeel), - (void**)&sLookAndFeel)) - sLookAndFeel = nsnull; - } + CallGetService(kLookAndFeelCID, &sLookAndFeel); + } if( sLookAndFeel ) sLookAndFeel->GetColor( nsILookAndFeel::eColor_WindowBackground, mBackground );