don't call OnWriteWaiting() if we lost connection in OnReadWaiting() called just...

[wxWidgets.git] / build / msw / makefile.wat

diff --git a/build/msw/makefile.wat b/build/msw/makefile.wat
index f1de3f23aeb717fb5e8f7b6efb2ad48c1f7ec216..e5dfcea0a1c4346ff4011d94a2e63ed07cc8433d 100644 (file)
--- a/build/msw/makefile.wat
+++ b/build/msw/makefile.wat
@@ -152,6 +152,7 @@ ____MONOLIB_GUI_SRC_FILENAMES_OBJECTS =  &
        $(OBJS)\monodll_xh_dirpicker.obj &
        $(OBJS)\monodll_xh_dlg.obj &
        $(OBJS)\monodll_xh_editlbox.obj &
+       $(OBJS)\monodll_xh_filectrl.obj &
        $(OBJS)\monodll_xh_filepicker.obj &
        $(OBJS)\monodll_xh_fontpicker.obj &
        $(OBJS)\monodll_xh_frame.obj &
@@ -848,6 +849,7 @@ ____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS =  &
        $(OBJS)\monolib_xh_dirpicker.obj &
        $(OBJS)\monolib_xh_dlg.obj &
        $(OBJS)\monolib_xh_editlbox.obj &
+       $(OBJS)\monolib_xh_filectrl.obj &
        $(OBJS)\monolib_xh_filepicker.obj &
        $(OBJS)\monolib_xh_fontpicker.obj &
        $(OBJS)\monolib_xh_frame.obj &
@@ -3156,7 +3158,7 @@ MAKEARGS = CC="$(CC)" CXX="$(CXX)" CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" &
        CPPUNIT_CFLAGS="$(CPPUNIT_CFLAGS)" CPPUNIT_LIBS="$(CPPUNIT_LIBS)" &
        RUNTIME_LIBS="$(RUNTIME_LIBS)"
 WX_RELEASE_NODOT = 29
-WX_VERSION_NODOT = $(WX_RELEASE_NODOT)0
+WX_VERSION_NODOT = $(WX_RELEASE_NODOT)1
 COMPILER_PREFIX = wat
 OBJS = &
        $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
@@ -4207,6 +4209,7 @@ XRCDLL_OBJECTS =  &
        $(OBJS)\xrcdll_xh_dirpicker.obj &
        $(OBJS)\xrcdll_xh_dlg.obj &
        $(OBJS)\xrcdll_xh_editlbox.obj &
+       $(OBJS)\xrcdll_xh_filectrl.obj &
        $(OBJS)\xrcdll_xh_filepicker.obj &
        $(OBJS)\xrcdll_xh_fontpicker.obj &
        $(OBJS)\xrcdll_xh_frame.obj &
@@ -4277,6 +4280,7 @@ XRCLIB_OBJECTS =  &
        $(OBJS)\xrclib_xh_dirpicker.obj &
        $(OBJS)\xrclib_xh_dlg.obj &
        $(OBJS)\xrclib_xh_editlbox.obj &
+       $(OBJS)\xrclib_xh_filectrl.obj &
        $(OBJS)\xrclib_xh_filepicker.obj &
        $(OBJS)\xrclib_xh_fontpicker.obj &
        $(OBJS)\xrclib_xh_frame.obj &
@@ -5156,7 +5160,7 @@ $(SETUPHDIR)\wx\msw\rcdefs.h :  $(SETUPHDIR)\wx\msw ..\..\include\wx\msw\genrcde
 build_cfg_file : .SYMBOLIC $(SETUPHDIR)
        @echo WXVER_MAJOR=2 >$(BUILD_CFG_FILE)
        @echo WXVER_MINOR=9 >>$(BUILD_CFG_FILE)
-       @echo WXVER_RELEASE=0 >>$(BUILD_CFG_FILE)
+       @echo WXVER_RELEASE=1 >>$(BUILD_CFG_FILE)
        @echo BUILD=$(BUILD) >>$(BUILD_CFG_FILE)
        @echo MONOLITHIC=$(MONOLITHIC) >>$(BUILD_CFG_FILE)
        @echo SHARED=$(SHARED) >>$(BUILD_CFG_FILE)
@@ -6451,6 +6455,9 @@ $(OBJS)\monodll_xh_dlg.obj :  .AUTODEPEND ..\..\src\xrc\xh_dlg.cpp
 $(OBJS)\monodll_xh_editlbox.obj :  .AUTODEPEND ..\..\src\xrc\xh_editlbox.cpp
        $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
 
+$(OBJS)\monodll_xh_filectrl.obj :  .AUTODEPEND ..\..\src\xrc\xh_filectrl.cpp
+       $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
+
 $(OBJS)\monodll_xh_filepicker.obj :  .AUTODEPEND ..\..\src\xrc\xh_filepicker.cpp
        $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
 
@@ -8797,6 +8804,9 @@ $(OBJS)\monolib_xh_dlg.obj :  .AUTODEPEND ..\..\src\xrc\xh_dlg.cpp
 $(OBJS)\monolib_xh_editlbox.obj :  .AUTODEPEND ..\..\src\xrc\xh_editlbox.cpp
        $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
 
+$(OBJS)\monolib_xh_filectrl.obj :  .AUTODEPEND ..\..\src\xrc\xh_filectrl.cpp
+       $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
+
 $(OBJS)\monolib_xh_filepicker.obj :  .AUTODEPEND ..\..\src\xrc\xh_filepicker.cpp
        $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
 
@@ -14720,6 +14730,9 @@ $(OBJS)\xrcdll_xh_dlg.obj :  .AUTODEPEND ..\..\src\xrc\xh_dlg.cpp
 $(OBJS)\xrcdll_xh_editlbox.obj :  .AUTODEPEND ..\..\src\xrc\xh_editlbox.cpp
        $(CXX) -bt=nt -zq -fo=$^@ $(XRCDLL_CXXFLAGS) $<
 
+$(OBJS)\xrcdll_xh_filectrl.obj :  .AUTODEPEND ..\..\src\xrc\xh_filectrl.cpp
+       $(CXX) -bt=nt -zq -fo=$^@ $(XRCDLL_CXXFLAGS) $<
+
 $(OBJS)\xrcdll_xh_filepicker.obj :  .AUTODEPEND ..\..\src\xrc\xh_filepicker.cpp
        $(CXX) -bt=nt -zq -fo=$^@ $(XRCDLL_CXXFLAGS) $<
 
@@ -14903,6 +14916,9 @@ $(OBJS)\xrclib_xh_dlg.obj :  .AUTODEPEND ..\..\src\xrc\xh_dlg.cpp
 $(OBJS)\xrclib_xh_editlbox.obj :  .AUTODEPEND ..\..\src\xrc\xh_editlbox.cpp
        $(CXX) -bt=nt -zq -fo=$^@ $(XRCLIB_CXXFLAGS) $<
 
+$(OBJS)\xrclib_xh_filectrl.obj :  .AUTODEPEND ..\..\src\xrc\xh_filectrl.cpp
+       $(CXX) -bt=nt -zq -fo=$^@ $(XRCLIB_CXXFLAGS) $<
+
 $(OBJS)\xrclib_xh_filepicker.obj :  .AUTODEPEND ..\..\src\xrc\xh_filepicker.cpp
        $(CXX) -bt=nt -zq -fo=$^@ $(XRCLIB_CXXFLAGS) $<