make tests work with more than just gtk

widget/tests/scribble/Makefile.in

@@ -31,7 +31,7 @@ TOOLKIT_BASE_LIB	:= -lgmbase$(MOZ_TOOLKIT)
 
 # Hardcoding dlopen()'s?  This needs to get fixed.
 #
-TOOLKIT_CFLAGS := \
+TOOLKIT_CXXFLAGS := \
 	-DWIDGET_DLL=\"libwidget$(MOZ_TOOLKIT).$(DLL_SUFFIX)\" \
 	-DGFXWIN_DLL=\"libgfx$(MOZ_TOOLKIT).$(DLL_SUFFIX)\" \
 	$(TK_CFLAGS)
@@ -94,7 +94,7 @@ LIBS := \
 	$(NULL)
 
 CFLAGS += $(TOOLKIT_CFLAGS)
-CXXFLAGS += $(TOOLKIT_CXXFLAGS)
+CXXFLAGS += $(TOOLKIT_CXXFLAGS) 
 
 include $(topsrcdir)/config/rules.mk
 

widget/tests/scribble/Scribble.cpp

@@ -62,10 +62,16 @@ static nsIImageRequest  *gImageReq = nsnull;
 #define FILE_URL_PREFIX "file://"
 #endif
 
+#if !defined(WIDGET_DLL)
+#error WIDGET_DLL must be defined
+#endif
+
+#if !defined(GFXWIN_DLL)
+#error GFXWIN_DLL must be defined
+#endif
+
 #ifdef XP_UNIX
 #define XPCOM_DLL "libxpcom.so"
-#define WIDGET_DLL "libwidgetgtk.so"
-#define GFXWIN_DLL "libgfxgtk.so"
 #define TEXT_HEIGHT 30
 #define FILE_URL_PREFIX "file://"
 #endif

widget/tests/widget/Makefile.in

@@ -27,7 +27,7 @@ PROGRAM = widget
 
 # Hardcoding dlopen()'s?  This needs to get fixed.
 #
-TOOLKIT_CFLAGS := \
+TOOLKIT_CXXFLAGS := \
 	-DWIDGET_DLL=\"libwidget$(MOZ_TOOLKIT).$(DLL_SUFFIX)\" \
 	-DGFXWIN_DLL=\"libgfx$(MOZ_TOOLKIT).$(DLL_SUFFIX)\" \
 	$(TK_CFLAGS)
@@ -81,6 +81,7 @@ LIBS := \
 
 
 CFLAGS += $(TOOLKIT_CFLAGS)
+CXXFLAGS += $(TOOLKIT_CXXFLAGS)
 
 include $(topsrcdir)/config/rules.mk