From 1a8f0b575baed70e2120ce384f554c602010f73e Mon Sep 17 00:00:00 2001 From: Masatoshi Kimura Date: Tue, 9 Dec 2008 13:36:13 +1300 Subject: [PATCH] Bug 468419. Fix loading of the application window icons on Windows. r+sr=roc --- widget/src/windows/nsWindow.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/widget/src/windows/nsWindow.cpp b/widget/src/windows/nsWindow.cpp index 0439c729dd92..efabf406e61b 100644 --- a/widget/src/windows/nsWindow.cpp +++ b/widget/src/windows/nsWindow.cpp @@ -5343,7 +5343,7 @@ LPCWSTR nsWindow::WindowClassW() wc.cbClsExtra = 0; wc.cbWndExtra = 0; wc.hInstance = nsToolkit::mDllInstance; - wc.hIcon = ::LoadIconW(NULL, (LPWSTR)IDI_APPLICATION); + wc.hIcon = ::LoadIconW(::GetModuleHandleW(NULL), (LPWSTR)IDI_APPLICATION); wc.hCursor = NULL; wc.hbrBackground = mBrush; wc.lpszMenuName = NULL; @@ -5410,7 +5410,7 @@ LPCWSTR nsWindow::WindowPopupClassW() wc.cbClsExtra = 0; wc.cbWndExtra = 0; wc.hInstance = nsToolkit::mDllInstance; - wc.hIcon = ::LoadIconW(NULL, (LPWSTR)IDI_APPLICATION); + wc.hIcon = ::LoadIconW(::GetModuleHandleW(NULL), (LPWSTR)IDI_APPLICATION); wc.hCursor = NULL; wc.hbrBackground = mBrush; wc.lpszMenuName = NULL;