fix HTML browser setup dialog under MSW and make the 'OK' button default

[wxWidgets.git] / src / mgl / makefile.wat

diff --git a/src/mgl/makefile.wat b/src/mgl/makefile.wat
index 05ce7a849412c399e86e23e2a8ba4bed705253c4..6313d2c0fdeb7c11bd2ce4b23e997fa6ed26b8fb 100644 (file)
--- a/src/mgl/makefile.wat
+++ b/src/mgl/makefile.wat
@@ -272,6 +272,7 @@ UNIVOBJS = bmpbuttn.obj &
        statusbr.obj &
        textctrl.obj &
        theme.obj &
+       toolbar.obj &
        topluniv.obj &
        winuniv.obj
 
@@ -311,8 +312,8 @@ $(ARCHINCDIR)\wx:
     mkdir $(ARCHINCDIR)
     mkdir $(ARCHINCDIR)\wx
 
-$(SETUP_H): $(WXDIR)\include\wx\mgl\setup.h $(ARCHINCDIR)\wx
-    copy $(WXDIR)\include\wx\mgl\setup.h $@
+$(SETUP_H): $(WXDIR)\include\wx\univ\setup.h $(ARCHINCDIR)\wx
+    copy $(WXDIR)\include\wx\univ\setup.h $@
 
 $(LIBTARGET) : $(OBJECTS)
     %create tmp.lbc
@@ -501,6 +502,9 @@ textctrl.obj:     $(UNIVDIR)\textctrl.cpp
 theme.obj:     $(UNIVDIR)\theme.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
+toolbar.obj:     $(UNIVDIR)\toolbar.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
 topluniv.obj:     $(UNIVDIR)\topluniv.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<