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

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

diff --git a/build/msw/makefile.bcc b/build/msw/makefile.bcc
index 137018cb264b43fd6c9c2cf9503cce2d61affd9c..bef04586ba212a965db8ada8fedb03d848514046 100644 (file)
--- a/build/msw/makefile.bcc
+++ b/build/msw/makefile.bcc
@@ -38,7 +38,7 @@ MAKEARGS = -DCC="$(CC)" -DCXX="$(CXX)" -DCFLAGS="$(CFLAGS)" \
        -DCFG="$(CFG)" -DCPPUNIT_CFLAGS="$(CPPUNIT_CFLAGS)" \
        -DCPPUNIT_LIBS="$(CPPUNIT_LIBS)" -DRUNTIME_LIBS="$(RUNTIME_LIBS)"
 WX_RELEASE_NODOT = 29
-WX_VERSION_NODOT = $(WX_RELEASE_NODOT)0
+WX_VERSION_NODOT = $(WX_RELEASE_NODOT)1
 COMPILER_PREFIX = bcc
 OBJS = \
        $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
@@ -1086,6 +1086,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 \
@@ -1156,6 +1157,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 \
@@ -1465,6 +1467,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 \
@@ -2150,6 +2153,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 \
@@ -4755,7 +4759,7 @@ $(SETUPHDIR)\wx\msw\rcdefs.h: $(SETUPHDIR)\wx\msw ..\..\include\wx\msw\genrcdefs
 build_cfg_file: $(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)
@@ -6050,6 +6054,9 @@ $(OBJS)\monodll_xh_dlg.obj: ..\..\src\xrc\xh_dlg.cpp
 $(OBJS)\monodll_xh_editlbox.obj: ..\..\src\xrc\xh_editlbox.cpp
        $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_editlbox.cpp
 
+$(OBJS)\monodll_xh_filectrl.obj: ..\..\src\xrc\xh_filectrl.cpp
+       $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_filectrl.cpp
+
 $(OBJS)\monodll_xh_filepicker.obj: ..\..\src\xrc\xh_filepicker.cpp
        $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_filepicker.cpp
 
@@ -8284,6 +8291,9 @@ $(OBJS)\monolib_xh_dlg.obj: ..\..\src\xrc\xh_dlg.cpp
 $(OBJS)\monolib_xh_editlbox.obj: ..\..\src\xrc\xh_editlbox.cpp
        $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_editlbox.cpp
 
+$(OBJS)\monolib_xh_filectrl.obj: ..\..\src\xrc\xh_filectrl.cpp
+       $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_filectrl.cpp
+
 $(OBJS)\monolib_xh_filepicker.obj: ..\..\src\xrc\xh_filepicker.cpp
        $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_filepicker.cpp
 
@@ -13871,6 +13881,9 @@ $(OBJS)\xrcdll_xh_dlg.obj: ..\..\src\xrc\xh_dlg.cpp
 $(OBJS)\xrcdll_xh_editlbox.obj: ..\..\src\xrc\xh_editlbox.cpp
        $(CXX) -q -c -P -o$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_editlbox.cpp
 
+$(OBJS)\xrcdll_xh_filectrl.obj: ..\..\src\xrc\xh_filectrl.cpp
+       $(CXX) -q -c -P -o$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_filectrl.cpp
+
 $(OBJS)\xrcdll_xh_filepicker.obj: ..\..\src\xrc\xh_filepicker.cpp
        $(CXX) -q -c -P -o$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_filepicker.cpp
 
@@ -14054,6 +14067,9 @@ $(OBJS)\xrclib_xh_dlg.obj: ..\..\src\xrc\xh_dlg.cpp
 $(OBJS)\xrclib_xh_editlbox.obj: ..\..\src\xrc\xh_editlbox.cpp
        $(CXX) -q -c -P -o$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_editlbox.cpp
 
+$(OBJS)\xrclib_xh_filectrl.obj: ..\..\src\xrc\xh_filectrl.cpp
+       $(CXX) -q -c -P -o$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_filectrl.cpp
+
 $(OBJS)\xrclib_xh_filepicker.obj: ..\..\src\xrc\xh_filepicker.cpp
        $(CXX) -q -c -P -o$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_filepicker.cpp