From 10c29f10f72eb8d16f9dd59526f171791e7250a4 Mon Sep 17 00:00:00 2001
From: "yokoyama%netscape.com" <yokoyama%netscape.com>
Date: Mon, 29 Jul 2002 21:44:53 +0000
Subject: [PATCH] Bug 9449 Fixing linker error on MOZ_UNICODE /r=shanjian,
 /sr=kin, /a=asa

---
 widget/src/windows/nsWindow.cpp | 10 ++++++++++
 widget/src/windows/nsWindow.h   |  3 +--
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/widget/src/windows/nsWindow.cpp b/widget/src/windows/nsWindow.cpp
index be1a6d547091..9270270303ff 100644
--- a/widget/src/windows/nsWindow.cpp
+++ b/widget/src/windows/nsWindow.cpp
@@ -4549,6 +4549,16 @@ LPCWSTR nsWindow::WindowPopupClassW()
     return className;
 }
 
+LPCTSTR nsWindow::WindowClass()
+{
+  return (NS_ConvertUCS2toUTF8(WindowClassW()).get());
+}
+
+LPCTSTR nsWindow::WindowPopupClass()
+{
+  return (NS_ConvertUCS2toUTF8(WindowPopupClassW()).get());
+}
+
 #else
 LPCTSTR nsWindow::WindowClass()
 {
diff --git a/widget/src/windows/nsWindow.h b/widget/src/windows/nsWindow.h
index 91fa0482f2ea..9aa4ba212cf3 100644
--- a/widget/src/windows/nsWindow.h
+++ b/widget/src/windows/nsWindow.h
@@ -410,10 +410,9 @@ protected:
 #ifdef MOZ_UNICODE
     virtual LPCWSTR         WindowClassW();
     virtual LPCWSTR         WindowPopupClassW();
-#else
+#endif
     virtual LPCTSTR         WindowClass();
     virtual LPCTSTR         WindowPopupClass();
-#endif
     virtual DWORD           WindowStyle();
     virtual DWORD           WindowExStyle();