Bug 170855

Need to define #ifdef MOZ_UNICODE
and have WindowClass().
/r=shanjian;/sr=kin;/a=asa

webshell/tests/viewer/windows/Makefile.in

@@ -46,6 +46,10 @@ CPPSRCS		= \
 
 DEFINES		+= -DWIN32_LEAN_AND_MEAN
 
+ifdef MOZ_UNICODE
+DEFINES += -DMOZ_UNICODE 
+endif
+
 LOCAL_INCLUDES	= \
 		-I$(topsrcdir)/widget/src/windows \
 		-I$(topsrcdir)/widget/src/xpwidgets \

webshell/tests/viewer/windows/nsButton.cpp

@@ -175,6 +175,18 @@ PRBool nsButton::OnResize(nsRect &aWindowRect)
     return PR_FALSE;
 }
 
+#ifdef MOZ_UNICODE
+//-------------------------------------------------------------------------
+//
+// return the window class name and initialize the class if needed
+//
+//-------------------------------------------------------------------------
+LPCWSTR nsButton::WindowClassW()
+{
+  return L"BUTTON";
+}
+#endif /* MOZ_UNICODE */
+
 //-------------------------------------------------------------------------
 //
 // return the window class name and initialize the class if needed

webshell/tests/viewer/windows/nsButton.h

@@ -77,6 +77,9 @@ public:
 protected:
   nsString mLabel;
 
+#ifdef MOZ_UNICODE
+  virtual LPCWSTR WindowClassW();
+#endif /* MOZ_UNICODE */
   virtual LPCTSTR WindowClass();
   virtual DWORD   WindowStyle();
   virtual DWORD   WindowExStyle();

webshell/tests/viewer/windows/nsCheckButton.cpp

@@ -200,6 +200,18 @@ PRBool nsCheckButton::OnResize(nsRect &aWindowRect)
     return PR_FALSE;
 }
 
+#ifdef MOZ_UNICODE
+//-------------------------------------------------------------------------
+//
+// return the window class name and initialize the class if needed
+//
+//-------------------------------------------------------------------------
+LPCWSTR nsCheckButton::WindowClassW()
+{
+    return L"BUTTON";
+}
+#endif /* MOZ_UNICODE */
+
 //-------------------------------------------------------------------------
 //
 // return the window class name and initialize the class if needed

webshell/tests/viewer/windows/nsCheckButton.h

@@ -80,6 +80,9 @@ public:
 protected:
   PRBool mState; 
 
+#ifdef MOZ_UNICODE
+  virtual LPCWSTR         WindowClassW();
+#endif /* MOZ_UNICODE */
   virtual LPCTSTR         WindowClass();
   virtual DWORD           WindowStyle();
   virtual DWORD           WindowExStyle();

webshell/tests/viewer/windows/nsLabel.cpp

@@ -177,6 +177,18 @@ PRBool nsLabel::OnResize(nsRect &aWindowRect)
     return PR_FALSE;
 }
 
+#ifdef MOZ_UNICODE
+//-------------------------------------------------------------------------
+//
+// return the window class name and initialize the class if needed
+//
+//-------------------------------------------------------------------------
+LPCWSTR nsLabel::WindowClassW()
+{
+  return L"STATIC";
+}
+#endif /* MOZ_UNICODE */
+
 //-------------------------------------------------------------------------
 //
 // return the window class name and initialize the class if needed

webshell/tests/viewer/windows/nsLabel.h

@@ -81,6 +81,9 @@ public:
 protected:
   nsLabelAlignment mAlignment;
 
+#ifdef MOZ_UNICODE
+  virtual LPCWSTR WindowClassW();
+#endif /* MOZ_UNICODE */
   virtual LPCTSTR WindowClass();
   virtual DWORD   WindowStyle();
   virtual DWORD   WindowExStyle();

webshell/tests/viewer/windows/nsTextHelper.cpp

@@ -176,6 +176,18 @@ nsTextHelper::~nsTextHelper()
 {
 }
 
+#ifdef MOZ_UNICODE
+//-------------------------------------------------------------------------
+//
+// return the window class name and initialize the class if needed
+//
+//-------------------------------------------------------------------------
+LPCWSTR nsTextHelper::WindowClassW()
+{
+    return(L"EDIT");
+}
+#endif /* MOZ_UNICODE */
+
 //-------------------------------------------------------------------------
 //
 // return the window class name and initialize the class if needed

webshell/tests/viewer/windows/nsTextHelper.h

@@ -68,6 +68,9 @@ public:
     
     NS_IMETHOD        PreCreateWidget(nsWidgetInitData *aInitData);
 
+#ifdef MOZ_UNICODE
+    virtual LPCWSTR   WindowClassW();
+#endif /* MOZ_UNICODE */
     virtual LPCTSTR   WindowClass();
     virtual DWORD     WindowStyle();
     virtual PRBool    AutoErase();

webshell/tests/viewer/windows/nsTextWidget.cpp

@@ -180,6 +180,18 @@ PRBool nsTextWidget::OnResize(nsRect &aWindowRect)
     return PR_FALSE;
 }
 
+#ifdef MOZ_UNICODE
+//-------------------------------------------------------------------------
+//
+// return the window class name and initialize the class if needed
+//
+//-------------------------------------------------------------------------
+LPCWSTR nsTextWidget::WindowClassW()
+{
+  return(nsTextHelper::WindowClassW());
+}
+#endif /* MOZ_UNICODE */
+
 //-------------------------------------------------------------------------
 //
 // return the window class name and initialize the class if needed

webshell/tests/viewer/windows/nsTextWidget.h

@@ -75,6 +75,9 @@ public:
 
 
 protected:
+#ifdef MOZ_UNICODE
+    virtual LPCWSTR     WindowClassW();
+#endif /* MOZ_UNICODE */
     virtual LPCTSTR     WindowClass();
     virtual DWORD       WindowStyle();
     virtual DWORD       WindowExStyle();