Add wx/msgqueue.h to the list of wxBase headers and rebake.

This header has somehow never been added to build/bakefiles/files.bkl, do add
it now.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@64559 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/Makefile.in b/Makefile.in
index fa8349f7138a6d278b430008c0926a217326fb76..8f0abc7312cce96f7196df9cf79f154c107d6acb 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -403,6 +403,7 @@ ALL_BASE_HEADERS =  \
        wx/module.h \
        wx/mousestate.h \
        wx/msgout.h \
+       wx/msgqueue.h \
        wx/mstream.h \
        wx/object.h \
        wx/platform.h \
@@ -570,6 +571,7 @@ ALL_PORTS_BASE_HEADERS =  \
        wx/module.h \
        wx/mousestate.h \
        wx/msgout.h \
+       wx/msgqueue.h \
        wx/mstream.h \
        wx/object.h \
        wx/platform.h \
@@ -2593,7 +2595,7 @@ COND_TOOLKIT_MSW_LOWLEVEL_HDR =  \
 @COND_TOOLKIT_MSW@LOWLEVEL_HDR = $(COND_TOOLKIT_MSW_LOWLEVEL_HDR)
 @COND_TOOLKIT_OSX_CARBON@LOWLEVEL_HDR = 
 @COND_TOOLKIT_OSX_COCOA@LOWLEVEL_HDR = 
-@COND_TOOLKIT_OSX_IPHONE@LOWLEVEL_HDR =
+@COND_TOOLKIT_OSX_IPHONE@LOWLEVEL_HDR = 
 @COND_TOOLKIT_PM@LOWLEVEL_HDR = 
 COND_TOOLKIT_WINCE_LOWLEVEL_HDR =  \
        wx/msw/ole/activex.h \
@@ -3713,14 +3715,14 @@ COND_WXUNIV_1_ADVANCED_HDR =  \
 @COND_WXUNIV_1@ADVANCED_HDR = $(COND_WXUNIV_1_ADVANCED_HDR)
 @COND_TOOLKIT_COCOA@MEDIA_PLATFORM_HDR = 
 @COND_TOOLKIT_GTK@MEDIA_PLATFORM_HDR = 
-@COND_TOOLKIT_MOTIF@MEDIA_PLATFORM_HDR =
-@COND_TOOLKIT_MSW@MEDIA_PLATFORM_HDR =
-@COND_TOOLKIT_OSX_CARBON@MEDIA_PLATFORM_HDR =
-@COND_TOOLKIT_OSX_COCOA@MEDIA_PLATFORM_HDR =
-@COND_TOOLKIT_OSX_IPHONE@MEDIA_PLATFORM_HDR =
+@COND_TOOLKIT_MOTIF@MEDIA_PLATFORM_HDR = 
+@COND_TOOLKIT_MSW@MEDIA_PLATFORM_HDR =  
+@COND_TOOLKIT_OSX_CARBON@MEDIA_PLATFORM_HDR = 
+@COND_TOOLKIT_OSX_COCOA@MEDIA_PLATFORM_HDR = 
+@COND_TOOLKIT_OSX_IPHONE@MEDIA_PLATFORM_HDR = 
 @COND_TOOLKIT_PM@MEDIA_PLATFORM_HDR = 
-@COND_TOOLKIT_WINCE@MEDIA_PLATFORM_HDR =
-@COND_TOOLKIT_X11@MEDIA_PLATFORM_HDR =
+@COND_TOOLKIT_WINCE@MEDIA_PLATFORM_HDR = 
+@COND_TOOLKIT_X11@MEDIA_PLATFORM_HDR = 
 @COND_USE_GUI_1_WXUNIV_0@GUI_CORE_HEADERS = $(GUI_HDR)
 COND_USE_GUI_1_WXUNIV_1_GUI_CORE_HEADERS =  \
        wx/generic/accel.h \
@@ -6009,7 +6011,7 @@ COND_TOOLKIT_WINCE___ADVANCED_PLATFORM_NATIVE_SRC_OBJECTS =  \
 @COND_TOOLKIT_OSX_CARBON@__MEDIA_PLATFORM_SRC_OBJECTS \
 @COND_TOOLKIT_OSX_CARBON@      = monodll_carbon_mediactrl.o
 @COND_TOOLKIT_OSX_COCOA@__MEDIA_PLATFORM_SRC_OBJECTS = 
-@COND_TOOLKIT_OSX_IPHONE@__MEDIA_PLATFORM_SRC_OBJECTS =
+@COND_TOOLKIT_OSX_IPHONE@__MEDIA_PLATFORM_SRC_OBJECTS = 
 @COND_TOOLKIT_PM@__MEDIA_PLATFORM_SRC_OBJECTS = 
 @COND_TOOLKIT_WINCE@__MEDIA_PLATFORM_SRC_OBJECTS = \
 @COND_TOOLKIT_WINCE@   monodll_mediactrl_am.o monodll_mediactrl_wmp10.o \
@@ -7879,7 +7881,7 @@ COND_TOOLKIT_WINCE___ADVANCED_PLATFORM_NATIVE_SRC_OBJECTS_1 =  \
 @COND_TOOLKIT_OSX_CARBON@__MEDIA_PLATFORM_SRC_OBJECTS_1 \
 @COND_TOOLKIT_OSX_CARBON@      = monolib_carbon_mediactrl.o
 @COND_TOOLKIT_OSX_COCOA@__MEDIA_PLATFORM_SRC_OBJECTS_1 = 
-@COND_TOOLKIT_OSX_IPHONE@__MEDIA_PLATFORM_SRC_OBJECTS_1 =
+@COND_TOOLKIT_OSX_IPHONE@__MEDIA_PLATFORM_SRC_OBJECTS_1 = 
 @COND_TOOLKIT_PM@__MEDIA_PLATFORM_SRC_OBJECTS_1 = 
 @COND_TOOLKIT_WINCE@__MEDIA_PLATFORM_SRC_OBJECTS_1 = \
 @COND_TOOLKIT_WINCE@   monolib_mediactrl_am.o monolib_mediactrl_wmp10.o \
@@ -11713,7 +11715,7 @@ COND_TOOLKIT_MSW___MEDIA_PLATFORM_SRC_OBJECTS_2 =  \
 @COND_TOOLKIT_OSX_CARBON@__MEDIA_PLATFORM_SRC_OBJECTS_2 \
 @COND_TOOLKIT_OSX_CARBON@      = mediadll_carbon_mediactrl.o
 @COND_TOOLKIT_OSX_COCOA@__MEDIA_PLATFORM_SRC_OBJECTS_2 = 
-@COND_TOOLKIT_OSX_IPHONE@__MEDIA_PLATFORM_SRC_OBJECTS_2 =
+@COND_TOOLKIT_OSX_IPHONE@__MEDIA_PLATFORM_SRC_OBJECTS_2 = 
 @COND_TOOLKIT_PM@__MEDIA_PLATFORM_SRC_OBJECTS_2 = 
 @COND_TOOLKIT_WINCE@__MEDIA_PLATFORM_SRC_OBJECTS_2 = \
 @COND_TOOLKIT_WINCE@   mediadll_mediactrl_am.o mediadll_mediactrl_wmp10.o \
@@ -11746,7 +11748,7 @@ COND_TOOLKIT_MSW___MEDIA_PLATFORM_SRC_OBJECTS_3 =  \
 @COND_TOOLKIT_OSX_CARBON@__MEDIA_PLATFORM_SRC_OBJECTS_3 \
 @COND_TOOLKIT_OSX_CARBON@      = medialib_carbon_mediactrl.o
 @COND_TOOLKIT_OSX_COCOA@__MEDIA_PLATFORM_SRC_OBJECTS_3 = 
-@COND_TOOLKIT_OSX_IPHONE@__MEDIA_PLATFORM_SRC_OBJECTS_3 =
+@COND_TOOLKIT_OSX_IPHONE@__MEDIA_PLATFORM_SRC_OBJECTS_3 = 
 @COND_TOOLKIT_PM@__MEDIA_PLATFORM_SRC_OBJECTS_3 = 
 @COND_TOOLKIT_WINCE@__MEDIA_PLATFORM_SRC_OBJECTS_3 = \
 @COND_TOOLKIT_WINCE@   medialib_mediactrl_am.o medialib_mediactrl_wmp10.o \

diff --git a/build/bakefiles/files.bkl b/build/bakefiles/files.bkl
index 08a5499a1770fe77111f2370bd5c322d116cc736..e13803eb0d08d156b32273484dd26a4233689414 100644 (file)
--- a/build/bakefiles/files.bkl
+++ b/build/bakefiles/files.bkl
@@ -488,6 +488,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/module.h
     wx/mousestate.h
     wx/msgout.h
+    wx/msgqueue.h
     wx/mstream.h
     wx/object.h
     wx/platform.h

diff --git a/build/msw/makefile.bcc b/build/msw/makefile.bcc
index 8fe2aee5cb17a6f92b232fb264cb50d6dc90c523..909f43991277055bbc51056aa4fff50b401ec1e2 100644 (file)
--- a/build/msw/makefile.bcc
+++ b/build/msw/makefile.bcc
@@ -1026,10 +1026,10 @@ HTMLDLL_OBJECTS =  \
        $(OBJS)\htmldll_m_links.obj \\r
        $(OBJS)\htmldll_m_list.obj \\r
        $(OBJS)\htmldll_m_pre.obj \\r
-       $(OBJS)\htmldll_m_span.obj \
+       $(OBJS)\htmldll_m_span.obj \\r
        $(OBJS)\htmldll_m_style.obj \\r
        $(OBJS)\htmldll_m_tables.obj \\r
-       $(OBJS)\htmldll_styleparams.obj \
+       $(OBJS)\htmldll_styleparams.obj \\r
        $(OBJS)\htmldll_winpars.obj \\r
        $(OBJS)\htmldll_htmllbox.obj\r
 HTMLLIB_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \\r
@@ -1063,10 +1063,10 @@ HTMLLIB_OBJECTS =  \
        $(OBJS)\htmllib_m_links.obj \\r
        $(OBJS)\htmllib_m_list.obj \\r
        $(OBJS)\htmllib_m_pre.obj \\r
-       $(OBJS)\htmllib_m_span.obj \
+       $(OBJS)\htmllib_m_span.obj \\r
        $(OBJS)\htmllib_m_style.obj \\r
        $(OBJS)\htmllib_m_tables.obj \\r
-       $(OBJS)\htmllib_styleparams.obj \
+       $(OBJS)\htmllib_styleparams.obj \\r
        $(OBJS)\htmllib_winpars.obj \\r
        $(OBJS)\htmllib_htmllbox.obj\r
 QADLL_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \\r
@@ -1557,10 +1557,10 @@ ____MONOLIB_GUI_SRC_FILENAMES_OBJECTS =  \
        $(OBJS)\monodll_m_links.obj \\r
        $(OBJS)\monodll_m_list.obj \\r
        $(OBJS)\monodll_m_pre.obj \\r
-       $(OBJS)\monodll_m_span.obj \
+       $(OBJS)\monodll_m_span.obj \\r
        $(OBJS)\monodll_m_style.obj \\r
        $(OBJS)\monodll_m_tables.obj \\r
-       $(OBJS)\monodll_styleparams.obj \
+       $(OBJS)\monodll_styleparams.obj \\r
        $(OBJS)\monodll_winpars.obj \\r
        $(OBJS)\monodll_htmllbox.obj \\r
        $(OBJS)\monodll_debugrpt.obj \\r
@@ -2266,10 +2266,10 @@ ____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS =  \
        $(OBJS)\monolib_m_links.obj \\r
        $(OBJS)\monolib_m_list.obj \\r
        $(OBJS)\monolib_m_pre.obj \\r
-       $(OBJS)\monolib_m_span.obj \
+       $(OBJS)\monolib_m_span.obj \\r
        $(OBJS)\monolib_m_style.obj \\r
        $(OBJS)\monolib_m_tables.obj \\r
-       $(OBJS)\monolib_styleparams.obj \
+       $(OBJS)\monolib_styleparams.obj \\r
        $(OBJS)\monolib_winpars.obj \\r
        $(OBJS)\monolib_htmllbox.obj \\r
        $(OBJS)\monolib_debugrpt.obj \\r
@@ -6436,18 +6436,18 @@ $(OBJS)\monodll_m_list.obj: ..\..\src\html\m_list.cpp
 $(OBJS)\monodll_m_pre.obj: ..\..\src\html\m_pre.cpp\r
        $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\html\m_pre.cpp\r
 \r
-$(OBJS)\monodll_m_span.obj: ..\..\src\html\m_span.cpp
-       $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\html\m_span.cpp
-
+$(OBJS)\monodll_m_span.obj: ..\..\src\html\m_span.cpp\r
+       $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\html\m_span.cpp\r
+\r
 $(OBJS)\monodll_m_style.obj: ..\..\src\html\m_style.cpp\r
        $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\html\m_style.cpp\r
 \r
 $(OBJS)\monodll_m_tables.obj: ..\..\src\html\m_tables.cpp\r
        $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\html\m_tables.cpp\r
 \r
-$(OBJS)\monodll_styleparams.obj: ..\..\src\html\styleparams.cpp
-       $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\html\styleparams.cpp
-
+$(OBJS)\monodll_styleparams.obj: ..\..\src\html\styleparams.cpp\r
+       $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\html\styleparams.cpp\r
+\r
 $(OBJS)\monodll_winpars.obj: ..\..\src\html\winpars.cpp\r
        $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\html\winpars.cpp\r
 \r
@@ -8643,18 +8643,18 @@ $(OBJS)\monolib_m_list.obj: ..\..\src\html\m_list.cpp
 $(OBJS)\monolib_m_pre.obj: ..\..\src\html\m_pre.cpp\r
        $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\html\m_pre.cpp\r
 \r
-$(OBJS)\monolib_m_span.obj: ..\..\src\html\m_span.cpp
-       $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\html\m_span.cpp
-
+$(OBJS)\monolib_m_span.obj: ..\..\src\html\m_span.cpp\r
+       $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\html\m_span.cpp\r
+\r
 $(OBJS)\monolib_m_style.obj: ..\..\src\html\m_style.cpp\r
        $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\html\m_style.cpp\r
 \r
 $(OBJS)\monolib_m_tables.obj: ..\..\src\html\m_tables.cpp\r
        $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\html\m_tables.cpp\r
 \r
-$(OBJS)\monolib_styleparams.obj: ..\..\src\html\styleparams.cpp
-       $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\html\styleparams.cpp
-
+$(OBJS)\monolib_styleparams.obj: ..\..\src\html\styleparams.cpp\r
+       $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\html\styleparams.cpp\r
+\r
 $(OBJS)\monolib_winpars.obj: ..\..\src\html\winpars.cpp\r
        $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\html\winpars.cpp\r
 \r
@@ -13765,18 +13765,18 @@ $(OBJS)\htmldll_m_list.obj: ..\..\src\html\m_list.cpp
 $(OBJS)\htmldll_m_pre.obj: ..\..\src\html\m_pre.cpp\r
        $(CXX) -q -c -P -o$@ $(HTMLDLL_CXXFLAGS) ..\..\src\html\m_pre.cpp\r
 \r
-$(OBJS)\htmldll_m_span.obj: ..\..\src\html\m_span.cpp
-       $(CXX) -q -c -P -o$@ $(HTMLDLL_CXXFLAGS) ..\..\src\html\m_span.cpp
-
+$(OBJS)\htmldll_m_span.obj: ..\..\src\html\m_span.cpp\r
+       $(CXX) -q -c -P -o$@ $(HTMLDLL_CXXFLAGS) ..\..\src\html\m_span.cpp\r
+\r
 $(OBJS)\htmldll_m_style.obj: ..\..\src\html\m_style.cpp\r
        $(CXX) -q -c -P -o$@ $(HTMLDLL_CXXFLAGS) ..\..\src\html\m_style.cpp\r
 \r
 $(OBJS)\htmldll_m_tables.obj: ..\..\src\html\m_tables.cpp\r
        $(CXX) -q -c -P -o$@ $(HTMLDLL_CXXFLAGS) ..\..\src\html\m_tables.cpp\r
 \r
-$(OBJS)\htmldll_styleparams.obj: ..\..\src\html\styleparams.cpp
-       $(CXX) -q -c -P -o$@ $(HTMLDLL_CXXFLAGS) ..\..\src\html\styleparams.cpp
-
+$(OBJS)\htmldll_styleparams.obj: ..\..\src\html\styleparams.cpp\r
+       $(CXX) -q -c -P -o$@ $(HTMLDLL_CXXFLAGS) ..\..\src\html\styleparams.cpp\r
+\r
 $(OBJS)\htmldll_winpars.obj: ..\..\src\html\winpars.cpp\r
        $(CXX) -q -c -P -o$@ $(HTMLDLL_CXXFLAGS) ..\..\src\html\winpars.cpp\r
 \r
@@ -13846,18 +13846,18 @@ $(OBJS)\htmllib_m_list.obj: ..\..\src\html\m_list.cpp
 $(OBJS)\htmllib_m_pre.obj: ..\..\src\html\m_pre.cpp\r
        $(CXX) -q -c -P -o$@ $(HTMLLIB_CXXFLAGS) ..\..\src\html\m_pre.cpp\r
 \r
-$(OBJS)\htmllib_m_span.obj: ..\..\src\html\m_span.cpp
-       $(CXX) -q -c -P -o$@ $(HTMLLIB_CXXFLAGS) ..\..\src\html\m_span.cpp
-
+$(OBJS)\htmllib_m_span.obj: ..\..\src\html\m_span.cpp\r
+       $(CXX) -q -c -P -o$@ $(HTMLLIB_CXXFLAGS) ..\..\src\html\m_span.cpp\r
+\r
 $(OBJS)\htmllib_m_style.obj: ..\..\src\html\m_style.cpp\r
        $(CXX) -q -c -P -o$@ $(HTMLLIB_CXXFLAGS) ..\..\src\html\m_style.cpp\r
 \r
 $(OBJS)\htmllib_m_tables.obj: ..\..\src\html\m_tables.cpp\r
        $(CXX) -q -c -P -o$@ $(HTMLLIB_CXXFLAGS) ..\..\src\html\m_tables.cpp\r
 \r
-$(OBJS)\htmllib_styleparams.obj: ..\..\src\html\styleparams.cpp
-       $(CXX) -q -c -P -o$@ $(HTMLLIB_CXXFLAGS) ..\..\src\html\styleparams.cpp
-
+$(OBJS)\htmllib_styleparams.obj: ..\..\src\html\styleparams.cpp\r
+       $(CXX) -q -c -P -o$@ $(HTMLLIB_CXXFLAGS) ..\..\src\html\styleparams.cpp\r
+\r
 $(OBJS)\htmllib_winpars.obj: ..\..\src\html\winpars.cpp\r
        $(CXX) -q -c -P -o$@ $(HTMLLIB_CXXFLAGS) ..\..\src\html\winpars.cpp\r
 \r

diff --git a/build/msw/makefile.gcc b/build/msw/makefile.gcc
index 2c4b833b7b6dbcf2c0afe97a7924879ccd85cf18..954fa6d8bfe9130eecda80218f4498ad3d4b95e2 100644 (file)
--- a/build/msw/makefile.gcc
+++ b/build/msw/makefile.gcc
@@ -1023,10 +1023,10 @@ HTMLDLL_OBJECTS =  \
        $(OBJS)\htmldll_m_links.o \\r
        $(OBJS)\htmldll_m_list.o \\r
        $(OBJS)\htmldll_m_pre.o \\r
-       $(OBJS)\htmldll_m_span.o \
+       $(OBJS)\htmldll_m_span.o \\r
        $(OBJS)\htmldll_m_style.o \\r
        $(OBJS)\htmldll_m_tables.o \\r
-       $(OBJS)\htmldll_styleparams.o \
+       $(OBJS)\htmldll_styleparams.o \\r
        $(OBJS)\htmldll_winpars.o \\r
        $(OBJS)\htmldll_htmllbox.o\r
 HTMLLIB_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) \\r
@@ -1060,10 +1060,10 @@ HTMLLIB_OBJECTS =  \
        $(OBJS)\htmllib_m_links.o \\r
        $(OBJS)\htmllib_m_list.o \\r
        $(OBJS)\htmllib_m_pre.o \\r
-       $(OBJS)\htmllib_m_span.o \
+       $(OBJS)\htmllib_m_span.o \\r
        $(OBJS)\htmllib_m_style.o \\r
        $(OBJS)\htmllib_m_tables.o \\r
-       $(OBJS)\htmllib_styleparams.o \
+       $(OBJS)\htmllib_styleparams.o \\r
        $(OBJS)\htmllib_winpars.o \\r
        $(OBJS)\htmllib_htmllbox.o\r
 QADLL_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) $(GCCFLAGS) \\r
@@ -1566,10 +1566,10 @@ ____MONOLIB_GUI_SRC_FILENAMES_OBJECTS =  \
        $(OBJS)\monodll_m_links.o \\r
        $(OBJS)\monodll_m_list.o \\r
        $(OBJS)\monodll_m_pre.o \\r
-       $(OBJS)\monodll_m_span.o \
+       $(OBJS)\monodll_m_span.o \\r
        $(OBJS)\monodll_m_style.o \\r
        $(OBJS)\monodll_m_tables.o \\r
-       $(OBJS)\monodll_styleparams.o \
+       $(OBJS)\monodll_styleparams.o \\r
        $(OBJS)\monodll_winpars.o \\r
        $(OBJS)\monodll_htmllbox.o \\r
        $(OBJS)\monodll_debugrpt.o \\r
@@ -2281,10 +2281,10 @@ ____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS =  \
        $(OBJS)\monolib_m_links.o \\r
        $(OBJS)\monolib_m_list.o \\r
        $(OBJS)\monolib_m_pre.o \\r
-       $(OBJS)\monolib_m_span.o \
+       $(OBJS)\monolib_m_span.o \\r
        $(OBJS)\monolib_m_style.o \\r
        $(OBJS)\monolib_m_tables.o \\r
-       $(OBJS)\monolib_styleparams.o \
+       $(OBJS)\monolib_styleparams.o \\r
        $(OBJS)\monolib_winpars.o \\r
        $(OBJS)\monolib_htmllbox.o \\r
        $(OBJS)\monolib_debugrpt.o \\r
@@ -6585,18 +6585,18 @@ $(OBJS)\monodll_m_list.o: ../../src/html/m_list.cpp
 $(OBJS)\monodll_m_pre.o: ../../src/html/m_pre.cpp\r
        $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<\r
 \r
-$(OBJS)\monodll_m_span.o: ../../src/html/m_span.cpp
-       $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
-
+$(OBJS)\monodll_m_span.o: ../../src/html/m_span.cpp\r
+       $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<\r
+\r
 $(OBJS)\monodll_m_style.o: ../../src/html/m_style.cpp\r
        $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<\r
 \r
 $(OBJS)\monodll_m_tables.o: ../../src/html/m_tables.cpp\r
        $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<\r
 \r
-$(OBJS)\monodll_styleparams.o: ../../src/html/styleparams.cpp
-       $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
-
+$(OBJS)\monodll_styleparams.o: ../../src/html/styleparams.cpp\r
+       $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<\r
+\r
 $(OBJS)\monodll_winpars.o: ../../src/html/winpars.cpp\r
        $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<\r
 \r
@@ -8792,18 +8792,18 @@ $(OBJS)\monolib_m_list.o: ../../src/html/m_list.cpp
 $(OBJS)\monolib_m_pre.o: ../../src/html/m_pre.cpp\r
        $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<\r
 \r
-$(OBJS)\monolib_m_span.o: ../../src/html/m_span.cpp
-       $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
-
+$(OBJS)\monolib_m_span.o: ../../src/html/m_span.cpp\r
+       $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<\r
+\r
 $(OBJS)\monolib_m_style.o: ../../src/html/m_style.cpp\r
        $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<\r
 \r
 $(OBJS)\monolib_m_tables.o: ../../src/html/m_tables.cpp\r
        $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<\r
 \r
-$(OBJS)\monolib_styleparams.o: ../../src/html/styleparams.cpp
-       $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
-
+$(OBJS)\monolib_styleparams.o: ../../src/html/styleparams.cpp\r
+       $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<\r
+\r
 $(OBJS)\monolib_winpars.o: ../../src/html/winpars.cpp\r
        $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<\r
 \r
@@ -13914,18 +13914,18 @@ $(OBJS)\htmldll_m_list.o: ../../src/html/m_list.cpp
 $(OBJS)\htmldll_m_pre.o: ../../src/html/m_pre.cpp\r
        $(CXX) -c -o $@ $(HTMLDLL_CXXFLAGS) $(CPPDEPS) $<\r
 \r
-$(OBJS)\htmldll_m_span.o: ../../src/html/m_span.cpp
-       $(CXX) -c -o $@ $(HTMLDLL_CXXFLAGS) $(CPPDEPS) $<
-
+$(OBJS)\htmldll_m_span.o: ../../src/html/m_span.cpp\r
+       $(CXX) -c -o $@ $(HTMLDLL_CXXFLAGS) $(CPPDEPS) $<\r
+\r
 $(OBJS)\htmldll_m_style.o: ../../src/html/m_style.cpp\r
        $(CXX) -c -o $@ $(HTMLDLL_CXXFLAGS) $(CPPDEPS) $<\r
 \r
 $(OBJS)\htmldll_m_tables.o: ../../src/html/m_tables.cpp\r
        $(CXX) -c -o $@ $(HTMLDLL_CXXFLAGS) $(CPPDEPS) $<\r
 \r
-$(OBJS)\htmldll_styleparams.o: ../../src/html/styleparams.cpp
-       $(CXX) -c -o $@ $(HTMLDLL_CXXFLAGS) $(CPPDEPS) $<
-
+$(OBJS)\htmldll_styleparams.o: ../../src/html/styleparams.cpp\r
+       $(CXX) -c -o $@ $(HTMLDLL_CXXFLAGS) $(CPPDEPS) $<\r
+\r
 $(OBJS)\htmldll_winpars.o: ../../src/html/winpars.cpp\r
        $(CXX) -c -o $@ $(HTMLDLL_CXXFLAGS) $(CPPDEPS) $<\r
 \r
@@ -13995,18 +13995,18 @@ $(OBJS)\htmllib_m_list.o: ../../src/html/m_list.cpp
 $(OBJS)\htmllib_m_pre.o: ../../src/html/m_pre.cpp\r
        $(CXX) -c -o $@ $(HTMLLIB_CXXFLAGS) $(CPPDEPS) $<\r
 \r
-$(OBJS)\htmllib_m_span.o: ../../src/html/m_span.cpp
-       $(CXX) -c -o $@ $(HTMLLIB_CXXFLAGS) $(CPPDEPS) $<
-
+$(OBJS)\htmllib_m_span.o: ../../src/html/m_span.cpp\r
+       $(CXX) -c -o $@ $(HTMLLIB_CXXFLAGS) $(CPPDEPS) $<\r
+\r
 $(OBJS)\htmllib_m_style.o: ../../src/html/m_style.cpp\r
        $(CXX) -c -o $@ $(HTMLLIB_CXXFLAGS) $(CPPDEPS) $<\r
 \r
 $(OBJS)\htmllib_m_tables.o: ../../src/html/m_tables.cpp\r
        $(CXX) -c -o $@ $(HTMLLIB_CXXFLAGS) $(CPPDEPS) $<\r
 \r
-$(OBJS)\htmllib_styleparams.o: ../../src/html/styleparams.cpp
-       $(CXX) -c -o $@ $(HTMLLIB_CXXFLAGS) $(CPPDEPS) $<
-
+$(OBJS)\htmllib_styleparams.o: ../../src/html/styleparams.cpp\r
+       $(CXX) -c -o $@ $(HTMLLIB_CXXFLAGS) $(CPPDEPS) $<\r
+\r
 $(OBJS)\htmllib_winpars.o: ../../src/html/winpars.cpp\r
        $(CXX) -c -o $@ $(HTMLLIB_CXXFLAGS) $(CPPDEPS) $<\r
 \r

diff --git a/build/msw/makefile.vc b/build/msw/makefile.vc
index a7c8632dbcfdbe75d46c6f40ecbe3a68769082d2..370a2fe81b05fc40105b941b3a40d84a7cab990a 100644 (file)
--- a/build/msw/makefile.vc
+++ b/build/msw/makefile.vc
@@ -1080,10 +1080,10 @@ HTMLDLL_OBJECTS =  \
        $(OBJS)\htmldll_m_links.obj \\r
        $(OBJS)\htmldll_m_list.obj \\r
        $(OBJS)\htmldll_m_pre.obj \\r
-       $(OBJS)\htmldll_m_span.obj \
+       $(OBJS)\htmldll_m_span.obj \\r
        $(OBJS)\htmldll_m_style.obj \\r
        $(OBJS)\htmldll_m_tables.obj \\r
-       $(OBJS)\htmldll_styleparams.obj \
+       $(OBJS)\htmldll_styleparams.obj \\r
        $(OBJS)\htmldll_winpars.obj \\r
        $(OBJS)\htmldll_htmllbox.obj\r
 HTMLDLL_RESOURCES =  \\r
@@ -1121,10 +1121,10 @@ HTMLLIB_OBJECTS =  \
        $(OBJS)\htmllib_m_links.obj \\r
        $(OBJS)\htmllib_m_list.obj \\r
        $(OBJS)\htmllib_m_pre.obj \\r
-       $(OBJS)\htmllib_m_span.obj \
+       $(OBJS)\htmllib_m_span.obj \\r
        $(OBJS)\htmllib_m_style.obj \\r
        $(OBJS)\htmllib_m_tables.obj \\r
-       $(OBJS)\htmllib_styleparams.obj \
+       $(OBJS)\htmllib_styleparams.obj \\r
        $(OBJS)\htmllib_winpars.obj \\r
        $(OBJS)\htmllib_htmllbox.obj\r
 QADLL_CXXFLAGS = /M$(__RUNTIME_LIBS_333)$(__DEBUGRUNTIME) /DWIN32 \\r
@@ -1765,10 +1765,10 @@ ____MONOLIB_GUI_SRC_FILENAMES_OBJECTS =  \
        $(OBJS)\monodll_m_links.obj \\r
        $(OBJS)\monodll_m_list.obj \\r
        $(OBJS)\monodll_m_pre.obj \\r
-       $(OBJS)\monodll_m_span.obj \
+       $(OBJS)\monodll_m_span.obj \\r
        $(OBJS)\monodll_m_style.obj \\r
        $(OBJS)\monodll_m_tables.obj \\r
-       $(OBJS)\monodll_styleparams.obj \
+       $(OBJS)\monodll_styleparams.obj \\r
        $(OBJS)\monodll_winpars.obj \\r
        $(OBJS)\monodll_htmllbox.obj \\r
        $(OBJS)\monodll_debugrpt.obj \\r
@@ -2480,10 +2480,10 @@ ____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS =  \
        $(OBJS)\monolib_m_links.obj \\r
        $(OBJS)\monolib_m_list.obj \\r
        $(OBJS)\monolib_m_pre.obj \\r
-       $(OBJS)\monolib_m_span.obj \
+       $(OBJS)\monolib_m_span.obj \\r
        $(OBJS)\monolib_m_style.obj \\r
        $(OBJS)\monolib_m_tables.obj \\r
-       $(OBJS)\monolib_styleparams.obj \
+       $(OBJS)\monolib_styleparams.obj \\r
        $(OBJS)\monolib_winpars.obj \\r
        $(OBJS)\monolib_htmllbox.obj \\r
        $(OBJS)\monolib_debugrpt.obj \\r
@@ -7016,18 +7016,18 @@ $(OBJS)\monodll_m_list.obj: ..\..\src\html\m_list.cpp
 $(OBJS)\monodll_m_pre.obj: ..\..\src\html\m_pre.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\html\m_pre.cpp\r
 \r
-$(OBJS)\monodll_m_span.obj: ..\..\src\html\m_span.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\html\m_span.cpp
-
+$(OBJS)\monodll_m_span.obj: ..\..\src\html\m_span.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\html\m_span.cpp\r
+\r
 $(OBJS)\monodll_m_style.obj: ..\..\src\html\m_style.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\html\m_style.cpp\r
 \r
 $(OBJS)\monodll_m_tables.obj: ..\..\src\html\m_tables.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\html\m_tables.cpp\r
 \r
-$(OBJS)\monodll_styleparams.obj: ..\..\src\html\styleparams.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\html\styleparams.cpp
-
+$(OBJS)\monodll_styleparams.obj: ..\..\src\html\styleparams.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\html\styleparams.cpp\r
+\r
 $(OBJS)\monodll_winpars.obj: ..\..\src\html\winpars.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\html\winpars.cpp\r
 \r
@@ -9223,18 +9223,18 @@ $(OBJS)\monolib_m_list.obj: ..\..\src\html\m_list.cpp
 $(OBJS)\monolib_m_pre.obj: ..\..\src\html\m_pre.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\html\m_pre.cpp\r
 \r
-$(OBJS)\monolib_m_span.obj: ..\..\src\html\m_span.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\html\m_span.cpp
-
+$(OBJS)\monolib_m_span.obj: ..\..\src\html\m_span.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\html\m_span.cpp\r
+\r
 $(OBJS)\monolib_m_style.obj: ..\..\src\html\m_style.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\html\m_style.cpp\r
 \r
 $(OBJS)\monolib_m_tables.obj: ..\..\src\html\m_tables.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\html\m_tables.cpp\r
 \r
-$(OBJS)\monolib_styleparams.obj: ..\..\src\html\styleparams.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\html\styleparams.cpp
-
+$(OBJS)\monolib_styleparams.obj: ..\..\src\html\styleparams.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\html\styleparams.cpp\r
+\r
 $(OBJS)\monolib_winpars.obj: ..\..\src\html\winpars.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\html\winpars.cpp\r
 \r
@@ -14345,18 +14345,18 @@ $(OBJS)\htmldll_m_list.obj: ..\..\src\html\m_list.cpp
 $(OBJS)\htmldll_m_pre.obj: ..\..\src\html\m_pre.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(HTMLDLL_CXXFLAGS) ..\..\src\html\m_pre.cpp\r
 \r
-$(OBJS)\htmldll_m_span.obj: ..\..\src\html\m_span.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(HTMLDLL_CXXFLAGS) ..\..\src\html\m_span.cpp
-
+$(OBJS)\htmldll_m_span.obj: ..\..\src\html\m_span.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(HTMLDLL_CXXFLAGS) ..\..\src\html\m_span.cpp\r
+\r
 $(OBJS)\htmldll_m_style.obj: ..\..\src\html\m_style.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(HTMLDLL_CXXFLAGS) ..\..\src\html\m_style.cpp\r
 \r
 $(OBJS)\htmldll_m_tables.obj: ..\..\src\html\m_tables.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(HTMLDLL_CXXFLAGS) ..\..\src\html\m_tables.cpp\r
 \r
-$(OBJS)\htmldll_styleparams.obj: ..\..\src\html\styleparams.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(HTMLDLL_CXXFLAGS) ..\..\src\html\styleparams.cpp
-
+$(OBJS)\htmldll_styleparams.obj: ..\..\src\html\styleparams.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(HTMLDLL_CXXFLAGS) ..\..\src\html\styleparams.cpp\r
+\r
 $(OBJS)\htmldll_winpars.obj: ..\..\src\html\winpars.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(HTMLDLL_CXXFLAGS) ..\..\src\html\winpars.cpp\r
 \r
@@ -14426,18 +14426,18 @@ $(OBJS)\htmllib_m_list.obj: ..\..\src\html\m_list.cpp
 $(OBJS)\htmllib_m_pre.obj: ..\..\src\html\m_pre.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(HTMLLIB_CXXFLAGS) ..\..\src\html\m_pre.cpp\r
 \r
-$(OBJS)\htmllib_m_span.obj: ..\..\src\html\m_span.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(HTMLLIB_CXXFLAGS) ..\..\src\html\m_span.cpp
-
+$(OBJS)\htmllib_m_span.obj: ..\..\src\html\m_span.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(HTMLLIB_CXXFLAGS) ..\..\src\html\m_span.cpp\r
+\r
 $(OBJS)\htmllib_m_style.obj: ..\..\src\html\m_style.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(HTMLLIB_CXXFLAGS) ..\..\src\html\m_style.cpp\r
 \r
 $(OBJS)\htmllib_m_tables.obj: ..\..\src\html\m_tables.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(HTMLLIB_CXXFLAGS) ..\..\src\html\m_tables.cpp\r
 \r
-$(OBJS)\htmllib_styleparams.obj: ..\..\src\html\styleparams.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(HTMLLIB_CXXFLAGS) ..\..\src\html\styleparams.cpp
-
+$(OBJS)\htmllib_styleparams.obj: ..\..\src\html\styleparams.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(HTMLLIB_CXXFLAGS) ..\..\src\html\styleparams.cpp\r
+\r
 $(OBJS)\htmllib_winpars.obj: ..\..\src\html\winpars.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(HTMLLIB_CXXFLAGS) ..\..\src\html\winpars.cpp\r
 \r

diff --git a/build/msw/makefile.wat b/build/msw/makefile.wat
index 62ce320d174af49056492fced70e40a7a0bb90a9..271393573ad001e9766b099086dce83a09671624 100644 (file)
--- a/build/msw/makefile.wat
+++ b/build/msw/makefile.wat
@@ -123,10 +123,10 @@ ____MONOLIB_GUI_SRC_FILENAMES_OBJECTS =  &
        $(OBJS)\monodll_m_links.obj &\r
        $(OBJS)\monodll_m_list.obj &\r
        $(OBJS)\monodll_m_pre.obj &\r
-       $(OBJS)\monodll_m_span.obj &
+       $(OBJS)\monodll_m_span.obj &\r
        $(OBJS)\monodll_m_style.obj &\r
        $(OBJS)\monodll_m_tables.obj &\r
-       $(OBJS)\monodll_styleparams.obj &
+       $(OBJS)\monodll_styleparams.obj &\r
        $(OBJS)\monodll_winpars.obj &\r
        $(OBJS)\monodll_htmllbox.obj &\r
        $(OBJS)\monodll_debugrpt.obj &\r
@@ -843,10 +843,10 @@ ____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS =  &
        $(OBJS)\monolib_m_links.obj &\r
        $(OBJS)\monolib_m_list.obj &\r
        $(OBJS)\monolib_m_pre.obj &\r
-       $(OBJS)\monolib_m_span.obj &
+       $(OBJS)\monolib_m_span.obj &\r
        $(OBJS)\monolib_m_style.obj &\r
        $(OBJS)\monolib_m_tables.obj &\r
-       $(OBJS)\monolib_styleparams.obj &
+       $(OBJS)\monolib_styleparams.obj &\r
        $(OBJS)\monolib_winpars.obj &\r
        $(OBJS)\monolib_htmllbox.obj &\r
        $(OBJS)\monolib_debugrpt.obj &\r
@@ -4231,10 +4231,10 @@ HTMLDLL_OBJECTS =  &
        $(OBJS)\htmldll_m_links.obj &\r
        $(OBJS)\htmldll_m_list.obj &\r
        $(OBJS)\htmldll_m_pre.obj &\r
-       $(OBJS)\htmldll_m_span.obj &
+       $(OBJS)\htmldll_m_span.obj &\r
        $(OBJS)\htmldll_m_style.obj &\r
        $(OBJS)\htmldll_m_tables.obj &\r
-       $(OBJS)\htmldll_styleparams.obj &
+       $(OBJS)\htmldll_styleparams.obj &\r
        $(OBJS)\htmldll_winpars.obj &\r
        $(OBJS)\htmldll_htmllbox.obj\r
 HTMLLIB_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) &\r
@@ -4268,10 +4268,10 @@ HTMLLIB_OBJECTS =  &
        $(OBJS)\htmllib_m_links.obj &\r
        $(OBJS)\htmllib_m_list.obj &\r
        $(OBJS)\htmllib_m_pre.obj &\r
-       $(OBJS)\htmllib_m_span.obj &
+       $(OBJS)\htmllib_m_span.obj &\r
        $(OBJS)\htmllib_m_style.obj &\r
        $(OBJS)\htmllib_m_tables.obj &\r
-       $(OBJS)\htmllib_styleparams.obj &
+       $(OBJS)\htmllib_styleparams.obj &\r
        $(OBJS)\htmllib_winpars.obj &\r
        $(OBJS)\htmllib_htmllbox.obj\r
 QADLL_CXXFLAGS = -bd $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) &\r
@@ -6843,18 +6843,18 @@ $(OBJS)\monodll_m_list.obj :  .AUTODEPEND ..\..\src\html\m_list.cpp
 $(OBJS)\monodll_m_pre.obj :  .AUTODEPEND ..\..\src\html\m_pre.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<\r
 \r
-$(OBJS)\monodll_m_span.obj :  .AUTODEPEND ..\..\src\html\m_span.cpp
-       $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
+$(OBJS)\monodll_m_span.obj :  .AUTODEPEND ..\..\src\html\m_span.cpp\r
+       $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<\r
+\r
 $(OBJS)\monodll_m_style.obj :  .AUTODEPEND ..\..\src\html\m_style.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<\r
 \r
 $(OBJS)\monodll_m_tables.obj :  .AUTODEPEND ..\..\src\html\m_tables.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<\r
 \r
-$(OBJS)\monodll_styleparams.obj :  .AUTODEPEND ..\..\src\html\styleparams.cpp
-       $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
+$(OBJS)\monodll_styleparams.obj :  .AUTODEPEND ..\..\src\html\styleparams.cpp\r
+       $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<\r
+\r
 $(OBJS)\monodll_winpars.obj :  .AUTODEPEND ..\..\src\html\winpars.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<\r
 \r
@@ -9050,18 +9050,18 @@ $(OBJS)\monolib_m_list.obj :  .AUTODEPEND ..\..\src\html\m_list.cpp
 $(OBJS)\monolib_m_pre.obj :  .AUTODEPEND ..\..\src\html\m_pre.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<\r
 \r
-$(OBJS)\monolib_m_span.obj :  .AUTODEPEND ..\..\src\html\m_span.cpp
-       $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
+$(OBJS)\monolib_m_span.obj :  .AUTODEPEND ..\..\src\html\m_span.cpp\r
+       $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<\r
+\r
 $(OBJS)\monolib_m_style.obj :  .AUTODEPEND ..\..\src\html\m_style.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<\r
 \r
 $(OBJS)\monolib_m_tables.obj :  .AUTODEPEND ..\..\src\html\m_tables.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<\r
 \r
-$(OBJS)\monolib_styleparams.obj :  .AUTODEPEND ..\..\src\html\styleparams.cpp
-       $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
+$(OBJS)\monolib_styleparams.obj :  .AUTODEPEND ..\..\src\html\styleparams.cpp\r
+       $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<\r
+\r
 $(OBJS)\monolib_winpars.obj :  .AUTODEPEND ..\..\src\html\winpars.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<\r
 \r
@@ -14172,18 +14172,18 @@ $(OBJS)\htmldll_m_list.obj :  .AUTODEPEND ..\..\src\html\m_list.cpp
 $(OBJS)\htmldll_m_pre.obj :  .AUTODEPEND ..\..\src\html\m_pre.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(HTMLDLL_CXXFLAGS) $<\r
 \r
-$(OBJS)\htmldll_m_span.obj :  .AUTODEPEND ..\..\src\html\m_span.cpp
-       $(CXX) -bt=nt -zq -fo=$^@ $(HTMLDLL_CXXFLAGS) $<
-
+$(OBJS)\htmldll_m_span.obj :  .AUTODEPEND ..\..\src\html\m_span.cpp\r
+       $(CXX) -bt=nt -zq -fo=$^@ $(HTMLDLL_CXXFLAGS) $<\r
+\r
 $(OBJS)\htmldll_m_style.obj :  .AUTODEPEND ..\..\src\html\m_style.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(HTMLDLL_CXXFLAGS) $<\r
 \r
 $(OBJS)\htmldll_m_tables.obj :  .AUTODEPEND ..\..\src\html\m_tables.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(HTMLDLL_CXXFLAGS) $<\r
 \r
-$(OBJS)\htmldll_styleparams.obj :  .AUTODEPEND ..\..\src\html\styleparams.cpp
-       $(CXX) -bt=nt -zq -fo=$^@ $(HTMLDLL_CXXFLAGS) $<
-
+$(OBJS)\htmldll_styleparams.obj :  .AUTODEPEND ..\..\src\html\styleparams.cpp\r
+       $(CXX) -bt=nt -zq -fo=$^@ $(HTMLDLL_CXXFLAGS) $<\r
+\r
 $(OBJS)\htmldll_winpars.obj :  .AUTODEPEND ..\..\src\html\winpars.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(HTMLDLL_CXXFLAGS) $<\r
 \r
@@ -14253,18 +14253,18 @@ $(OBJS)\htmllib_m_list.obj :  .AUTODEPEND ..\..\src\html\m_list.cpp
 $(OBJS)\htmllib_m_pre.obj :  .AUTODEPEND ..\..\src\html\m_pre.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(HTMLLIB_CXXFLAGS) $<\r
 \r
-$(OBJS)\htmllib_m_span.obj :  .AUTODEPEND ..\..\src\html\m_span.cpp
-       $(CXX) -bt=nt -zq -fo=$^@ $(HTMLLIB_CXXFLAGS) $<
-
+$(OBJS)\htmllib_m_span.obj :  .AUTODEPEND ..\..\src\html\m_span.cpp\r
+       $(CXX) -bt=nt -zq -fo=$^@ $(HTMLLIB_CXXFLAGS) $<\r
+\r
 $(OBJS)\htmllib_m_style.obj :  .AUTODEPEND ..\..\src\html\m_style.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(HTMLLIB_CXXFLAGS) $<\r
 \r
 $(OBJS)\htmllib_m_tables.obj :  .AUTODEPEND ..\..\src\html\m_tables.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(HTMLLIB_CXXFLAGS) $<\r
 \r
-$(OBJS)\htmllib_styleparams.obj :  .AUTODEPEND ..\..\src\html\styleparams.cpp
-       $(CXX) -bt=nt -zq -fo=$^@ $(HTMLLIB_CXXFLAGS) $<
-
+$(OBJS)\htmllib_styleparams.obj :  .AUTODEPEND ..\..\src\html\styleparams.cpp\r
+       $(CXX) -bt=nt -zq -fo=$^@ $(HTMLLIB_CXXFLAGS) $<\r
+\r
 $(OBJS)\htmllib_winpars.obj :  .AUTODEPEND ..\..\src\html\winpars.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(HTMLLIB_CXXFLAGS) $<\r
 \r

diff --git a/build/msw/wx_base.dsp b/build/msw/wx_base.dsp
index ab897381417f26fa6de960f54b8f4fd34147589b..fcb0246ac423adbc0d33aefd5c775ca52f510c12 100644 (file)
--- a/build/msw/wx_base.dsp
+++ b/build/msw/wx_base.dsp
@@ -1403,6 +1403,10 @@ SOURCE=..\..\include\wx\msgout.h
 # End Source File\r
 # Begin Source File\r
 \r
+SOURCE=..\..\include\wx\msgqueue.h\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=..\..\include\wx\mstream.h\r
 # End Source File\r
 # Begin Source File\r

diff --git a/build/msw/wx_core.dsp b/build/msw/wx_core.dsp
index cd967f3707c99d2b83625e052d03f3cd4a4164ee..373752784b025595a2f386265ef7739e69f50b10 100644 (file)
--- a/build/msw/wx_core.dsp
+++ b/build/msw/wx_core.dsp
@@ -5722,10 +5722,10 @@ SOURCE=..\..\include\wx\html\m_templ.h
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\include\wx\html\styleparams.h
-# End Source File
-# Begin Source File
-
+SOURCE=..\..\include\wx\html\styleparams.h\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=..\..\include\wx\html\winpars.h\r
 # End Source File\r
 # End Group\r

diff --git a/build/msw/wx_html.dsp b/build/msw/wx_html.dsp
index bd3585020c66fe08c4d97b6c8b8fb578b7f702e0..344c0def0f9c797c4e1ab0eab988d00052ade925 100644 (file)
--- a/build/msw/wx_html.dsp
+++ b/build/msw/wx_html.dsp
@@ -381,10 +381,10 @@ SOURCE=..\..\src\html\m_pre.cpp
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\src\html\m_span.cpp
-# End Source File
-# Begin Source File
-
+SOURCE=..\..\src\html\m_span.cpp\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=..\..\src\html\m_style.cpp\r
 # End Source File\r
 # Begin Source File\r
@@ -393,10 +393,10 @@ SOURCE=..\..\src\html\m_tables.cpp
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\src\html\styleparams.cpp
-# End Source File
-# Begin Source File
-
+SOURCE=..\..\src\html\styleparams.cpp\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=..\..\src\html\winpars.cpp\r
 # End Source File\r
 # End Group\r
@@ -702,10 +702,10 @@ SOURCE=..\..\include\wx\html\m_templ.h
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\include\wx\html\styleparams.h
-# End Source File
-# Begin Source File
-
+SOURCE=..\..\include\wx\html\styleparams.h\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=..\..\include\wx\html\winpars.h\r
 # End Source File\r
 # End Group\r

diff --git a/build/msw/wx_vc7_base.vcproj b/build/msw/wx_vc7_base.vcproj
index 4948436c67f379a18fe3511818bc955d3e9fa69f..14b0613c64d1c7249c0e504b7650cf6ef0e4fc11 100644 (file)
--- a/build/msw/wx_vc7_base.vcproj
+++ b/build/msw/wx_vc7_base.vcproj
@@ -1484,6 +1484,9 @@
                        <File\r
                                RelativePath="..\..\include\wx\msgout.h">\r
                        </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\msgqueue.h">\r
+                       </File>\r
                        <File\r
                                RelativePath="..\..\include\wx\mstream.h">\r
                        </File>\r

diff --git a/build/msw/wx_vc7_core.vcproj b/build/msw/wx_vc7_core.vcproj
index 7140616f8b546d7d18ea79fe69a593da3b1e8596..54f8b70874edb43c9eb61667a224a516dd1f8ffb 100644 (file)
--- a/build/msw/wx_vc7_core.vcproj
+++ b/build/msw/wx_vc7_core.vcproj
@@ -4897,9 +4897,9 @@
                                RelativePath="..\..\include\wx\html\m_templ.h">\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\include\wx\html\styleparams.h">
-                       </File>
-                       <File
+                               RelativePath="..\..\include\wx\html\styleparams.h">\r
+                       </File>\r
+                       <File\r
                                RelativePath="..\..\include\wx\html\winpars.h">\r
                        </File>\r
                </Filter>\r

diff --git a/build/msw/wx_vc7_html.vcproj b/build/msw/wx_vc7_html.vcproj
index d63f1fcfd8de3da176fee436aab96a5da0384405..24c0aa97de7c54ec9b386ffb65711f3fd9e39972 100644 (file)
--- a/build/msw/wx_vc7_html.vcproj
+++ b/build/msw/wx_vc7_html.vcproj
@@ -670,18 +670,18 @@
                                RelativePath="..\..\src\html\m_pre.cpp">\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\src\html\m_span.cpp">
-                       </File>
-                       <File
+                               RelativePath="..\..\src\html\m_span.cpp">\r
+                       </File>\r
+                       <File\r
                                RelativePath="..\..\src\html\m_style.cpp">\r
                        </File>\r
                        <File\r
                                RelativePath="..\..\src\html\m_tables.cpp">\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\src\html\styleparams.cpp">
-                       </File>
-                       <File
+                               RelativePath="..\..\src\html\styleparams.cpp">\r
+                       </File>\r
+                       <File\r
                                RelativePath="..\..\src\html\winpars.cpp">\r
                        </File>\r
                </Filter>\r
@@ -911,9 +911,9 @@
                                RelativePath="..\..\include\wx\html\m_templ.h">\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\include\wx\html\styleparams.h">
-                       </File>
-                       <File
+                               RelativePath="..\..\include\wx\html\styleparams.h">\r
+                       </File>\r
+                       <File\r
                                RelativePath="..\..\include\wx\html\winpars.h">\r
                        </File>\r
                </Filter>\r

diff --git a/build/msw/wx_vc8_base.vcproj b/build/msw/wx_vc8_base.vcproj
index ccb6393d4448f9d78c93aadfe18ef6e3a048f1f9..a54045eda0c79f637d5e8c0762b8ebd6109f8397 100644 (file)
--- a/build/msw/wx_vc8_base.vcproj
+++ b/build/msw/wx_vc8_base.vcproj
@@ -1997,6 +1997,10 @@
                                RelativePath="..\..\include\wx\msgout.h"\r
                                >\r
                        </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\msgqueue.h"\r
+                               >\r
+                       </File>\r
                        <File\r
                                RelativePath="..\..\include\wx\mstream.h"\r
                                >\r

diff --git a/build/msw/wx_vc8_core.vcproj b/build/msw/wx_vc8_core.vcproj
index 68dd8aa2cfe111155b444d82872c2dd44b3713dc..eab882b2daa4cdda0ef27700c0b69b488dd27f1a 100644 (file)
--- a/build/msw/wx_vc8_core.vcproj
+++ b/build/msw/wx_vc8_core.vcproj
@@ -6547,10 +6547,10 @@
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\include\wx\html\styleparams.h"
-                               >
-                       </File>
-                       <File
+                               RelativePath="..\..\include\wx\html\styleparams.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
                                RelativePath="..\..\include\wx\html\winpars.h"\r
                                >\r
                        </File>\r

diff --git a/build/msw/wx_vc8_html.vcproj b/build/msw/wx_vc8_html.vcproj
index 71e523a04fc6de332ec9187d08081a6ecc48d896..71361ec5b8c53202b49374d91359e98b956f8cda 100644 (file)
--- a/build/msw/wx_vc8_html.vcproj
+++ b/build/msw/wx_vc8_html.vcproj
@@ -926,10 +926,10 @@
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\src\html\m_span.cpp"
-                               >
-                       </File>
-                       <File
+                               RelativePath="..\..\src\html\m_span.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
                                RelativePath="..\..\src\html\m_style.cpp"\r
                                >\r
                        </File>\r
@@ -938,10 +938,10 @@
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\src\html\styleparams.cpp"
-                               >
-                       </File>
-                       <File
+                               RelativePath="..\..\src\html\styleparams.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
                                RelativePath="..\..\src\html\winpars.cpp"\r
                                >\r
                        </File>\r
@@ -1233,10 +1233,10 @@
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\include\wx\html\styleparams.h"
-                               >
-                       </File>
-                       <File
+                               RelativePath="..\..\include\wx\html\styleparams.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
                                RelativePath="..\..\include\wx\html\winpars.h"\r
                                >\r
                        </File>\r

diff --git a/build/msw/wx_vc9_base.vcproj b/build/msw/wx_vc9_base.vcproj
index 2f4ff8b5e9c46a4a1a14bedb1d5e10c9d2d907ac..4a8a4dc9c9cf2a1cf32bc73226d690af383b5d8c 100644 (file)
--- a/build/msw/wx_vc9_base.vcproj
+++ b/build/msw/wx_vc9_base.vcproj
@@ -1993,6 +1993,10 @@
                                RelativePath="..\..\include\wx\msgout.h"\r
                                >\r
                        </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\msgqueue.h"\r
+                               >\r
+                       </File>\r
                        <File\r
                                RelativePath="..\..\include\wx\mstream.h"\r
                                >\r

diff --git a/build/msw/wx_vc9_core.vcproj b/build/msw/wx_vc9_core.vcproj
index 1530323594265b3602762308838fa76e70e11767..6728a3e828fc5122cabeff1ac26ed5ace160d4a8 100644 (file)
--- a/build/msw/wx_vc9_core.vcproj
+++ b/build/msw/wx_vc9_core.vcproj
@@ -6543,10 +6543,10 @@
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\include\wx\html\styleparams.h"
-                               >
-                       </File>
-                       <File
+                               RelativePath="..\..\include\wx\html\styleparams.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
                                RelativePath="..\..\include\wx\html\winpars.h"\r
                                >\r
                        </File>\r

diff --git a/build/msw/wx_vc9_html.vcproj b/build/msw/wx_vc9_html.vcproj
index d6ade79ba2863fbe6bd3951683616221ff22da6c..b2c8d9aa83a749363c2e35f2eb7a22f77b7b92c2 100644 (file)
--- a/build/msw/wx_vc9_html.vcproj
+++ b/build/msw/wx_vc9_html.vcproj
@@ -922,10 +922,10 @@
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\src\html\m_span.cpp"
-                               >
-                       </File>
-                       <File
+                               RelativePath="..\..\src\html\m_span.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
                                RelativePath="..\..\src\html\m_style.cpp"\r
                                >\r
                        </File>\r
@@ -934,10 +934,10 @@
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\src\html\styleparams.cpp"
-                               >
-                       </File>
-                       <File
+                               RelativePath="..\..\src\html\styleparams.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
                                RelativePath="..\..\src\html\winpars.cpp"\r
                                >\r
                        </File>\r
@@ -1229,10 +1229,10 @@
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\include\wx\html\styleparams.h"
-                               >
-                       </File>
-                       <File
+                               RelativePath="..\..\include\wx\html\styleparams.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
                                RelativePath="..\..\include\wx\html\winpars.h"\r
                                >\r
                        </File>\r

diff --git a/wxGTK.spec b/wxGTK.spec
index 987857ebe6b4eaac6a7ef955c064ba06a016c998..724fee3a4f11ef550dabeb1d21694ce84153f926 100644 (file)
--- a/wxGTK.spec
+++ b/wxGTK.spec
@@ -285,6 +285,7 @@ wx/mimetype.h
 wx/module.h
 wx/mousestate.h
 wx/msgout.h
+wx/msgqueue.h
 wx/mstream.h
 wx/object.h
 wx/platform.h

diff --git a/wxMotif.spec b/wxMotif.spec
index 708fe15c05dd9e745ded941f7ecbe4c5024cf880..bb516bbf4391ed80351c1610df6cb03b751bcca4 100644 (file)
--- a/wxMotif.spec
+++ b/wxMotif.spec
@@ -190,6 +190,7 @@ wx/mimetype.h
 wx/module.h
 wx/mousestate.h
 wx/msgout.h
+wx/msgqueue.h
 wx/mstream.h
 wx/object.h
 wx/platform.h

diff --git a/wxX11.spec b/wxX11.spec
index 3480e3148671a4199054673f05e003a74cdbeb48..46ee82ce44104d41bb50e41f8769f724a267211a 100644 (file)
--- a/wxX11.spec
+++ b/wxX11.spec
@@ -214,6 +214,7 @@ wx/mimetype.h
 wx/module.h
 wx/mousestate.h
 wx/msgout.h
+wx/msgqueue.h
 wx/mstream.h
 wx/object.h
 wx/platform.h